diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-11-17 06:53:45 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-11-17 06:53:45 +0000 |
| commit | 8227297567738bc351894aca59af207f0c6730fd (patch) | |
| tree | 9798f0b11d49d976fb169ebed3435577e7184291 /pkgs/applications/science/logic/hol_light | |
| parent | 4dd7bf116bd3832df0b90b65653b0cba6633b529 (diff) | |
| download | nixpkgs-8227297567738bc351894aca59af207f0c6730fd.tar nixpkgs-8227297567738bc351894aca59af207f0c6730fd.tar.gz nixpkgs-8227297567738bc351894aca59af207f0c6730fd.tar.bz2 nixpkgs-8227297567738bc351894aca59af207f0c6730fd.tar.lz nixpkgs-8227297567738bc351894aca59af207f0c6730fd.tar.xz nixpkgs-8227297567738bc351894aca59af207f0c6730fd.tar.zst nixpkgs-8227297567738bc351894aca59af207f0c6730fd.zip | |
hol_light: update from 199 to 205
Diffstat (limited to 'pkgs/applications/science/logic/hol_light')
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/Makefile.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/default.nix | 6 |
2 files changed, 2 insertions, 17 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 ae521004f33..00000000000 --- a/pkgs/applications/science/logic/hol_light/Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== ---- /Makefile (révision 199) -+++ /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" ; \ -+ 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" ; \ - 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 9b8f25cab77..1e4fe08639f 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -10,18 +10,16 @@ in stdenv.mkDerivation rec { name = "hol_light-${version}"; - version = "199"; + version = "205"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; rev = version; - sha256 = "0308nw91iww18wvl30g5ygf6lhw329jh1vqi9hsh30inhb3dx3jw"; + sha256 = "1qnk3fkfr6f74nd8wsi84s9kg872cw766sa15a2ldlhs9ma76chj"; }; buildInputs = [ ocaml findlib camlp5 ]; - patches = [ ./Makefile.patch ]; - installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light |