Author: kkallio
Date: Tue Dec 13 01:13:46 2011
New Revision: 30863
URL: https://nixos.org/websvn/nix/?rev=30863&sc=1
Log:
ProofGeneral 4.1
Deleted:
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/proofgeneral/emacs-23.3.patch
Modified:
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
Mon Dec 12 23:44:49 2011 (r30862)
+++
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
Tue Dec 13 01:13:46 2011 (r30863)
@@ -1,28 +1,32 @@
{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
stdenv.mkDerivation (rec {
- name = "ProofGeneral-4.0";
+ name = "ProofGeneral-4.1";
src = fetchurl {
- url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.0.tgz;
- sha256 = "1ang2lsc97vl70fkgypfsr1ivdzsdliq3bkvympj30wnc7ayzbmq";
+ url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.1.tgz;
+ sha256 = "1ivxx8c6j7cfdfj2pj0gzdqac7hpb679bjmwdqdcz1c1ni34s9ia";
};
sourceRoot = name;
buildInputs = [ emacs texinfo texLive perl which ];
- patches = [ ./emacs-23.3.patch ];
-
- postPatch =
+ prePatch =
'' sed -i "Makefile" \
-e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
s|/sbin/install-info|install-info|g"
sed -i "bin/proofgeneral" -e's/which/type -p/g'
+
+ # @image{ProofGeneral} fails, so remove it.
+ sed -i '94d' doc/PG-adapting.texi
+ sed -i '101d' doc/ProofGeneral.texi
'';
- preBuild = "make clean";
+ preBuild = ''
+ make clean;
+ '';
installPhase =
# Copy `texinfo.tex' in the right place so that `texi2pdf' works.
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
