JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ProofGeneral: 4.2 -> 4.4

Browse Source
This commit is contained in:
Vincent Laporte 2016-10-04 21:51:39 +02:00
parent 2a2a3c796a
commit 7b805bd0b0
3 changed files with 48 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix
View File

@ -1,54 +0,0 @@
{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
stdenv.mkDerivation (rec {
name = "ProofGeneral-4.2";
src = fetchurl {
url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz;
sha256 = "09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm";
};
sourceRoot = name;
buildInputs = [ emacs texinfo texLive perl which ];
prePatch =
'' sed -i "Makefile" \
-e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
s|/sbin/install-info|install-info|g"
# Workaround for bug #458
# ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90
# http://proofgeneral.inf.ed.ac.uk/trac/ticket/458
sed -i "Makefile" \
-e "s|(setq byte-compile-error-on-warn t)||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;
'';
installPhase =
# Copy `texinfo.tex' in the right place so that `texi2pdf' works.
'' cp -v "${automake}/share/"automake-*/texinfo.tex doc
make install install-doc
'';
meta = {
description = "Proof General, an Emacs front-end for proof assistants";
longDescription = ''
Proof General is a generic front-end for proof assistants (also known as
interactive theorem provers), based on the customizable text editor Emacs.
'';
homepage = http://proofgeneral.inf.ed.ac.uk;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix; # arbitrary choice
};
})

47
pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix Normal file
View File

@ -0,0 +1,47 @@
{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, which, automake, enableDoc ? false }:
stdenv.mkDerivation rec {
name = "ProofGeneral-${version}";
version = "4.4";
src = fetchFromGitHub {
owner = "ProofGeneral";
repo = "PG";
rev = "v${version}";
sha256 = "0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8";
};
buildInputs = [ emacs which ] ++ stdenv.lib.optionals enableDoc [ texinfo texLive ];
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'
chmod +x bin/proofgeneral
# @image{ProofGeneral-image} fails, so remove it.
sed -i '91d' doc/PG-adapting.texi
sed -i '96d' doc/ProofGeneral.texi
'' + stdenv.lib.optionalString enableDoc
# Copy `texinfo.tex' in the right place so that `texi2pdf' works.
'' cp -v "${automake}/share/"automake-*/texinfo.tex doc
'';
patches = [ ./pg.patch ];
installTargets = [ "install" ] ++ stdenv.lib.optional enableDoc "install-doc";
meta = {
description = "Proof General, an Emacs front-end for proof assistants";
longDescription = ''
Proof General is a generic front-end for proof assistants (also known as
interactive theorem provers), based on the customizable text editor Emacs.
'';
homepage = http://proofgeneral.inf.ed.ac.uk;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix; # arbitrary choice
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -12498,8 +12498,7 @@ in
prologMode = callPackage ../applications/editors/emacs-modes/prolog { };
proofgeneral_4_2 = callPackage ../applications/editors/emacs-modes/proofgeneral/4.2.nix {
texinfo = texinfo4 ;
proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral/4.4.nix {
texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; };
};
proofgeneral_4_3_pre = callPackage ../applications/editors/emacs-modes/proofgeneral/4.3pre.nix {
@ -12510,7 +12509,6 @@ in
texinfo = texinfo4 ;
texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; };
};
proofgeneral = self.proofgeneral_4_2;
quack = callPackage ../applications/editors/emacs-modes/quack { };