From 9c44e1b578d80364526e108f2b1c74b31e094ca2 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Tue, 27 Oct 2020 17:44:08 +0100 Subject: [PATCH] Delete pin-depends on OPAM files about conduit --- git-cohttp-mirage.opam | 9 +++------ git-cohttp-unix.opam | 10 +++------- git-cohttp.opam | 4 ++-- git-nss.opam | 7 +------ git-unix.opam | 6 ++---- git.opam | 6 +----- 6 files changed, 12 insertions(+), 30 deletions(-) diff --git a/git-cohttp-mirage.opam b/git-cohttp-mirage.opam index 9e5d233d4..fe601dec6 100644 --- a/git-cohttp-mirage.opam +++ b/git-cohttp-mirage.opam @@ -24,10 +24,7 @@ depends: [ ] pin-depends: [ - [ "conduit.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] - [ "conduit-tls.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] - [ "conduit-mirage.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] - [ "cohttp.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ] - [ "cohttp-lwt.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ] - [ "cohttp-mirage.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ] + [ "cohttp.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#c2c3f064b6873e11b9abc62302415b24ca9d5ce7" ] + [ "cohttp-lwt.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#c2c3f064b6873e11b9abc62302415b24ca9d5ce7" ] + [ "cohttp-mirage.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#c2c3f064b6873e11b9abc62302415b24ca9d5ce7" ] ] diff --git a/git-cohttp-unix.opam b/git-cohttp-unix.opam index ee52befeb..db6de1a02 100644 --- a/git-cohttp-unix.opam +++ b/git-cohttp-unix.opam @@ -24,11 +24,7 @@ depends: [ ] pin-depends: [ - [ "conduit.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] - [ "conduit-tls.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] - [ "conduit-lwt.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] - [ "conduit-lwt-tls.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] - [ "cohttp.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ] - [ "cohttp-lwt.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ] - [ "cohttp-lwt-unix.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#7f0efc6d7e0420e3abff99d29633519785c41f4b" ] + [ "cohttp.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#c2c3f064b6873e11b9abc62302415b24ca9d5ce7" ] + [ "cohttp-lwt.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#c2c3f064b6873e11b9abc62302415b24ca9d5ce7" ] + [ "cohttp-lwt-unix.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#c2c3f064b6873e11b9abc62302415b24ca9d5ce7" ] ] diff --git a/git-cohttp.opam b/git-cohttp.opam index a8dc8fac1..7630cf773 100644 --- a/git-cohttp.opam +++ b/git-cohttp.opam @@ -24,6 +24,6 @@ depends: [ ] pin-depends: [ - [ "cohttp.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#10ce452be074e91400c81271fd444af62c130019" ] - [ "cohttp-lwt.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#10ce452be074e91400c81271fd444af62c130019" ] + [ "cohttp.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#c2c3f064b6873e11b9abc62302415b24ca9d5ce7" ] + [ "cohttp-lwt.dev" "git+https://github.com/dinosaure/ocaml-cohttp.git#c2c3f064b6873e11b9abc62302415b24ca9d5ce7" ] ] diff --git a/git-nss.opam b/git-nss.opam index 1fe6168a6..3ae3bb886 100644 --- a/git-nss.opam +++ b/git-nss.opam @@ -30,7 +30,7 @@ depends: [ "psq" {>= "0.2.0"} "carton" "carton-lwt" - "conduit" + "conduit" {>= "3.0.0"} "uri" "digestif" {>= "0.8.1"} "decompress" {>= "1.2.0"} @@ -45,8 +45,3 @@ depends: [ "alcotest-lwt" {with-test} "crowbar" {with-test & >= "0.2"} ] - -pin-depends: [ - [ "conduit.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] - [ "conduit-lwt.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] -] diff --git a/git-unix.opam b/git-unix.opam index f86975528..cae44dfa8 100644 --- a/git-unix.opam +++ b/git-unix.opam @@ -21,8 +21,8 @@ depends: [ "mmap" {>= "1.1.0"} "stdlib-shims" "git" - "conduit" - "conduit-lwt" + "conduit" {>= "3.0.0"} + "conduit-lwt" {>= "3.0.0"} "rresult" "result" "bigarray-compat" @@ -46,8 +46,6 @@ depends: [ ] pin-depends: [ - [ "conduit.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] - [ "conduit-lwt.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] [ "awa.dev" "git+https://github.com/dinosaure/awa-ssh.git#e54302ecd5fe541c2fbecb277cb11bba40032b81"] [ "awa-conduit.dev" "git+https://github.com/dinosaure/awa-ssh.git#e54302ecd5fe541c2fbecb277cb11bba40032b81"] ] diff --git a/git.opam b/git.opam index 36bb1fef4..48fcfdf41 100644 --- a/git.opam +++ b/git.opam @@ -34,7 +34,7 @@ depends: [ "bigstringaf" "optint" "decompress" - "conduit" + "conduit" {>= "3.0.0"} "logs" "lwt" "cstruct" {>= "5.0.0"} @@ -57,7 +57,3 @@ depends: [ "fpath" {with-test} "base64" {with-test & >= "3.0.0"} ] - -pin-depends: [ - [ "conduit.dev" "git+https://github.com/mirage/ocaml-conduit.git#8912d458b2f3e43245e99cf3cb74e9c00712a8b0" ] -]