diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-08 04:11:28 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-08 06:14:43 +0000 |
| commit | 43b2b55743cb0505fe80dd767d768fc411f2852c (patch) | |
| tree | efed0763bc696e9f276d578d742ee8912f4a72e8 /pkgs/applications/science | |
| parent | 59ad9714f6887c317232fca9d01fc1ca6971e67d (diff) | |
| download | nixlib-43b2b55743cb0505fe80dd767d768fc411f2852c.tar nixlib-43b2b55743cb0505fe80dd767d768fc411f2852c.tar.gz nixlib-43b2b55743cb0505fe80dd767d768fc411f2852c.tar.bz2 nixlib-43b2b55743cb0505fe80dd767d768fc411f2852c.tar.lz nixlib-43b2b55743cb0505fe80dd767d768fc411f2852c.tar.xz nixlib-43b2b55743cb0505fe80dd767d768fc411f2852c.tar.zst nixlib-43b2b55743cb0505fe80dd767d768fc411f2852c.zip | |
hol_light: 2016-07-23 -> 2017-07-06
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/Makefile.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/default.nix | 16 |
2 files changed, 11 insertions, 18 deletions
diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch deleted file mode 100644 index 5c1ec4f7aaf1..000000000000 --- a/pkgs/applications/science/logic/hol_light/Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== ---- a/Makefile (révision 199) -+++ b/Makefile (copie de travail) -@@ -59,7 +59,7 @@ - then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ - else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \ - then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ -- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" ; \ -+ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" -o ${CAMLP5_VERSION} = "6.17" ; \ - then cp pa_j_3.1x_6.11.ml pa_j.ml; \ - else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ - fi \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index fbd732595e6c..8d7c11ee91b7 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeScript, ocaml, camlp5 }: +{ stdenv, fetchFromGitHub, fetchpatch, writeScript, ocaml, camlp5 }: let start_script = '' @@ -9,18 +9,24 @@ let in stdenv.mkDerivation { - name = "hol_light-2016-07-23"; + name = "hol_light-2017-07-06"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "67cff936dda719f0e0ee57ab9d07c779ff664660"; - sha256 = "0r85ifdvsvk2cdv7s4a0kf9ha6jdznqmz7swvp577f8r182klr28"; + rev = "0ad8cbdb4de08a38dac600f352555e8454499faa"; + sha256 = "0px9hl1b0mkyqv84j0si1zdq4066ffdrhzp27p2iah9l8ynbvpaq"; }; buildInputs = [ ocaml camlp5 ]; - patches = [ ./Makefile.patch ]; + patches = [ (fetchpatch { + url = https://github.com/girving/hol-light/commit/f80524bad61fd6f6facaa42153b2e29d1eab4658.patch; + sha256 = "1563wp597vakhmsgg8940dpirzzfvvxqp75x3dnx20rvmi2n2xw0"; + }) + ]; + + postPatch = "cp pa_j_3.1x_{6,7}.xx.ml"; installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" |