From ca1c902e58e3928f0d1edc39ea6b8581f3b1902a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 17 Dec 2022 16:06:44 +0100 Subject: [PATCH] ocamlPackages.ocsipersist: use dune 3 --- pkgs/development/ocaml-modules/ocsipersist/default.nix | 3 ++- pkgs/development/ocaml-modules/ocsipersist/lib.nix | 2 +- pkgs/development/ocaml-modules/ocsipersist/pgsql.nix | 3 ++- pkgs/development/ocaml-modules/ocsipersist/sqlite.nix | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsipersist/default.nix b/pkgs/development/ocaml-modules/ocsipersist/default.nix index 8006477dad96..447c4f11d7f9 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/default.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/default.nix @@ -5,7 +5,8 @@ buildDunePackage { pname = "ocsipersist"; - inherit (ocsipersist-lib) src version useDune2; + inherit (ocsipersist-lib) src version; + duneVersion = "3"; buildInputs = [ ocsipersist-pgsql diff --git a/pkgs/development/ocaml-modules/ocsipersist/lib.nix b/pkgs/development/ocaml-modules/ocsipersist/lib.nix index a2abc5d9b399..33b086880241 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/lib.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/lib.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "ocsipersist-lib"; version = "1.1.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "ocsigen"; diff --git a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix index e93c8b479035..e2d95e7434ef 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix @@ -7,7 +7,8 @@ buildDunePackage { pname = "ocsipersist-pgsql"; - inherit (ocsipersist-lib) version src useDune2; + inherit (ocsipersist-lib) version src; + duneVersion = "3"; propagatedBuildInputs = [ lwt_log diff --git a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix index 2cfa30bc908e..696863e9fd66 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix @@ -7,7 +7,8 @@ buildDunePackage { pname = "ocsipersist-sqlite"; - inherit (ocsipersist-lib) version src useDune2; + inherit (ocsipersist-lib) version src; + duneVersion = "3"; propagatedBuildInputs = [ lwt_log