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

coq: minor refactoring

This commit is contained in:
Vincent Laporte 2017-01-14 10:49:36 +00:00
parent a30e8db9f0
commit 9b949be617
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/science/logic/coq/default.nix
View File

@ -1,4 +1,4 @@
# - coqide compilation can be disabled by setting lablgtk to null; # - coqide compilation can be disabled by setting buildIde to false
# - The csdp program used for the Micromega tactic is statically referenced. # - The csdp program used for the Micromega tactic is statically referenced.
# However, coq can build without csdp by setting it to null. # However, coq can build without csdp by setting it to null.
# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. # In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
@ -6,8 +6,9 @@
# the derivation; it defaults to the greatest. # the derivation; it defaults to the greatest.
{ stdenv, fetchurl, writeText, pkgconfig { stdenv, fetchurl, writeText, pkgconfig
, ocaml, findlib, camlp5, ncurses , ocamlPackages, ncurses
, lablgtk ? null, csdp ? null , buildIde ? true
, csdp ? null
, version ? "8.6" , version ? "8.6"
}: }:
@ -19,8 +20,8 @@ let
"8.6" = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"; "8.6" = "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f";
}."${version}"; }."${version}";
coq-version = builtins.substring 0 3 version; coq-version = builtins.substring 0 3 version;
buildIde = lablgtk != null; camlp5 = ocamlPackages.camlp5_transitional;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
csdpPatch = if csdp != null then '' csdpPatch = if csdp != null then ''
substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
@ -31,14 +32,15 @@ stdenv.mkDerivation {
name = "coq-${version}"; name = "coq-${version}";
inherit coq-version; inherit coq-version;
inherit ocaml camlp5; inherit camlp5;
inherit (ocamlPackages) ocaml;
src = fetchurl { src = fetchurl {
url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
inherit sha256; inherit sha256;
}; };
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; buildInputs = [ pkgconfig ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ];
postPatch = '' postPatch = ''
UNAME=$(type -tp uname) UNAME=$(type -tp uname)

7
pkgs/top-level/all-packages.nix
View File

@ -16979,13 +16979,8 @@ with pkgs;
}; };
coq_8_5 = callPackage ../applications/science/logic/coq { coq_8_5 = callPackage ../applications/science/logic/coq {
version = "8.5pl3"; version = "8.5pl3";
inherit (ocamlPackages) ocaml findlib lablgtk;
camlp5 = ocamlPackages.camlp5_transitional;
};
coq_8_6 = callPackage ../applications/science/logic/coq {
inherit (ocamlPackages) ocaml findlib lablgtk;
camlp5 = ocamlPackages.camlp5_transitional;
}; };
coq_8_6 = callPackage ../applications/science/logic/coq {};
coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {
inherit (ocamlPackages) ocaml findlib lablgtk; inherit (ocamlPackages) ocaml findlib lablgtk;
camlp5 = ocamlPackages.camlp5_transitional; camlp5 = ocamlPackages.camlp5_transitional;