alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/languages-frameworks/coq.xml
View file

@ -11,10 +11,9 @@
</para>
<para>
Some libraries require OCaml and sometimes also Camlp5 or findlib. The exact
versions that were used to build Coq are saved in the
<literal>coq.ocaml</literal> and <literal>coq.camlp5</literal> and
<literal>coq.findlib</literal> attributes.
Some extensions (plugins) might require OCaml and sometimes other OCaml
packages. The <literal>coq.ocamlPackages</literal> attribute can be used
to depend on the same package set Coq was built against.
</para>
<para>

2
pkgs/applications/science/logic/coq/default.nix
View file

@ -37,6 +37,8 @@ self = stdenv.mkDerivation {
passthru = {
inherit coq-version;
inherit ocamlPackages;
# For compatibility
inherit (ocamlPackages) ocaml camlp5 findlib num;
emacsBufferSetup = pkgs: ''
; Propagate coq paths to children

2
pkgs/development/coq-modules/QuickChick/default.nix
View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
propagatedBuildInputs = [ coq ssreflect ];
enableParallelBuilding = false;

2
pkgs/development/coq-modules/bignums/default.nix
View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
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}/";

2
pkgs/development/coq-modules/category-theory/default.nix
View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
propagatedBuildInputs = [ coq ssreflect ];
enableParallelBuilding = false;

2
pkgs/development/coq-modules/contribs/default.nix
View file

@ -12,7 +12,7 @@ let mkContrib = repo: revs: param:
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}/";

2
pkgs/development/coq-modules/coq-ext-lib/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
inherit (param) sha256;
};
buildInputs = [ coq.ocaml coq.camlp5 ];
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 ];
propagatedBuildInputs = [ coq ];
enableParallelBuilding = true;

2
pkgs/development/coq-modules/coq-haskell/default.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};
buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
propagatedBuildInputs = [ coq ssreflect ];
enableParallelBuilding = false;

6
pkgs/development/coq-modules/dpdgraph/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
{ stdenv, fetchFromGitHub, autoreconfHook, coq }:
let params = {
"8.8" = {
@ -34,8 +34,8 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ coq coq.camlp5 ]
++ (with ocamlPackages; [ ocaml findlib ocamlgraph ]);
buildInputs = [ coq ]
++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ocamlgraph ]);
preInstall = ''
mkdir -p $out/bin

2
pkgs/development/coq-modules/equations/default.nix
View file

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
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";

2
pkgs/development/coq-modules/fiat/HEAD.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
};
buildInputs = [ coq.ocaml coq.camlp5 python27 ];
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 python27 ];
propagatedBuildInputs = [ coq ];
doCheck = false;

2
pkgs/development/coq-modules/flocq/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3";
};
buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ];
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 bash which autoconf automake ];
propagatedBuildInputs = [ coq ];
buildPhase = ''

2
pkgs/development/coq-modules/heq/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "03y71c4qs6cmy3s2hjs05g7pcgk9sqma6flj15394yyxbvr9is1p";
};
buildInputs = [ coq.ocaml coq.camlp5 unzip ];
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ];
propagatedBuildInputs = [ coq ];
preBuild = "cd src";

2
pkgs/development/coq-modules/mathcomp/generic.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation {
inherit src;
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 ];
enableParallelBuilding = true;

2
pkgs/development/coq-modules/metalib/default.nix
View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
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 ];
enableParallelBuilding = true;

2
pkgs/development/coq-modules/paco/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1lcmdr0y2d7gzyvr8dal3pi7fibbd60bpi1l32fw89xiyrgqhsqy";
};
buildInputs = [ coq.ocaml coq.camlp5 unzip ];
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ];
propagatedBuildInputs = [ coq ];
preBuild = "cd src";

2
pkgs/development/coq-modules/ssreflect/generic.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation {
inherit src;
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 ];
enableParallelBuilding = true;