mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
ProofGeneral 4.1
svn path=/nixpkgs/trunk/; revision=30863
This commit is contained in:
parent
7e82cfb7d6
commit
135fe9059f
@ -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.
|
||||
|
@ -1,45 +0,0 @@
|
||||
diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-mode.el ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el
|
||||
--- ProofGeneral-4.0/contrib/mmm/mmm-mode.el 2010-10-11 00:56:57.000000000 +0200
|
||||
+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el 2011-05-14 21:55:12.000000000 +0200
|
||||
@@ -160,9 +160,9 @@
|
||||
(mmm-add-hooks)
|
||||
(mmm-fixup-skeleton)
|
||||
(make-local-variable 'font-lock-fontify-region-function)
|
||||
- (make-local-variable 'font-lock-beginning-of-syntax-function)
|
||||
+ (make-local-variable 'syntax-begin-function)
|
||||
(setq font-lock-fontify-region-function 'mmm-fontify-region
|
||||
- font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax)
|
||||
+ syntax-begin-function 'mmm-beginning-of-syntax)
|
||||
(setq mmm-mode t)
|
||||
(condition-case err
|
||||
(mmm-apply-all)
|
||||
@@ -190,7 +190,7 @@
|
||||
(mmm-update-submode-region)
|
||||
(setq font-lock-fontify-region-function
|
||||
(get mmm-primary-mode 'mmm-fontify-region-function)
|
||||
- font-lock-beginning-of-syntax-function
|
||||
+ syntax-begin-function
|
||||
(get mmm-primary-mode 'mmm-beginning-of-syntax-function))
|
||||
(mmm-update-font-lock-buffer)
|
||||
(mmm-refontify-maybe)
|
||||
diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-region.el ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el
|
||||
--- ProofGeneral-4.0/contrib/mmm/mmm-region.el 2010-10-11 00:56:57.000000000 +0200
|
||||
+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el 2011-05-14 21:58:01.000000000 +0200
|
||||
@@ -548,7 +548,7 @@
|
||||
(put mode 'mmm-fontify-region-function
|
||||
font-lock-fontify-region-function))
|
||||
(put mode 'mmm-beginning-of-syntax-function
|
||||
- font-lock-beginning-of-syntax-function))
|
||||
+ syntax-begin-function))
|
||||
;; Get variables
|
||||
(setq global-vars (mmm-get-locals 'global)
|
||||
buffer-vars (mmm-get-locals 'buffer)
|
||||
@@ -768,7 +768,7 @@
|
||||
;; For some reason `font-lock-fontify-block' binds this to nil, thus
|
||||
;; preventing `mmm-beginning-of-syntax' from doing The Right Thing.
|
||||
;; I don't know why it does this, but let's undo it here.
|
||||
- (let ((font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax))
|
||||
+ (let ((syntax-begin-function 'mmm-beginning-of-syntax))
|
||||
(mapc #'(lambda (elt)
|
||||
(when (get (car elt) 'mmm-font-lock-mode)
|
||||
(mmm-fontify-region-list (car elt) (cdr elt))))
|
Loading…
Reference in New Issue
Block a user