diff options
author | Graham Christensen <graham@grahamc.com> | 2016-10-08 09:00:11 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-08 09:00:11 -0400 |
commit | 034ba88850fb36d93ba42b2b1ddef6f2b16bd86e (patch) | |
tree | 13ceed8ecde39406852f21add84d280e5035737e /pkgs/applications | |
parent | a72dd11b3e79760eac8930b9cc91ed2474e27f61 (diff) | |
parent | 4e60f99b838d8d72a67ca5e990e79cad76772450 (diff) | |
download | nixlib-034ba88850fb36d93ba42b2b1ddef6f2b16bd86e.tar nixlib-034ba88850fb36d93ba42b2b1ddef6f2b16bd86e.tar.gz nixlib-034ba88850fb36d93ba42b2b1ddef6f2b16bd86e.tar.bz2 nixlib-034ba88850fb36d93ba42b2b1ddef6f2b16bd86e.tar.lz nixlib-034ba88850fb36d93ba42b2b1ddef6f2b16bd86e.tar.xz nixlib-034ba88850fb36d93ba42b2b1ddef6f2b16bd86e.tar.zst nixlib-034ba88850fb36d93ba42b2b1ddef6f2b16bd86e.zip |
Merge pull request #19267 from vbgl/proofgeneral-4.4
ProofGeneral: 4.2 -> 4.4
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix | 54 | ||||
-rw-r--r-- | pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix (renamed from pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix) | 44 |
2 files changed, 19 insertions, 79 deletions
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix deleted file mode 100644 index c026d058b4e3..000000000000 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix +++ /dev/null @@ -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 - }; -}) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix index 815863ac6da1..0f7ac1d1dc80 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix @@ -1,44 +1,38 @@ -{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: +{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, which, automake, enableDoc ? false }: -stdenv.mkDerivation (rec { - name = "ProofGeneral-4.3pre150313"; +stdenv.mkDerivation rec { + name = "ProofGeneral-${version}"; + version = "4.4"; - src = fetchurl { - url = "http://proofgeneral.inf.ed.ac.uk/releases/${name}.tgz"; - sha256 = "1jq5ykkk14xr5qcn4kyxmi5ls0fibr0y47gfygzm1mzrfvz9aw3f"; + src = fetchFromGitHub { + owner = "ProofGeneral"; + repo = "PG"; + rev = "v${version}"; + sha256 = "0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8"; }; - sourceRoot = name; - - buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; + 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' - # @image{ProofGeneral} fails, so remove it. - sed -i '94d' doc/PG-adapting.texi + 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 ]; - preBuild = '' - make clean; - ''; - - installPhase = - if enableDoc - then - # Copy `texinfo.tex' in the right place so that `texi2pdf' works. - '' cp -v "${automake}/share/"automake-*/texinfo.tex doc - make install install-doc - '' - else "make install"; + installTargets = [ "install" ] ++ stdenv.lib.optional enableDoc "install-doc"; meta = { description = "Proof General, an Emacs front-end for proof assistants"; @@ -50,4 +44,4 @@ stdenv.mkDerivation (rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; # arbitrary choice }; -}) +} |