From 23eecca49565b351adee586eac37487bbf27ac2f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 3 May 2023 22:08:18 +0200 Subject: [PATCH] ocamlPackages.octavius: pin Dune to version 1 for OCaml < 4.08 --- pkgs/development/ocaml-modules/octavius/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index a4124df6664..5c108ac6b80 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml }: -buildDunePackage rec { +buildDunePackage (rec { pname = "octavius"; version = "1.2.2"; @@ -11,8 +11,7 @@ buildDunePackage rec { sha256 = "sha256-/S6WpIo1c5J9uM3xgtAM/elhnsl0XimnIFsKy3ootbA="; }; - minimumOCamlVersion = "4.03"; - useDune2 = lib.versionAtLeast ocaml.version "4.08"; + minimalOCamlVersion = "4.03"; doCheck = true; @@ -22,4 +21,6 @@ buildDunePackage rec { license = licenses.isc; maintainers = with maintainers; [ vbgl ]; }; -} +} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") { + duneVersion = "1"; +})