mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Symmetric mkRocqDerivation / mkCoqDerivation (#537814)
This commit is contained in:
commit
5e0de9d493
2 changed files with 8 additions and 28 deletions
|
|
@ -41,7 +41,7 @@ in
|
|||
pname,
|
||||
version ? null,
|
||||
fetcher ? null,
|
||||
owner ? "coq-community",
|
||||
owner ? "rocq-community",
|
||||
domain ? "github.com",
|
||||
repo ? pname,
|
||||
defaultVersion ? null,
|
||||
|
|
@ -98,7 +98,6 @@ let
|
|||
"dropAttrs"
|
||||
"dropDerivationAttrs"
|
||||
"keepAttrs"
|
||||
"enableParallelBuilding"
|
||||
]
|
||||
++ dropAttrs
|
||||
) keepAttrs;
|
||||
|
|
@ -158,27 +157,11 @@ let
|
|||
append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-";
|
||||
prefix-name = foldl append-version "" namePrefix;
|
||||
useDune = args.useDune or (useDuneifVersion fetched.version);
|
||||
coqlib-flags =
|
||||
switch coq.coq-version
|
||||
[
|
||||
{
|
||||
case = v: versions.isLe "8.6" v && v != "dev";
|
||||
out = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
|
||||
}
|
||||
]
|
||||
[
|
||||
"COQLIBINSTALL=$(out)/lib/coq/${coq.coq-version}/user-contrib"
|
||||
"COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)"
|
||||
];
|
||||
docdir-flags =
|
||||
switch coq.coq-version
|
||||
[
|
||||
{
|
||||
case = v: versions.isLe "8.6" v && v != "dev";
|
||||
out = [ "DOCDIR=$(out)/share/coq/${coq.coq-version}/" ];
|
||||
}
|
||||
]
|
||||
[ "COQDOCINSTALL=$(out)/share/coq/${coq.coq-version}/user-contrib" ];
|
||||
coqlib-flags = [
|
||||
"COQLIBINSTALL=$(out)/lib/coq/${coq.coq-version}/user-contrib"
|
||||
"COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)"
|
||||
];
|
||||
docdir-flags = [ "COQDOCINSTALL=$(out)/share/coq/${coq.coq-version}/user-contrib" ];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (
|
||||
|
|
@ -202,10 +185,7 @@ stdenv.mkDerivation (
|
|||
);
|
||||
buildInputs =
|
||||
args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or [ ]) ++ extraBuildInputs);
|
||||
enableParallelBuilding =
|
||||
lib.warnIf (args ? enableParallelBuilding && args.enableParallelBuilding == true)
|
||||
"mkCoqDerivation: enableParallelBuilding is enabled by default; remove the explicit setting"
|
||||
enableParallelBuilding;
|
||||
inherit enableParallelBuilding;
|
||||
|
||||
meta =
|
||||
(
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ in
|
|||
pname,
|
||||
version ? null,
|
||||
fetcher ? null,
|
||||
owner ? "coq-community",
|
||||
owner ? "rocq-community",
|
||||
domain ? "github.com",
|
||||
repo ? pname,
|
||||
defaultVersion ? null,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue