From 400e6f08b6b034aa9e26e0f474b029d2e40f3cb9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 3 May 2023 22:08:14 +0200 Subject: [PATCH] ocamlPackages.re: pin Dune to version 1 for OCaml < 4.08 --- pkgs/development/ocaml-modules/re/default.nix | 8 ++++---- 1 file 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"; +})