about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2023-05-03 22:08:14 +0200
committerVincent Laporte <Vincent.Laporte@gmail.com>2023-05-03 22:08:14 +0200
commit400e6f08b6b034aa9e26e0f474b029d2e40f3cb9 (patch)
treeeb0bb34d84d5be58d89d9770dad63472a465ba4a
parent8373826ef25c3addfd1e4627ec9d14d5cd5661da (diff)
downloadnixlib-400e6f08b6b034aa9e26e0f474b029d2e40f3cb9.tar
nixlib-400e6f08b6b034aa9e26e0f474b029d2e40f3cb9.tar.gz
nixlib-400e6f08b6b034aa9e26e0f474b029d2e40f3cb9.tar.bz2
nixlib-400e6f08b6b034aa9e26e0f474b029d2e40f3cb9.tar.lz
nixlib-400e6f08b6b034aa9e26e0f474b029d2e40f3cb9.tar.xz
nixlib-400e6f08b6b034aa9e26e0f474b029d2e40f3cb9.tar.zst
nixlib-400e6f08b6b034aa9e26e0f474b029d2e40f3cb9.zip
ocamlPackages.re: pin Dune to version 1 for OCaml < 4.08
-rw-r--r--pkgs/development/ocaml-modules/re/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix
index 174324d49cfd..bbddba331ee3 100644
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/pkgs/development/ocaml-modules/re/default.nix
@@ -13,14 +13,12 @@ let version_sha = if lib.versionAtLeast ocaml.version "4.08"
     };
 in
 
-buildDunePackage rec {
+buildDunePackage (rec {
   pname = "re";
   version = version_sha.version;
 
   minimalOCamlVersion = "4.02";
 
-  useDune2 = lib.versionAtLeast ocaml.version "4.08";
-
   src = fetchurl {
     url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz";
     sha256 = version_sha.sha256;
@@ -36,4 +34,6 @@ buildDunePackage rec {
     license = lib.licenses.lgpl2;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") {
+  duneVersion = "1";
+})