JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4342 from vbgl/camlp5-6.12

Browse Source 
Camlp5: update to 6.12; hol-light: update to r199
This commit is contained in:
Mateusz Kowalczyk 2014-10-03 18:36:06 +01:00
commit 3d26ea99dc
4 changed files with 26 additions and 10 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 {
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 ];
};
}

1
pkgs/development/coq-modules/containers/default.nix
View File

@ -19,6 +19,7 @@ stdenv.mkDerivation {
description = "A typeclass-based Coq library of finite sets/maps";
maintainers = with maintainers; [ vbgl ];
platforms = coq.meta.platforms;
broken = true; /* the source hash is wrong */
};
}

14
pkgs/development/tools/ocaml/camlp5/default.nix
View File

@ -7,11 +7,11 @@ in
stdenv.mkDerivation {
name = "camlp5${if transitional then "_transitional" else ""}-6.11";
name = "camlp5${if transitional then "_transitional" else ""}-6.12";
src = fetchurl {
url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.11.tgz;
sha256 = "0dxb5id6imq502sic75l786q94dhplqx6yyhjkkw19kf64fiqlk5";
url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.12.tgz;
sha256 = "00jwgp6w4g64lfqjx77xziy532091fy00c42fsy0b4i892rch5mp";
};
buildInputs = [ ocaml ];
@ -25,17 +25,17 @@ stdenv.mkDerivation {
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META";
meta = {
meta = with stdenv.lib; {
description = "Preprocessor-pretty-printer for OCaml";
longDescription = ''
Camlp5 is a preprocessor and pretty-printer for OCaml programs.
It also provides parsing and printing tools.
'';
homepage = http://pauillac.inria.fr/~ddr/camlp5/;
license = stdenv.lib.licenses.bsd3;
license = licenses.bsd3;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z
maintainers = with maintainers; [
z77z vbgl
];
};
}