diff options
| author | vbgl <vbgl@users.noreply.github.com> | 2015-07-26 11:03:44 +0200 |
|---|---|---|
| committer | vbgl <vbgl@users.noreply.github.com> | 2015-07-26 11:03:44 +0200 |
| commit | 384d2febfe9e12ca85640f23bc904f0e917f6eac (patch) | |
| tree | ffa4fdc2d22492893242f410c982473a4bd85449 /pkgs/applications | |
| parent | 4de0d7def5805433261f5d171480c90824d9f9e2 (diff) | |
| parent | 1173278f3462673dccd20b8be95cb1281a64f815 (diff) | |
| download | nixlib-384d2febfe9e12ca85640f23bc904f0e917f6eac.tar nixlib-384d2febfe9e12ca85640f23bc904f0e917f6eac.tar.gz nixlib-384d2febfe9e12ca85640f23bc904f0e917f6eac.tar.bz2 nixlib-384d2febfe9e12ca85640f23bc904f0e917f6eac.tar.lz nixlib-384d2febfe9e12ca85640f23bc904f0e917f6eac.tar.xz nixlib-384d2febfe9e12ca85640f23bc904f0e917f6eac.tar.zst nixlib-384d2febfe9e12ca85640f23bc904f0e917f6eac.zip | |
Merge pull request #8915 from vbgl/pg
ProofGeneral: 4.3pre131011 -> 4.3pre150313
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix index 96d7619d387b..815863ac6da1 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: stdenv.mkDerivation (rec { - name = "ProofGeneral-4.3pre131011"; + name = "ProofGeneral-4.3pre150313"; src = fetchurl { - url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.3pre131011.tgz; - sha256 = "0104iy2xik5npkdg9p2ir6zqyrmdc93azrgm3ayvg0z76vmnb816"; + url = "http://proofgeneral.inf.ed.ac.uk/releases/${name}.tgz"; + sha256 = "1jq5ykkk14xr5qcn4kyxmi5ls0fibr0y47gfygzm1mzrfvz9aw3f"; }; sourceRoot = name; diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch index c733911118de..704e4b6c8c7a 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch @@ -7,7 +7,7 @@ diff -r c7d8bfff4c0a bin/proofgeneral if [ -z "$PGHOME" ] || [ ! -d "$PGHOME" ]; then - # default relative to this script, otherwise PGHOMEDEFAULT - MYDIR="`readlink --canonicalize "$0" | sed -ne 's,/bin/proofgeneral$,,p'`" -- if [ -d "$MYDIR" ]; then +- if [ -d "$MYDIR/generic" ]; then - PGHOME="$MYDIR" - elif [ -d "$PGHOMEDEFAULT" ]; then + if [ -d "$PGHOMEDEFAULT" ]; then |