diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-11 06:00:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-11 06:00:54 +0000 |
| commit | 1e3b05e37fcf4048fdefa0a9971e3b598c89626a (patch) | |
| tree | a388056ce5b45aa86ca04e9e0d1881604ea017dd /pkgs/development/ocaml-modules | |
| parent | b826485d293df9b6625cc545c2785f66a391fc85 (diff) | |
| parent | e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d (diff) | |
| download | nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar.gz nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar.bz2 nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar.lz nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar.xz nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.tar.zst nixlib-1e3b05e37fcf4048fdefa0a9971e3b598c89626a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
5 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index 249635d14bb8..5aaf16c46de5 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -9,8 +9,6 @@ buildDunePackage { src ; - duneVersion = "3"; - buildInputs = [ ppx_sexp_conv ppx_here ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index ada502aaf0cb..7a7ee238f10b 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,14 +5,13 @@ buildDunePackage rec { pname = "conduit"; - version = "6.2.0"; + version = "6.2.1"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; - sha256 = "sha256-PtRAsO3aGyEt12K9skgx85TcoFmF3RtKxPlFgdFFI5Q="; + hash = "sha256-WdXntiQ3vkibC3nOEf+QrATvOcaD5M78qFh6/cL1W7s="; }; propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index cb86ea5f4f06..81a77f356aff 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -6,7 +6,6 @@ buildDunePackage { pname = "conduit-lwt-unix"; inherit (conduit-lwt) version src; - duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 2ec6f556916d..641d57db10e3 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -3,7 +3,6 @@ buildDunePackage { pname = "conduit-lwt"; inherit (conduit) version src; - duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index 04025666c3d9..79174261b9eb 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,5 +1,4 @@ { buildDunePackage, conduit-lwt -, fetchpatch , ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock , dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp @@ -11,12 +10,6 @@ buildDunePackage { inherit (conduit-lwt) version src; - # Compatibility with tls ≥ 0.17 - patches = fetchpatch { - url = "https://github.com/mirage/ocaml-conduit/commit/403b4cec528dae71aded311215868a35c11dad7e.patch"; - hash = "sha256-R/iuLf2PSrx8mLKLueMA3+zr9sB8dX/3evjUbfQECBk="; - }; - nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ |