ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

hol_light: update to r199

Browse Source 
And adds compatibility with camlp5-6.12
This commit is contained in:
Vincent Laporte 2014-09-30 09:41:02 +01:00
parent a6af1e96de
commit c260abbff8
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/science/logic/hol_light/Makefile.patch Normal file
View File

@ -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 \

8
pkgs/applications/science/logic/hol_light/default.nix
View File

@ -10,16 +10,18 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hol_light-${version}"; name = "hol_light-${version}";
version = "198"; version = "199";
src = fetchsvn { src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk; url = http://hol-light.googlecode.com/svn/trunk;
rev = version; rev = version;
sha256 = "1y7vivj5l84fb7wqn38qbykpgs8ql2gmqxxch1yn5mg1cf9iiqsx"; sha256 = "0308nw91iww18wvl30g5ygf6lhw329jh1vqi9hsh30inhb3dx3jw";
}; };
buildInputs = [ ocaml findlib camlp5 ]; buildInputs = [ ocaml findlib camlp5 ];
patches = [ ./Makefile.patch ];
installPhase = '' installPhase = ''
mkdir -p "$out/lib/hol_light" "$out/bin" mkdir -p "$out/lib/hol_light" "$out/bin"
cp -a . $out/lib/hol_light cp -a . $out/lib/hol_light
@ -32,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/; homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice z77z ]; maintainers = with maintainers; [ thoughtpolice z77z vbgl ];
}; };
} }