diff options
author | Arie Middelkoop <amiddelk@gmail.com> | 2012-01-16 10:20:13 +0000 |
---|---|---|
committer | Arie Middelkoop <amiddelk@gmail.com> | 2012-01-16 10:20:13 +0000 |
commit | c87285c2552fb5717a4d5ef0add40502761d8352 (patch) | |
tree | 3924b086f285246026dfb63d9a9d3caf4815df14 /pkgs/top-level/all-packages.nix | |
parent | 3b833cc93b71dfb0186200ec27c46025b2b6b0d3 (diff) | |
download | nixlib-c87285c2552fb5717a4d5ef0add40502761d8352.tar nixlib-c87285c2552fb5717a4d5ef0add40502761d8352.tar.gz nixlib-c87285c2552fb5717a4d5ef0add40502761d8352.tar.bz2 nixlib-c87285c2552fb5717a4d5ef0add40502761d8352.tar.lz nixlib-c87285c2552fb5717a4d5ef0add40502761d8352.tar.xz nixlib-c87285c2552fb5717a4d5ef0add40502761d8352.tar.zst nixlib-c87285c2552fb5717a4d5ef0add40502761d8352.zip |
Updated the coccinelle package to the latest release (1.0.0-RC9).
Added additional ocaml modules which are needed for coccinelle. svn path=/nixpkgs/trunk/; revision=31579
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be5414c7c0f0..729cee894fa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2431,6 +2431,14 @@ let ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 { camlp5 = camlp5_5_transitional; }; + + ocaml_typeconv = callPackage ../development/ocaml-modules/typeconv { }; + + ocaml_sexplib = callPackage ../development/ocaml-modules/sexplib { }; + + ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; + + pycaml = callPackage ../development/ocaml-modules/pycaml { }; }; ocamlPackages = recurseIntoAttrs ocamlPackages_3_11_1; @@ -2438,6 +2446,8 @@ let ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1; ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; + ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; + opa = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/compilers/opa { }; ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; @@ -2886,7 +2896,10 @@ let cmakeWithGui = cmakeCurses.override { useQt4 = true; }; - coccinelle = callPackage ../development/tools/misc/coccinelle { }; + coccinelle = callPackage ../development/tools/misc/coccinelle { + ocamlPackages = ocamlPackages_3_12_1; + ocaml = ocaml_3_12_1; + }; cppi = callPackage ../development/tools/misc/cppi { }; |