pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #15106 from vbgl/camlp5-6.16

camlp5: 6.14 -> 6.16

vbgl a95df7d8 fe0bb1ef

+4 -4
unified split
+1 -1
pkgs/applications/science/logic/hol_light/Makefile.patch
··· 7 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 8 then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ 9 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" ; \ 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" -o ${CAMLP5_VERSION} = "6.16" ; \ 11 11 then cp pa_j_3.1x_6.11.ml pa_j.ml; \ 12 12 else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ 13 13 fi \
+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.14"; 10 + name = "camlp5${if transitional then "_transitional" else ""}-6.16"; 11 11 12 12 src = fetchurl { 13 - url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.14.tgz; 14 - sha256 = "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89"; 13 + url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.16.tgz; 14 + sha256 = "1caqa2rl7rav7pfwv1l1j0j18yr1qzyyqz0wa9519x91ckznqi7x"; 15 15 }; 16 16 17 17 buildInputs = [ ocaml ];