Author: roconnor
Date: Tue Apr 5 11:59:25 2011
New Revision: 26692
URL: https://svn.nixos.org/websvn/nix/?rev=26692&sc=1
Log:
update coq to 8.3pl1
update ssreflect to 1.3pl1
Modified:
nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix
nixpkgs/trunk/pkgs/applications/science/logic/ssreflect/default.nix
Modified: nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix Tue Apr
5 11:44:13 2011 (r26691)
+++ nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix Tue Apr
5 11:59:25 2011 (r26692)
@@ -4,7 +4,7 @@
{stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}:
let
- version = "8.3";
+ version = "8.3pl1";
in
stdenv.mkDerivation {
@@ -12,7 +12,7 @@
src = fetchurl {
url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";;
- sha256 = "02iy4rxz1n1kc85fb3vs4xpxqfxjw87y2gvmi39fxrj8742qx0dx";
+ sha256 = "0a791gsbf17y2wi0a376n78pxkhpl0lkzifhy5d3mx3lpn376j9s";
};
buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
@@ -29,7 +29,7 @@
buildFlags = "world"; # Debug with "world VERBOSE=1";
- patches = [ ./configure.patch ./coq-8.3-make-3.82-compat.patch ];
+ patches = [ ./configure.patch ];
postPatch = ''
UNAME=$(type -tp uname)
@@ -41,6 +41,9 @@
"\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\";
\"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
'';
+ # 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 = ''
cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/
'';
Modified: nixpkgs/trunk/pkgs/applications/science/logic/ssreflect/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/logic/ssreflect/default.nix Tue Apr
5 11:44:13 2011 (r26691)
+++ nixpkgs/trunk/pkgs/applications/science/logic/ssreflect/default.nix Tue Apr
5 11:59:25 2011 (r26692)
@@ -1,13 +1,12 @@
# TODO:
-# - ssrcoqide does not build successfully (missing coqide libraries in the coq
installation).
-# - ssrcoq needs to be invoked with the explicit path to the ssreflect theory
-# e.g.. ssrcoq -I
/nix/store/rp09dlb2y2hpddb0xa7fyrgjlzb284ar-ssreflect-1.2/lib/coq/user-contrib/theories/
+# - coq needs to be invoked with the explicit path to the ssreflect theory
+# e.g. coqide -R ~/.nix-profile/lib/coq/user-contrib/ ''
{stdenv, fetchurl, ocaml, camlp5, coq}:
let
pname = "ssreflect";
- version = "1.2";
+ version = "1.3pl1";
name = "${pname}-${version}";
webpage = http://www.msr-inria.inria.fr/Projects/math-components;
in
@@ -16,18 +15,12 @@
inherit name;
src = fetchurl {
- url = "${webpage}/${name}.tgz";
- sha256 =
"0800b085e6a0caec5093c6c02aacdd8dfd9cc282177e8586f14f9a9e15f64d0b";
+ url = "${webpage}/${name}.tar.gz";
+ sha256 = "0ykrhqb68aanl5d4dmn0vnx8m34gg0jsbdhwx2852rqi7r00b9ri";
};
buildInputs = [ ocaml camlp5 coq ];
- preBuild = ''
- coq_makefile -f Make -o Makefile
- substituteInPlace Makefile \
- --replace 'install -D $$i $(COQLIB)' 'install -D $$i '$out'/lib/coq'
- '';
-
# this fails
/*
postBuild = ''
@@ -36,10 +29,9 @@
'';
*/
- postInstall = ''
+ installPhase = ''
+ COQLIB=$out/lib/coq make -f Makefile.coq install -e
ensureDir $out/bin
- #cp -a bin/ssrcoq bin/ssrcoqide $out/bin
- cp -a bin/ssrcoq $out/bin
'';
meta = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
