Author: roconnor
Date: Mon May 28 20:53:17 2012
New Revision: 34263
URL: https://nixos.org/websvn/nix/?rev=34263&sc=1
Log:
Updatings ssreflect to depend on camlp5 version 6.
Modified:
nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix Mon May
28 19:45:14 2012 (r34262)
+++ nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix Mon May
28 20:53:17 2012 (r34263)
@@ -1,10 +1,16 @@
-# TODO:
-# - coqide compilation should be optional or (better) separate;
+# - coqide compilation can be disabled by setting lablgtk to null;
-{stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}:
+{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
-let
+let
version = "8.3pl4";
+ buildIde = lablgtk != null;
+ ideFlags = if buildIde then "-lablgtkdir
${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+ idePatch = if buildIde then ''
+ substituteInPlace scripts/coqmktop.ml --replace \
+ "\"-I\"; \"+lablgtk2\"" \
+ "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\";
\"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
+ '' else "";
in
stdenv.mkDerivation {
@@ -21,9 +27,10 @@
preConfigure = ''
configureFlagsArray=(
+ -opt
-camldir ${ocaml}/bin
-camlp5dir $(ocamlfind query camlp5)
- -lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -opt -coqide opt
+ ${ideFlags}
)
'';
@@ -36,17 +43,16 @@
RM=$(type -tp rm)
substituteInPlace configure --replace "/bin/uname" "$UNAME"
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
- substituteInPlace scripts/coqmktop.ml --replace \
- "\"-I\"; \"+lablgtk2\"" \
- "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\";
\"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
+ ${idePatch}
'';
# This post install step is needed to build ssrcoqide from the ssreflect
package
# It could be made optional, but I see little harm in including it in the
default
# distribution -- roconnor
- postInstall = ''
+ # This will likely no longer be necessary for coq >= 8.4. -- roconnor
+ postInstall = if buildIde then ''
cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/
- '';
+ '' else "";
meta = {
description = "Coq proof assistant";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 28 19:45:14
2012 (r34262)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 28 20:53:17
2012 (r34263)
@@ -8298,7 +8298,7 @@
spass = callPackage ../applications/science/logic/spass {};
ssreflect = callPackage ../applications/science/logic/ssreflect {
- camlp5 = ocamlPackages.camlp5_5_transitional;
+ camlp5 = ocamlPackages.camlp5_transitional;
};
tptp = callPackage ../applications/science/logic/tptp {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
