diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/ocaml-modules/mirage-flow | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/mirage-flow')
3 files changed, 3 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index 2ad6e5b0b974..d4904e77430a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "mirage-flow-combinators"; - inherit (mirage-flow) version src; + inherit (mirage-flow) version useDune2 src; propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix index 25bb5e0f32d4..d6ba6603596a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { pname = "mirage-flow"; version = "2.0.1"; + useDune2 = true; minimumOCamlVersion = "4.05"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 7a20ca87f8f3..3bd676b45fa0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -4,7 +4,7 @@ buildDunePackage { pname = "mirage-flow-unix"; - inherit (mirage-flow) version src; + inherit (mirage-flow) version useDune2 src; propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ]; |