diff --git a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index d4904e77430..5500d055125 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -1,11 +1,13 @@ -{ buildDunePackage, mirage-flow, fmt, ocaml_lwt, logs, cstruct, mirage-clock }: +{ buildDunePackage, mirage-flow, fmt, lwt, logs, cstruct, mirage-clock }: buildDunePackage { pname = "mirage-flow-combinators"; - inherit (mirage-flow) version useDune2 src; + inherit (mirage-flow) version src; - propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ]; + duneVersion = "3"; + + propagatedBuildInputs = [ lwt logs cstruct mirage-clock mirage-flow ]; meta = mirage-flow.meta // { description = "Flow implementations and combinators for MirageOS specialized to lwt"; diff --git a/pkgs/development/ocaml-modules/mirage-flow/default.nix b/pkgs/development/ocaml-modules/mirage-flow/default.nix index bc987eff988..6b454512915 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -1,18 +1,18 @@ -{ lib, buildDunePackage, fetchurl, cstruct, fmt, ocaml_lwt }: +{ lib, buildDunePackage, fetchurl, cstruct, fmt, lwt }: buildDunePackage rec { pname = "mirage-flow"; version = "3.0.0"; - useDune2 = true; - minimumOCamlVersion = "4.05"; + duneVersion = "3"; + minimalOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz"; - sha256 = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; + hash = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; }; - propagatedBuildInputs = [ cstruct fmt ocaml_lwt ]; + propagatedBuildInputs = [ cstruct fmt lwt ]; meta = { description = "Flow implementations and combinators for MirageOS"; diff --git a/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 023896447db..12681911a3d 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -5,7 +5,9 @@ buildDunePackage { pname = "mirage-flow-unix"; - inherit (mirage-flow) version useDune2 src; + inherit (mirage-flow) version src; + + duneVersion = "3"; # Make tests compatible with alcotest 1.4.0 postPatch = ''