Merging from trunk.

I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912

pkgs/development/tools/misc/automake/automake-1.10.x.nix

@@ -1,15 +1,15 @@
 {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false}:
 
 stdenv.mkDerivation rec {
-  name = "automake-1.10.2";
+  name = "automake-1.10.3";
 
   builder = ./builder.sh;
-  
+
   setupHook = ./setup-hook.sh;
 
   src = fetchurl {
     url = "mirror://gnu/automake/${name}.tar.bz2";
-    sha256 = "03v4gsvi71nhqvnxxbhkrksdg5icrn8yda021852njfragzck2n3";
+    sha256 = "1p0sgv8zl6ah6vwpqf7jkrjr3cw8ydpmnbi0ljb1dhrrp0xv92p9";
   };
 
   buildInputs = [perl autoconf makeWrapper];
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
   # Disable indented log output from Make, otherwise "make.test" will
   # fail.
   preCheck = "unset NIX_INDENT_MAKE";
-  
+
   # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
   # "fixed" path in generated files!
   dontPatchShebangs = true;
-  
+
   meta = {
     homepage = http://www.gnu.org/software/automake/;
     description = "GNU Automake, a GNU standard-compliant makefile generator";
@@ -35,5 +35,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }

pkgs/development/tools/misc/automake/automake-1.11.x.nix

@@ -1,15 +1,15 @@
 {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}:
 
 stdenv.mkDerivation rec {
-  name = "automake-1.11";
+  name = "automake-1.11.1";
 
   builder = ./builder.sh;
-  
+
   setupHook = ./setup-hook.sh;
 
   src = fetchurl {
     url = "mirror://gnu/automake/${name}.tar.bz2";
-    sha256 = "1h5a821z4i3dbgqg67igvbxcwn487kkkkx83q0m00n9mw9xz5ai9";
+    sha256 = "1bn7jl11wbkyy4ivgja92zkyjj8w3agwp2xnf7g8f7qa1qy9s5av";
   };
 
   buildInputs = [perl autoconf makeWrapper];
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
   # Disable indented log output from Make, otherwise "make.test" will
   # fail.
   preCheck = "unset NIX_INDENT_MAKE";
-  
+
   # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
   # "fixed" path in generated files!
   dontPatchShebangs = true;
-  
+
   meta = {
     homepage = http://www.gnu.org/software/automake/;
     description = "GNU Automake, a GNU standard-compliant makefile generator";
@@ -35,5 +35,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }

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

@@ -0,0 +1,54 @@
+{ fetchurl, stdenv, ocaml, perl, python, ncurses, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "coccinelle-0.1.11rc1";
+
+  src = fetchurl {
+    url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
+    sha256 = "1rdsv3qcl6zcx3d3zd4cl9d79hdgaw19llxbflkfxipvkg3vk59x";
+  };
+
+  buildInputs = [ ocaml perl python ncurses makeWrapper ];
+
+  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";
+
+  # Most of the test suite seems to fail (?!).
+  doCheck = false;
+  checkPhase = "make test";
+
+  postInstall =
+    '' wrapProgram "$out/bin/spatch"                                    \
+         --prefix "LD_LIBRARY_PATH" ":" "$out/lib"                      \
+         --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python"
+    '';
+
+  meta = {
+    description = "Coccinelle, a program to apply C code semantic patches";
+
+    longDescription =
+      '' Coccinelle is a program matching and transformation engine which
+         provides the language SmPL (Semantic Patch Language) for specifying
+         desired matches and transformations in C code.  Coccinelle was
+         initially targeted towards performing collateral evolutions in
+         Linux.  Such evolutions comprise the changes that are needed in
+         client code in response to evolutions in library APIs, and may
+         include modifications such as renaming a function, adding a function
+         argument whose value is somehow context-dependent, and reorganizing
+         a data structure.  Beyond collateral evolutions, Coccinelle is
+         successfully used (by us and others) for finding and fixing bugs in
+         systems code.
+      '';
+
+    homepage = http://coccinelle.lip6.fr/;
+    license = "GPLv2";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}

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

@@ -1,11 +1,11 @@
-{ fetchurl, stdenv, ncurses, pkgconfig, emacs }:
+{ fetchurl, stdenv, ncurses, pkgconfig, emacs}:
 
 stdenv.mkDerivation rec {
-  name = "cscope-15.6";
+  name = "cscope-15.7a";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cscope/${name}.tar.gz";
-    sha256 = "1jn5r9xhys7dlhxxiwffx9wrxlaf9i9ffh6dw516w79a83pn2r3d";
+    url = "mirror://sourceforge/cscope/${name}.tar.bz2";
+    sha256 = "0dv0r66x31y2xxvad54x0wal8yb1krwbx3gjc82qpg4hlz5qnqq2";
   };
 
   preConfigure = ''
@@ -45,5 +45,9 @@ stdenv.mkDerivation rec {
     license = "BSD-style";
 
     homepage = http://cscope.sourceforge.net/;
+
+    maintainers = with stdenv.lib.maintainers; [viric];
+
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

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

@@ -1,8 +1,11 @@
-{stdenv, fetchurl, bleedingEdgeRepos, automake, autoconf}:
+{stdenv, fetchurl, sourceFromHead, automake, autoconf}:
 
 stdenv.mkDerivation rec {
   name = "ctags-svn";
-  src = bleedingEdgeRepos.sourceByName "ctags";
+  # REGION AUTO UPDATE:      { name="ctags"; type = "svn"; url = "https://ctags.svn.sourceforge.net/svnroot/ctags/trunk"; }
+  src= sourceFromHead "ctags-749.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/ctags-749.tar.gz"; sha256 = "01dd4bf2e55dbedc38def81febef60eece912cb7624df1c0a2cf1ed6e4bc4ecf"; });
+  # END
 
   preConfigure = ''
     autoheader

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

@@ -1,26 +0,0 @@
-#TODO write a function (abstraction)
-args: with args;
-args.stdenv.mkDerivation {
-  name = "hsc2hs-darcs";
-
-  src = bleedingEdgeRepos.sourceByName "hsc2hs";
-
-  phases = "unpackPhase buildPhase";
-
-  buildPhase  = ''
-    ghc --make Setup.*hs -o setup
-    ensureDir \out
-     nix_ghc_pkg_tool join local-pkg-db
-    ./setup configure --prefix=$out --package-db=local-pkg-db
-    ./setup build
-    ./setup install
-  '';
-
-  buildInputs = (with args; [ghc] ++ libs);
-
-  meta = {
-      description = "automate some parts of the process of writing Haskell bindings to C code";
-      homepage = http://www.flapjax-lang.org/;
-      license = "BSD3";
-  };
-}