From 37d0064a28ae84fa0fb6d691af7be1ce045f9bc4 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Tue, 20 Mar 2018 18:34:47 +0000 Subject: [PATCH 01/14] Constraints decompress to use re.1.7.1 (only to test it) --- packages/decompress/decompress.0.3/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decompress/decompress.0.3/opam b/packages/decompress/decompress.0.3/opam index 55b584a8ffb..bf328298dfb 100644 --- a/packages/decompress/decompress.0.3/opam +++ b/packages/decompress/decompress.0.3/opam @@ -24,7 +24,7 @@ depends: [ "oasis" {build} "base-bytes" "alcotest" {test} - "re" {test} + "re" {test & = "1.7.1"} "cstruct" {test} "camlzip" {test} "ocamlbuild" {build} From a2ab7757fdb91d94bd9ba0647ec7ab8650cbcf03 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Tue, 20 Mar 2018 18:36:12 +0000 Subject: [PATCH 02/14] Apply the constraint for decompress.0.4 --- packages/decompress/decompress.0.4/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decompress/decompress.0.4/opam b/packages/decompress/decompress.0.4/opam index 4c1f259e388..ed8d74886b6 100644 --- a/packages/decompress/decompress.0.4/opam +++ b/packages/decompress/decompress.0.4/opam @@ -33,7 +33,7 @@ depends: [ "ocamlfind" {build} "base-bytes" "alcotest" {test} - "re" {test} + "re" {test & = "1.7.1} "camlzip" {test} "cmdliner" {test} "ctypes" {test} From e5890863adf4d8e38315ea0dbac9f51849f75ff1 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Tue, 20 Mar 2018 18:36:44 +0000 Subject: [PATCH 03/14] Apply the constraint for decompress.0.5 --- packages/decompress/decompress.0.5/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decompress/decompress.0.5/opam b/packages/decompress/decompress.0.5/opam index 416e6a635a2..b3d67da4f55 100644 --- a/packages/decompress/decompress.0.5/opam +++ b/packages/decompress/decompress.0.5/opam @@ -19,7 +19,7 @@ depends: [ "topkg" {build} "base-bytes" "camlzip" {test} - "re" {test} + "re" {test & = "1.7.1"} "alcotest" {test} ] From 8f0579f4a8cbda0edff584249dbc299aa03317a6 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Tue, 20 Mar 2018 18:37:23 +0000 Subject: [PATCH 04/14] Apply the constraint for decompress.0.6 --- packages/decompress/decompress.0.6/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decompress/decompress.0.6/opam b/packages/decompress/decompress.0.6/opam index b10ba9f996b..ba257f274bf 100644 --- a/packages/decompress/decompress.0.6/opam +++ b/packages/decompress/decompress.0.6/opam @@ -23,7 +23,7 @@ depends: [ "topkg" {build} "base-bytes" "camlzip" {test} - "re" {test} + "re" {test & = "1.7.1"} "alcotest" {test} ] From 73f0bed045c7793de8a50d00e3833fb53400fc49 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Tue, 20 Mar 2018 18:38:05 +0000 Subject: [PATCH 05/14] Apply the constraint for decompress.0.7 --- packages/decompress/decompress.0.7/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decompress/decompress.0.7/opam b/packages/decompress/decompress.0.7/opam index b10ba9f996b..ba257f274bf 100644 --- a/packages/decompress/decompress.0.7/opam +++ b/packages/decompress/decompress.0.7/opam @@ -23,7 +23,7 @@ depends: [ "topkg" {build} "base-bytes" "camlzip" {test} - "re" {test} + "re" {test & = "1.7.1"} "alcotest" {test} ] From 7da80aabca59fd5f111414fb4d3538df8358713a Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Tue, 20 Mar 2018 18:47:25 +0000 Subject: [PATCH 06/14] Fix opam file on decompress.0.4 --- packages/decompress/decompress.0.4/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decompress/decompress.0.4/opam b/packages/decompress/decompress.0.4/opam index ed8d74886b6..e4a21c26d47 100644 --- a/packages/decompress/decompress.0.4/opam +++ b/packages/decompress/decompress.0.4/opam @@ -33,7 +33,7 @@ depends: [ "ocamlfind" {build} "base-bytes" "alcotest" {test} - "re" {test & = "1.7.1} + "re" {test & = "1.7.1"} "camlzip" {test} "cmdliner" {test} "ctypes" {test} From d617a55d3cf029df408e94a2e9d617b66b02dd92 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Wed, 21 Mar 2018 17:49:05 +0100 Subject: [PATCH 07/14] Update checksum and url to download decompress.0.3 --- packages/decompress/decompress.0.3/url | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/decompress/decompress.0.3/url b/packages/decompress/decompress.0.3/url index 296798822dd..4e42c375de1 100644 --- a/packages/decompress/decompress.0.3/url +++ b/packages/decompress/decompress.0.3/url @@ -1,2 +1,2 @@ -http: "https://github.com/oklm-wsh/Decompress/archive/0.3.tar.gz" -checksum: "e35c92aea4b3135e4b07bc75f0afb84c" +archive: "https://github.com/mirage/decompress/releases/download/0.3/decompress-0.3.tbz" +checksum: "40ebe32bff2aeba2a4f5ae5a603f8ae8" From d4a62bd76c25450a3c3a38366084ac81984a98a4 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Wed, 21 Mar 2018 17:49:16 +0100 Subject: [PATCH 08/14] Update checksum and url to download decompress.0.4 --- packages/decompress/decompress.0.4/url | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/decompress/decompress.0.4/url b/packages/decompress/decompress.0.4/url index 0b520363aea..597532a3339 100644 --- a/packages/decompress/decompress.0.4/url +++ b/packages/decompress/decompress.0.4/url @@ -1,2 +1,2 @@ -http: "https://github.com/oklm-wsh/Decompress/archive/0.4.tar.gz" -checksum: "32f4db760f033d1fcd139eb327d70a64" +archive: "https://github.com/mirage/decompress/releases/download/0.4/decompress-0.4.tbz" +checksum: "0b28aa7e55f64a245a9c0d8baf546fd2" From 33ccaee49e2a9ace7e1a6c8da4164e651318afd7 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Wed, 21 Mar 2018 17:49:23 +0100 Subject: [PATCH 09/14] Update checksum and url to download decompress.0.5 --- packages/decompress/decompress.0.5/url | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/decompress/decompress.0.5/url b/packages/decompress/decompress.0.5/url index 6ee4052857d..938c3e2da4c 100644 --- a/packages/decompress/decompress.0.5/url +++ b/packages/decompress/decompress.0.5/url @@ -1,2 +1,2 @@ -http: "https://github.com/oklm-wsh/Decompress/archive/0.5.tar.gz" -checksum: "7bc7cd1fc1090f6d15114fdfe11e557d" +archive: "https://github.com/mirage/decompress/releases/download/0.5/decompress-0.5.tbz" +checksum: "2bc98341e4d5752c1053d89c370710fb" From 12d9d81fd1de621aaeba3232599c1db11d76e3f6 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Wed, 21 Mar 2018 23:02:00 +0100 Subject: [PATCH 10/14] Constraints decompress.0.3 to compile only on ocaml < 4.03.0 --- packages/decompress/decompress.0.3/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decompress/decompress.0.3/opam b/packages/decompress/decompress.0.3/opam index bf328298dfb..1aaa280abe1 100644 --- a/packages/decompress/decompress.0.3/opam +++ b/packages/decompress/decompress.0.3/opam @@ -30,4 +30,4 @@ depends: [ "ocamlbuild" {build} ] depopts: "base-unix" -available: [ocaml-version >= "4.02.0"] +available: [ocaml-version >= "4.02.0" & ocaml-version < "4.03.0"] From d9546074e868e223c9aa7a56ae03c3df1b907f90 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Wed, 21 Mar 2018 23:31:16 +0100 Subject: [PATCH 11/14] Constraints decompress.0.4 to compile only on ocaml < 4.03.0 --- packages/decompress/decompress.0.4/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decompress/decompress.0.4/opam b/packages/decompress/decompress.0.4/opam index e4a21c26d47..ff6accd82f2 100644 --- a/packages/decompress/decompress.0.4/opam +++ b/packages/decompress/decompress.0.4/opam @@ -44,4 +44,4 @@ depopts: [ "base-unix" ] -available: [ocaml-version >= "4.02.0"] +available: [ocaml-version >= "4.02.0" & ocaml-version < "4.03.0"] From 724edf8085a164b27081a6467da648e27bf8c106 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Thu, 22 Mar 2018 17:39:19 +0100 Subject: [PATCH 12/14] Constraints decompress.0.3 to comple only on 4.02.0 --- packages/decompress/decompress.0.3/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decompress/decompress.0.3/opam b/packages/decompress/decompress.0.3/opam index 1aaa280abe1..b7d4f367eae 100644 --- a/packages/decompress/decompress.0.3/opam +++ b/packages/decompress/decompress.0.3/opam @@ -30,4 +30,4 @@ depends: [ "ocamlbuild" {build} ] depopts: "base-unix" -available: [ocaml-version >= "4.02.0" & ocaml-version < "4.03.0"] +available: [ocaml-version = "4.02.0"] From 73de2a23149571e8e0fc6bf5aea7e153a88b8108 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Thu, 22 Mar 2018 17:51:51 +0100 Subject: [PATCH 13/14] Constraints decompress 0.5 and 0.6 to compile only on ocaml < 4.06.0 --- packages/decompress/decompress.0.5/opam | 2 +- packages/decompress/decompress.0.6/opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/decompress/decompress.0.5/opam b/packages/decompress/decompress.0.5/opam index b3d67da4f55..5f3ef87b769 100644 --- a/packages/decompress/decompress.0.5/opam +++ b/packages/decompress/decompress.0.5/opam @@ -27,4 +27,4 @@ depopts: [ "cmdliner" ] -available: [ocaml-version >= "4.03.0"] +available: [ocaml-version >= "4.03.0" & ocaml-version < "4.06.0"] diff --git a/packages/decompress/decompress.0.6/opam b/packages/decompress/decompress.0.6/opam index ba257f274bf..6292552defa 100644 --- a/packages/decompress/decompress.0.6/opam +++ b/packages/decompress/decompress.0.6/opam @@ -31,4 +31,4 @@ depopts: [ "cmdliner" ] -available: [ocaml-version >= "4.03.0"] +available: [ocaml-version >= "4.03.0" & ocaml-version < "4.06.0"] From 91d564b38fbdcff7ce30c21615a707772468ded3 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Thu, 22 Mar 2018 18:15:17 +0100 Subject: [PATCH 14/14] Delete build-test on decompress.0.7 --- packages/decompress/decompress.0.7/opam | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/decompress/decompress.0.7/opam b/packages/decompress/decompress.0.7/opam index ba257f274bf..58d829c94a1 100644 --- a/packages/decompress/decompress.0.7/opam +++ b/packages/decompress/decompress.0.7/opam @@ -12,19 +12,11 @@ build: [ "--with-cmdliner" "%{cmdliner:installed}%" ] -build-test: [ - [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "true" ] - [ "ocaml" "pkg/pkg.ml" "test" ] -] - depends: [ "ocamlbuild" {build} "ocamlfind" {build} "topkg" {build} "base-bytes" - "camlzip" {test} - "re" {test & = "1.7.1"} - "alcotest" {test} ] depopts: [