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

Merge pull request #20799 from vbgl/camlp5-6.17

Browse Source 
camlp5: 6.16 -> 6.17
This commit is contained in:
Frederik Rietdijk 2016-11-30 10:32:00 +01:00 committed by GitHub
commit 1b68772f2b
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/logic/hol_light/Makefile.patch
View File

@ -6,8 +6,8 @@ Index: Makefile
then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ 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" ; \ 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; \ 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" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" ; \
+ 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" ; \ + 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.15" -o ${CAMLP5_VERSION} = "6.16" -o ${CAMLP5_VERSION} = "6.17" ; \
then cp pa_j_3.1x_6.11.ml pa_j.ml; \ 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; \ else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \
fi \ fi \

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

@ -20,6 +20,8 @@ stdenv.mkDerivation {
buildInputs = [ ocaml camlp5 ]; buildInputs = [ ocaml 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

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, transitional ? false}: { stdenv, fetchzip, ocaml, transitional ? false }:
let let
metafile = ./META; metafile = ./META;
@ -6,11 +6,11 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "camlp5${if transitional then "_transitional" else ""}-6.16"; name = "camlp5${if transitional then "_transitional" else ""}-6.17";
src = fetchurl { src = fetchzip {
url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.16.tgz; url = https://github.com/camlp5/camlp5/archive/rel617.tar.gz;
sha256 = "1caqa2rl7rav7pfwv1l1j0j18yr1qzyyqz0wa9519x91ckznqi7x"; sha256 = "0finmr6y0lyd7mnl61kmvwd32cmmf64m245vdh1iy0139rxf814c";
}; };
buildInputs = [ ocaml ]; buildInputs = [ ocaml ];
@ -30,7 +30,7 @@ stdenv.mkDerivation {
Camlp5 is a preprocessor and pretty-printer for OCaml programs. Camlp5 is a preprocessor and pretty-printer for OCaml programs.
It also provides parsing and printing tools. It also provides parsing and printing tools.
''; '';
homepage = http://pauillac.inria.fr/~ddr/camlp5/; homepage = https://camlp5.github.io/;
license = licenses.bsd3; license = licenses.bsd3;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ maintainers = with maintainers; [