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

Merge pull request #48617 from Zimmi48/passthru-ocamlPackages-in-coq-package

Browse Source 
coq: add ocamlPackages in passthru
This commit is contained in:
Vincent Laporte
2018-10-19 09:38:07 +00:00
committed by GitHub
parent a2d7574ebe 668c19a9ac
commit c091e93b99
17 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/languages-frameworks/coq.xml
+3 -4
View File
@@ -11,10 +11,9 @@
</para> </para>
<para> <para>
Some libraries require OCaml and sometimes also Camlp5 or findlib. The exact Some extensions (plugins) might require OCaml and sometimes other OCaml
versions that were used to build Coq are saved in the packages. The <literal>coq.ocamlPackages</literal> attribute can be used
<literal>coq.ocaml</literal> and <literal>coq.camlp5</literal> and to depend on the same package set Coq was built against.
<literal>coq.findlib</literal> attributes.
</para> </para>
<para> <para>
pkgs/applications/science/logic/coq/default.nix
+2
View File
@@ -37,6 +37,8 @@ self = stdenv.mkDerivation {
passthru = { passthru = {
inherit coq-version; inherit coq-version;
inherit ocamlPackages;
# For compatibility
inherit (ocamlPackages) ocaml camlp5 findlib num; inherit (ocamlPackages) ocaml camlp5 findlib num;
emacsBufferSetup = pkgs: '' emacsBufferSetup = pkgs: ''
; Propagate coq paths to children ; Propagate coq paths to children
pkgs/development/coq-modules/QuickChick/default.nix
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256; inherit (param) rev sha256;
}; };
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
propagatedBuildInputs = [ coq ssreflect ]; propagatedBuildInputs = [ coq ssreflect ];
enableParallelBuilding = false; enableParallelBuilding = false;
pkgs/development/coq-modules/bignums/default.nix
+1 -1
View File
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256; inherit (param) rev sha256;
}; };
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
pkgs/development/coq-modules/category-theory/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256; inherit (param) rev sha256;
}; };
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
propagatedBuildInputs = [ coq ssreflect ]; propagatedBuildInputs = [ coq ssreflect ];
enableParallelBuilding = false; enableParallelBuilding = false;
pkgs/development/coq-modules/contribs/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ let mkContrib = repo: revs: param:
sha256 = "${param.sha256}"; sha256 = "${param.sha256}";
}; };
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
pkgs/development/coq-modules/coq-ext-lib/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
inherit (param) sha256; inherit (param) sha256;
}; };
buildInputs = [ coq.ocaml coq.camlp5 ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 ];
propagatedBuildInputs = [ coq ]; propagatedBuildInputs = [ coq ];
enableParallelBuilding = true; enableParallelBuilding = true;
pkgs/development/coq-modules/coq-haskell/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256; inherit (param) rev sha256;
}; };
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
propagatedBuildInputs = [ coq ssreflect ]; propagatedBuildInputs = [ coq ssreflect ];
enableParallelBuilding = false; enableParallelBuilding = false;
pkgs/development/coq-modules/dpdgraph/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }: { stdenv, fetchFromGitHub, autoreconfHook, coq }:
let params = { let params = {
"8.8" = { "8.8" = {
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ coq coq.camlp5 ] buildInputs = [ coq ]
++ (with ocamlPackages; [ ocaml findlib ocamlgraph ]); ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ocamlgraph ]);
preInstall = '' preInstall = ''
mkdir -p $out/bin mkdir -p $out/bin
pkgs/development/coq-modules/equations/default.nix
+1 -1
View File
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
sha256 = "${param.sha256}"; sha256 = "${param.sha256}";
}; };
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
preBuild = "coq_makefile -f _CoqProject -o Makefile"; preBuild = "coq_makefile -f _CoqProject -o Makefile";
pkgs/development/coq-modules/fiat/HEAD.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64"; sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
}; };
buildInputs = [ coq.ocaml coq.camlp5 python27 ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 python27 ];
propagatedBuildInputs = [ coq ]; propagatedBuildInputs = [ coq ];
doCheck = false; doCheck = false;
pkgs/development/coq-modules/flocq/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3"; sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3";
}; };
buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 bash which autoconf automake ];
propagatedBuildInputs = [ coq ]; propagatedBuildInputs = [ coq ];
buildPhase = '' buildPhase = ''
pkgs/development/coq-modules/heq/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "03y71c4qs6cmy3s2hjs05g7pcgk9sqma6flj15394yyxbvr9is1p"; sha256 = "03y71c4qs6cmy3s2hjs05g7pcgk9sqma6flj15394yyxbvr9is1p";
}; };
buildInputs = [ coq.ocaml coq.camlp5 unzip ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ];
propagatedBuildInputs = [ coq ]; propagatedBuildInputs = [ coq ];
preBuild = "cd src"; preBuild = "cd src";
pkgs/development/coq-modules/mathcomp/generic.nix
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
inherit src; inherit src;
nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ]; buildInputs = with coq.ocamlPackages; [ ocaml findlib camlp5 ncurses which ];
propagatedBuildInputs = [ coq ]; propagatedBuildInputs = [ coq ];
enableParallelBuilding = true; enableParallelBuilding = true;
pkgs/development/coq-modules/metalib/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
}; };
buildInputs = [ coq.ocaml coq.camlp5 which coq lngen ott coq.findlib ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 which coq lngen ott findlib ];
propagatedBuildInputs = [ coq ]; propagatedBuildInputs = [ coq ];
enableParallelBuilding = true; enableParallelBuilding = true;
pkgs/development/coq-modules/paco/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1lcmdr0y2d7gzyvr8dal3pi7fibbd60bpi1l32fw89xiyrgqhsqy"; sha256 = "1lcmdr0y2d7gzyvr8dal3pi7fibbd60bpi1l32fw89xiyrgqhsqy";
}; };
buildInputs = [ coq.ocaml coq.camlp5 unzip ]; buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ];
propagatedBuildInputs = [ coq ]; propagatedBuildInputs = [ coq ];
preBuild = "cd src"; preBuild = "cd src";
pkgs/development/coq-modules/ssreflect/generic.nix
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
inherit src; inherit src;
nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ]; buildInputs = with coq.ocamlPackages; [ ocaml findlib camlp5 ncurses which ];
propagatedBuildInputs = [ coq ]; propagatedBuildInputs = [ coq ];
enableParallelBuilding = true; enableParallelBuilding = true;