From cdf5720ae27e3165412b62886b12d012cbd692ae Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 5 Apr 2023 06:17:25 +0200 Subject: [PATCH] ocamlPackages.uri: use Dune 3 --- pkgs/development/ocaml-modules/uri/default.nix | 4 ++-- pkgs/development/ocaml-modules/uri/sexp.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index f669a98c4de..2c7ab1b6e50 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -3,11 +3,11 @@ }: buildDunePackage rec { - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; pname = "uri"; version = "4.2.0"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/uri/sexp.nix b/pkgs/development/ocaml-modules/uri/sexp.nix index ba970b1d6c5..61aa01fad8b 100644 --- a/pkgs/development/ocaml-modules/uri/sexp.nix +++ b/pkgs/development/ocaml-modules/uri/sexp.nix @@ -6,7 +6,9 @@ else buildDunePackage { pname = "uri-sexp"; - inherit (uri) version useDune2 src meta; + inherit (uri) version src meta; + + duneVersion = "3"; checkInputs = [ ounit ]; propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ];