From cd3caeaf8f3212f2d0ab6cbd079be6a3fa06881e Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 19 Mar 2013 14:49:45 +0100 Subject: [PATCH 1/2] Update ProofGeneral to version 4.2 --- .../editors/emacs-modes/proofgeneral/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix index 18c16569cf8..fba3c71e36a 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }: stdenv.mkDerivation (rec { - name = "ProofGeneral-4.1"; + name = "ProofGeneral-4.2"; src = fetchurl { - url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.1.tgz; - sha256 = "1ivxx8c6j7cfdfj2pj0gzdqac7hpb679bjmwdqdcz1c1ni34s9ia"; + url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz; + sha256 = "09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm"; }; sourceRoot = name; @@ -24,7 +24,7 @@ stdenv.mkDerivation (rec { sed -i '101d' doc/ProofGeneral.texi # Emacs 24 compatibility. - sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el + #sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el ''; preBuild = '' From 7b35dcdc623c539ee47b19fff9d6facab2fd3ef5 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Sun, 24 Mar 2013 23:43:18 +0100 Subject: [PATCH 2/2] ProofGeneral: remove dead code (compatibility with emacs 23). --- pkgs/applications/editors/emacs-modes/proofgeneral/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix index fba3c71e36a..6ac698ed75f 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix @@ -22,9 +22,6 @@ stdenv.mkDerivation (rec { # @image{ProofGeneral} fails, so remove it. sed -i '94d' doc/PG-adapting.texi sed -i '101d' doc/ProofGeneral.texi - - # Emacs 24 compatibility. - #sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el ''; preBuild = ''