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

Upgrade camlp5 to version 6.02.3-1 (contributed by Russell O'Connor).

Browse Source 
Keep the old version 5.15 to allow a smooth migration.


svn path=/nixpkgs/trunk/; revision=30575
This commit is contained in:
Marco Maggesi 2011-11-26 19:39:14 +00:00
parent bf394d80ec
commit 8d4b5bcd0c
3 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/development/tools/ocaml/camlp5/5.15.nix Normal file
View File

@ -0,0 +1,44 @@
{stdenv, fetchurl, ocaml, transitional ? false}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "camlp5";
version = "5.15";
webpage = http://pauillac.inria.fr/~ddr/camlp5/;
metafile = ./META;
in
stdenv.mkDerivation {
name = "${pname}${if transitional then "_transitional" else ""}-${version}";
src = fetchurl {
url = "${webpage}/distrib/src/${pname}-${version}.tgz";
sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq";
};
buildInputs = [ ocaml ];
prefixKey = "-prefix ";
preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") +
" --libdir $out/lib/ocaml/${ocaml_version}/site-lib)";
buildFlags = "world.opt";
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META";
meta = {
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 = "${webpage}";
license = "BSD";
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z
];
};
}

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

@ -3,7 +3,7 @@
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version; ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "camlp5"; pname = "camlp5";
version = "5.15"; version = "6.02.3";
webpage = http://pauillac.inria.fr/~ddr/camlp5/; webpage = http://pauillac.inria.fr/~ddr/camlp5/;
metafile = ./META; metafile = ./META;
in in
@ -14,9 +14,16 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "${webpage}/distrib/src/${pname}-${version}.tgz"; url = "${webpage}/distrib/src/${pname}-${version}.tgz";
sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq"; sha256 = "1z9bwh267117br0vlhirv9yy2niqp2n25zfnl14wg6kgg9bqx7rj";
}; };
patches = fetchurl {
url = "${webpage}/distrib/src/patch-${version}-1";
sha256 = "159qpvr07mnn72yqwx24c6mw7hs6bl77capsii7apg9dcxar8w7v";
};
patchFlags = "-p 0";
buildInputs = [ ocaml ]; buildInputs = [ ocaml ];
prefixKey = "-prefix "; prefixKey = "-prefix ";

20
pkgs/top-level/all-packages.nix
View File

@ -2342,12 +2342,22 @@ let
camlidl = callPackage ../development/tools/ocaml/camlidl { }; camlidl = callPackage ../development/tools/ocaml/camlidl { };
camlp5_strict = callPackage ../development/tools/ocaml/camlp5 { }; camlp5_5_strict = callPackage ../development/tools/ocaml/camlp5/5.15.nix { };
camlp5_transitional = callPackage ../development/tools/ocaml/camlp5 { camlp5_5_transitional = callPackage ../development/tools/ocaml/camlp5/5.15.nix {
transitional = true; transitional = true;
}; };
camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { };
camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 {
transitional = true;
};
camlp5_strict = camlp5_6_strict;
camlp5_transitional = camlp5_6_transitional;
camlzip = callPackage ../development/ocaml-modules/camlzip { }; camlzip = callPackage ../development/ocaml-modules/camlzip { };
camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
@ -2398,7 +2408,7 @@ let
ounit = callPackage ../development/ocaml-modules/ounit { }; ounit = callPackage ../development/ocaml-modules/ounit { };
ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 { ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 {
camlp5 = camlp5_transitional; camlp5 = camlp5_5_transitional;
}; };
}; };
@ -8206,7 +8216,7 @@ let
coq = callPackage ../applications/science/logic/coq { coq = callPackage ../applications/science/logic/coq {
inherit (ocamlPackages) findlib lablgtk; inherit (ocamlPackages) findlib lablgtk;
camlp5 = ocamlPackages.camlp5_transitional; camlp5 = ocamlPackages.camlp5_5_transitional;
}; };
cvc3 = callPackage ../applications/science/logic/cvc3 {}; cvc3 = callPackage ../applications/science/logic/cvc3 {};
@ -8253,7 +8263,7 @@ let
spass = callPackage ../applications/science/logic/spass {}; spass = callPackage ../applications/science/logic/spass {};
ssreflect = callPackage ../applications/science/logic/ssreflect { ssreflect = callPackage ../applications/science/logic/ssreflect {
camlp5 = ocamlPackages.camlp5_transitional; camlp5 = ocamlPackages.camlp5_5_transitional;
}; };
tptp = callPackage ../applications/science/logic/tptp {}; tptp = callPackage ../applications/science/logic/tptp {};