Author: maggesi
Date: Thu Nov 4 11:24:27 2010
New Revision: 24597
URL: https://svn.nixos.org/websvn/nix/?rev=24597&sc=1
Log:
Update Coq
Added:
nixpkgs/trunk/pkgs/applications/science/logic/coq/configure.patch
Deleted:
nixpkgs/trunk/pkgs/applications/science/logic/coq/8.3rc1.nix
nixpkgs/trunk/pkgs/applications/science/logic/coq/configure.patch.gz
nixpkgs/trunk/pkgs/applications/science/logic/coq/coq-8.3-rc1_configure.patch
Modified:
nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/science/logic/coq/configure.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/science/logic/coq/configure.patch Thu Nov
4 11:24:27 2010 (r24597)
@@ -0,0 +1,20 @@
+diff -Nuar coq-8.3/configure coq-8.3.nixos/configure
+--- coq-8.3/configure 2010-10-14 16:02:46.000000000 +0200
++++ coq-8.3.nixos/configure 2010-11-04 09:57:16.000000000 +0100
+@@ -394,7 +394,6 @@
+ ocamlyaccexec=$CAMLBIN/ocamlyacc
+ ocamlmktopexec=$CAMLBIN/ocamlmktop
+ ocamlmklibexec=$CAMLBIN/ocamlmklib
+- camlp4oexec=$CAMLBIN/camlp4o
+ esac
+
+ if test ! -f "$CAMLC" ; then
+@@ -637,7 +636,7 @@
+ no) LABLGTKLIB=+lablgtk2 # Pour le message
+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
+ yes) LABLGTKLIB="$lablgtkdir" # Pour le message
+- LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile
++ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
+ esac;;
+ no) LABLGTKINCLUDES="";;
+ esac
Modified: nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix Thu Nov
4 10:47:24 2010 (r24596)
+++ nixpkgs/trunk/pkgs/applications/science/logic/coq/default.nix Thu Nov
4 11:24:27 2010 (r24597)
@@ -4,7 +4,7 @@
{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
let
- version = "8.2pl2";
+ version = "8.3";
in
stdenv.mkDerivation {
@@ -12,7 +12,7 @@
src = fetchurl {
url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";;
- sha256 = "0dh2vv3bvz8694dd12kjdkdaq19l1vslvygzif11igshc5bw4rhf";
+ sha256 = "02iy4rxz1n1kc85fb3vs4xpxqfxjw87y2gvmi39fxrj8742qx0dx";
};
buildInputs = [ ocaml camlp5 ncurses lablgtk ];
@@ -27,21 +27,13 @@
buildFlags = "world"; # Debug with "world VERBOSE=1";
- patches = [ ./configure.patch.gz ];
+ patches = [ ./configure.patch ];
postPatch = ''
- BASH=$(type -tp bash)
UNAME=$(type -tp uname)
- MV=$(type -tp mv)
RM=$(type -tp rm)
- substituteInPlace configure --replace "/bin/bash" "$BASH" \
- --replace "/bin/uname" "$UNAME"
- substituteInPlace Makefile --replace "/bin/bash" "$BASH" \
- --replace "/bin/mv" "$MV" \
- --replace "/bin/rm" "$RM"
- substituteInPlace Makefile.stage1 --replace "/bin/bash" "$BASH"
- substituteInPlace install.sh --replace "/bin/bash" "$BASH"
- substituteInPlace dev/v8-syntax/check-grammar --replace "/bin/bash" "$BASH"
+ substituteInPlace configure --replace "/bin/uname" "$UNAME"
+ substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
substituteInPlace scripts/coqmktop.ml --replace \
"\"-I\"; \"+lablgtk2\"" \
"\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\";
\"${lablgtk}/lib/ocaml/stublibs\""
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Nov 4 10:47:24
2010 (r24596)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Nov 4 11:24:27
2010 (r24597)
@@ -6836,10 +6836,6 @@
camlp5 = camlp5_transitional;
};
- coq_devel = callPackage ../applications/science/logic/coq/8.3rc1.nix {
- camlp5 = camlp5_transitional;
- };
-
eprover = callPackage ../applications/science/logic/eProver {
texLive = texLiveAggregationFun {
paths = [
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
