pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #10014 from vbgl/camlp5-6.13

camlp5: 6.12 → 6.14

vbgl b02c0764 bfd8e56a

+18 -3
+13
pkgs/applications/science/logic/hol_light/Makefile.patch
··· 1 + Index: Makefile 2 + =================================================================== 3 + --- a/Makefile (révision 199) 4 + +++ b/Makefile (copie de travail) 5 + @@ -59,7 +59,7 @@ 6 + then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ 7 + 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" ; \ 8 + then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ 9 + - 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" ; \ 10 + + 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" ; \ 11 + then cp pa_j_3.1x_6.11.ml pa_j.ml; \ 12 + else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ 13 + fi \
+2
pkgs/applications/science/logic/hol_light/default.nix
··· 20 20 21 21 buildInputs = [ ocaml camlp5 ]; 22 22 23 + patches = [ ./Makefile.patch ]; 24 + 23 25 installPhase = '' 24 26 mkdir -p "$out/lib/hol_light" "$out/bin" 25 27 cp -a . $out/lib/hol_light
+3 -3
pkgs/development/tools/ocaml/camlp5/default.nix
··· 7 7 8 8 stdenv.mkDerivation { 9 9 10 - name = "camlp5${if transitional then "_transitional" else ""}-6.12"; 10 + name = "camlp5${if transitional then "_transitional" else ""}-6.14"; 11 11 12 12 src = fetchurl { 13 - url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.12.tgz; 14 - sha256 = "00jwgp6w4g64lfqjx77xziy532091fy00c42fsy0b4i892rch5mp"; 13 + url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.14.tgz; 14 + sha256 = "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89"; 15 15 }; 16 16 17 17 buildInputs = [ ocaml ];