diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-09-30 09:41:02 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-10-01 00:44:15 +0100 |
| commit | c260abbff8c0e153a5ac467063751de0497eb23c (patch) | |
| tree | 447bb2b2dd98b978c79f297600b77388350e1548 /pkgs/applications/science/logic/hol_light | |
| parent | a6af1e96de75868bd649a8112031437c3cdc8ec4 (diff) | |
| download | nixpkgs-c260abbff8c0e153a5ac467063751de0497eb23c.tar nixpkgs-c260abbff8c0e153a5ac467063751de0497eb23c.tar.gz nixpkgs-c260abbff8c0e153a5ac467063751de0497eb23c.tar.bz2 nixpkgs-c260abbff8c0e153a5ac467063751de0497eb23c.tar.lz nixpkgs-c260abbff8c0e153a5ac467063751de0497eb23c.tar.xz nixpkgs-c260abbff8c0e153a5ac467063751de0497eb23c.tar.zst nixpkgs-c260abbff8c0e153a5ac467063751de0497eb23c.zip | |
hol_light: update to r199
And adds compatibility with camlp5-6.12
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 | 8 |
2 files changed, 18 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch new file mode 100644 index 00000000000..ae521004f33 --- /dev/null +++ b/pkgs/applications/science/logic/hol_light/Makefile.patch @@ -0,0 +1,13 @@ +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 a3c49ab294e..9b8f25cab77 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -10,16 +10,18 @@ in stdenv.mkDerivation rec { name = "hol_light-${version}"; - version = "198"; + version = "199"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; rev = version; - sha256 = "1y7vivj5l84fb7wqn38qbykpgs8ql2gmqxxch1yn5mg1cf9iiqsx"; + sha256 = "0308nw91iww18wvl30g5ygf6lhw329jh1vqi9hsh30inhb3dx3jw"; }; buildInputs = [ ocaml findlib camlp5 ]; + patches = [ ./Makefile.patch ]; + installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light @@ -32,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice z77z ]; + maintainers = with maintainers; [ thoughtpolice z77z vbgl ]; }; } |