* Added "easytag", a GUI for organizing id3tags in mp3s.

* Updated some ocaml packages.
* Updated coccinelle.

svn path=/nixpkgs/trunk/; revision=33674

pkgs/development/tools/misc/coccinelle/default.nix

@@ -1,45 +1,25 @@
-{ fetchurl, stdenv, perl, python, ncurses, makeWrapper
-, ocaml, ocamlPackages }:
+{ fetchurl, stdenv, python, ncurses, ocamlPackages }:
 
-stdenv.mkDerivation rec {
-  name = "coccinelle-1.0.0-rc9";
+let
+
+  name = "coccinelle-1.0.0-rc12";
+  sha256 = "03b8930a53623ec79dc2486e9b6a569e373958cf46074c5f1d0028c70708498d";
+
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
-    sha256 = "75d5354e76500b627ccc33b8a929305e5a815ebf08027a8dc094f75ece241697";
+    inherit sha256;
   };
 
-  buildInputs = [
-      ocaml ocamlPackages.findlib
-      ocamlPackages.menhir ocamlPackages.ocaml_batteries
-      ocamlPackages.ocaml_pcre ocamlPackages.ocaml_sexplib
-      ocamlPackages.ocaml_extlib ocamlPackages.pycaml
-      python ncurses makeWrapper perl
-    ];
+  buildInputs = with ocamlPackages; [
+    ocaml findlib menhir
+    ocaml_pcre ocaml_sexplib pycaml
+    python ncurses
+  ];
 
-  preConfigure =
-    '' sed -i "configure" -e's|/usr/bin/perl|${perl}/bin/perl|g'
-       sed -i "globals/config.ml.in" \
-           -e"s|/usr/local/share|$out/share|g"
-    '';
-
-  buildPhase = "make depend && make all && make all.opt";
-
-  # Note: The tests want $out/share/coccinelle/standard.h so they must be run
-  # after "make install".
-  doCheck = false;
-
-  postInstall =
-    '' wrapProgram "$out/bin/spatch"                                    \
-         --prefix "LD_LIBRARY_PATH" ":" "$out/lib"                      \
-         --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python"
-
-       wrapProgram "$out/bin/spatch.opt"                                \
-         --prefix "LD_LIBRARY_PATH" ":" "$out/lib"                      \
-         --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python"
-
-       yes | make test
-    '';
+  configureFlagsArray = [ "--enable-release" ];
 
   meta = {
     description = "Coccinelle, a program to apply C code semantic patches";