diff options
| author | vbgl <vbgl@users.noreply.github.com> | 2016-05-03 12:56:16 +0200 |
|---|---|---|
| committer | vbgl <vbgl@users.noreply.github.com> | 2016-05-03 12:56:16 +0200 |
| commit | a95df7d800e7b26694063e2883f325de0abab4c0 (patch) | |
| tree | e190ebbbf85ca73c2a1186ee2f9ce91624f00ae3 /pkgs | |
| parent | fe0bb1efd13b75eeb0785840d88c2280562d5f69 (diff) | |
| parent | 3a6c85da65977c9f2a20fb40b18aaac8077e53b8 (diff) | |
| download | nixlib-a95df7d800e7b26694063e2883f325de0abab4c0.tar nixlib-a95df7d800e7b26694063e2883f325de0abab4c0.tar.gz nixlib-a95df7d800e7b26694063e2883f325de0abab4c0.tar.bz2 nixlib-a95df7d800e7b26694063e2883f325de0abab4c0.tar.lz nixlib-a95df7d800e7b26694063e2883f325de0abab4c0.tar.xz nixlib-a95df7d800e7b26694063e2883f325de0abab4c0.tar.zst nixlib-a95df7d800e7b26694063e2883f325de0abab4c0.zip | |
Merge pull request #15106 from vbgl/camlp5-6.16
camlp5: 6.14 -> 6.16
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/logic/hol_light/Makefile.patch | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/camlp5/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch index 2cb05f27a4f6..b572001a75d6 100644 --- a/pkgs/applications/science/logic/hol_light/Makefile.patch +++ b/pkgs/applications/science/logic/hol_light/Makefile.patch @@ -7,7 +7,7 @@ Index: Makefile 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" -o ${CAMLP5_VERSION} = "6.12" ; \ -+ 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" ; \ ++ 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" ; \ 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/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 83dd74d321ec..bb44bbc8d6ee 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -7,11 +7,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-6.14"; + name = "camlp5${if transitional then "_transitional" else ""}-6.16"; src = fetchurl { - url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.14.tgz; - sha256 = "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89"; + url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.16.tgz; + sha256 = "1caqa2rl7rav7pfwv1l1j0j18yr1qzyyqz0wa9519x91ckznqi7x"; }; buildInputs = [ ocaml ]; |