gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coq: keep compiling master

Browse Source
This commit is contained in:
Pierre Roux
2024-12-24 14:41:50 +01:00
committed by Vincent Laporte
parent 6918669137
commit 531093ccbd
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/logic/coq/default.nix
+6 -3
View File
@@ -205,6 +205,9 @@ self = stdenv.mkDerivation {
cp bin/votour $out/bin/
'' + ''
ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix}
'' + lib.optionalString (coqAtLeast "8.21") ''
ln -s $out/lib/rocq-runtime $OCAMLFIND_DESTDIR/rocq-runtime
ln -s $out/lib/rocq-core $OCAMLFIND_DESTDIR/rocq-core
'' + lib.optionalString (coqAtLeast "8.14") ''
ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server
'' + lib.optionalString buildIde ''
@@ -229,16 +232,16 @@ self = stdenv.mkDerivation {
};
}; in
if coqAtLeast "8.17" then self.overrideAttrs(_: let
init-stdlib-package = if coqAtLeast "8.21" then "rocq-core" else "coq-stdlib"; in {
core-stdlib-package = if coqAtLeast "8.21" then "rocq-core" else "coq-stdlib"; in {
buildPhase = ''
runHook preBuild
make dunestrap
dune build -p coq-core,${init-stdlib-package},coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES
dune build -p coq-core${lib.optionalString (coqAtLeast "8.21") ",rocq-runtime"},${core-stdlib-package},coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES
runHook postBuild
'';
installPhase = ''
runHook preInstall
dune install --prefix $out coq-core ${init-stdlib-package} coqide-server${lib.optionalString buildIde " coqide"}
dune install --prefix $out coq-core ${lib.optionalString (coqAtLeast "8.21") "rocq-runtime"} ${core-stdlib-package} coqide-server${lib.optionalString buildIde " coqide"}
runHook postInstall
'';
}) else self
pkgs/development/coq-modules/stdlib/default.nix
+10 -3
View File
@@ -30,11 +30,18 @@
useDune = true;
configurePhase = ''
echo "no configure phase"
patchShebangs stdlib/dev/with-rocq-wrap.sh
''; # don't run Coq's configure
preBuild = ''
echo "(dirs stdlib)" > dune
buildPhase = ''
cd stdlib
dev/with-rocq-wrap.sh dune build -p coq-stdlib @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
'';
installPhase = ''
dev/with-rocq-wrap.sh dune install --root . coq-stdlib --prefix=$out --libdir $OCAMLFIND_DESTDIR
mkdir $out/lib/coq/
mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version}
'';
meta = {