From eca34552eb2485bf9876ce1ec203fbfe9a2b63e3 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 18 Feb 2025 17:05:11 +0100 Subject: [PATCH] coqPackages.coq-elpi: rstore overridability on Coq < 9.0 --- .../coq-modules/coq-elpi/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 9fe57b01822c..815e792d4b38 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -132,9 +132,9 @@ patched-derivation3 = patched-derivation2.overrideAttrs patched-derivation4 = patched-derivation3.overrideAttrs ( o: - # this is just a wrapper for rocPackages.bignums for Rocq >= 9.0 - lib.optionalAttrs (coq.version != null && (coq.version == "dev" - || lib.versions.isGe "9.0" coq.version)) { + # this is just a wrapper for rocPackages.rocq-elpi for Rocq >= 9.0 + if coq.version != null && (coq.version == "dev" + || lib.versions.isGe "9.0" coq.version) then { configurePhase = '' echo no configuration ''; @@ -146,6 +146,19 @@ patched-derivation4 = patched-derivation3.overrideAttrs ''; propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocqPackages.rocq-elpi ]; + } else lib.optionalAttrs (o.version != null && (o.version == "dev" + || lib.versions.isGe "2.5.0" o.version)) { + configurePhase = '' + make dune-files || true + ''; + buildPhase = '' + dune build -p rocq-elpi @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + ''; + installPhase = '' + dune install --root . rocq-elpi --prefix=$out --libdir $OCAMLFIND_DESTDIR + mkdir $out/lib/coq/ + mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version} + ''; } ); in patched-derivation4