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
2009-12-12 18:39:09 +00:00 · 2009-12-12 18:39:09 +00:00 · dae3eb2383
commit dae3eb2383
parent ef0cd29eb0 362f811a7a
67 changed files with 1312 additions and 827 deletions
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
@ -0,0 +1,42 @@
+{ stdenv, fetchurl, emacs, perl }:
+
+let
+  pname = "ProofGeneral";
+  version = "3.7.1.1";
+  name = "${pname}-${version}";
+  website = "http://proofgeneral.inf.ed.ac.uk";
+in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://www.cl.cam.ac.uk/research/hvg/Isabelle/dist/contrib/${name}.tar.gz";
+    sha256 = "ae430590d6763618df50a662a37f0627d3c3c8f31372f6f0bb2116b738fc92d8";
+  };
+
+  buildInputs = [ emacs perl ];
+
+  sourceRoot = name;
+
+  postPatch = "EMACS=emacs make clean";
+
+  # Skip building ...
+  buildPhase = "true";
+
+  installPhase = ''
+    DEST=$out/share/emacs/site-lisp/ProofGeneral
+    ensureDir $DEST
+    cp -a * $DEST
+  '';
+
+  meta = {
+    description = "A generic front-end for proof assistants";
+    longDescription = ''
+      Proof General is a generic front-end for proof assistants (also known as
+      interactive theorem provers), based on the customizable text editor Emacs.
+    '';
+    homepage = website;
+    license = "GPL";
+  };
+}
--- a/pkgs/applications/graphics/autopanosiftc/default.nix
+++ b/pkgs/applications/graphics/autopanosiftc/default.nix
@ -10,27 +10,6 @@ stdenv.mkDerivation {

  buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ];

-  # I added these flags to get all the rpaths right, which I guess they are
-  # taken from the qt4 sources. Not very nice.
-  cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
-    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" +
-    " -lpng12 -lpano13 -ljpeg -ltiff -lz -lxml2 \"" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release" +
-    " -DCMAKE_INSTALL_PREFIX=$out";
-
-  dontUseCmakeConfigure = true;
-
-  # I rewrote the configure phase to get the $out references evaluated in
-  # cmakeFlags
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-    '';
-
  meta = {
    homepage = http://hugin.sourceforge.net/;
    description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas";
--- a/pkgs/applications/graphics/freepv/default.nix
+++ b/pkgs/applications/graphics/freepv/default.nix
@ -17,26 +17,6 @@ stdenv.mkDerivation {
    sed -i -e '/mozilla/d' src/CMakeLists.txt
  '';

-  # I added these flags to get all the rpaths right, which I guess they are
-  # taken from the qt4 sources. Not very nice.
-  cmakeFlags = " -DCMAKE_EXE_LINKER_FLAGS=\"" +
-    " -lpng12 -lXxf86vm -ljpeg -lz -lglut -lGLU -lxml2 -lX11\"" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release" +
-    " -DCMAKE_INSTALL_PREFIX=$out";
-
-  dontUseCmakeConfigure = true;
-
-  # I rewrote the configure phase to get the $out references evaluated in
-  # cmakeFlags
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-    '';
-
  meta = {
    description = "Open source panorama viewer using GL";
    homepage = http://freepv.sourceforge.net/;
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@ -15,29 +15,9 @@ stdenv.mkDerivation {

  NIX_LDFLAGS = "-lrt";

-  # I added these flags to get all the rpaths right, which I guess they are
-  # taken from the qt4 sources. Not very nice.
-  cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
-    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" +
-    " -lpng12 -lpano13 -lImath -lIlmImf -lIex -lHalf -lIlmThread" +
-    " -ljpeg -ltiff -lz -lexiv2 -lboost_thread\"" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release" +
-    " -DCMAKE_INSTALL_PREFIX=$out";
+  buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig
+    exiv2 gettext ilmbase ];

-  buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig exiv2 gettext ilmbase ];
-
-  dontUseCmakeConfigure = true;
-
-  # I rewrote the configure phase to get the $out references evaluated in
-  # cmakeFlags
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-    '';
  postInstall = ''
    ensureDir "$out/nix-support"
    echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@ -1,35 +1,15 @@
 { fetchurl, stdenv, cmake, qt4 }:

 stdenv.mkDerivation {
-  name = "paraview-3.4.0";
+  name = "paraview-3.6.1";
  src = fetchurl {
-    url = http://www.paraview.org/files/v3.4/paraview-3.4.0.tar.gz;
-    sha256 = "27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d";
+    url = http://www.paraview.org/files/v3.6/paraview-3.6.1.tar.gz;
+    sha256 = "1dh0dqbdvjagy122nbwr1gg03ck2if2aqqbvzcpkx38sz12cjh7h";
  };

-  patches = [ ./include-qobject.patch ];
-
-  # I added these flags to get all the rpaths right, which I guess they are
-  # taken from the qt4 sources. Not very nice.
-  cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4\"" +
-    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4" +
-    " -lpng12 -lSM -lICE -lXrender -lXrandr -lXcursor -lXinerama" +
-    " -lXfixes -lfreetype -lfontconfig -lXext -lX11 -lssl -lXt -lz\"" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release" +
-    " -DCMAKE_INSTALL_PREFIX=$out";
-
-  dontUseCmakeConfigure = true;
-
-  # I rewrote the configure phase to get the $out references evaluated in
-  # cmakeFlags
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-    '';
+  preConfigure = ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.6"
+  '';

  buildInputs = [ cmake qt4 ];

--- a/pkgs/applications/graphics/paraview/include-qobject.patch
+++ b/pkgs/applications/graphics/paraview/include-qobject.patch
@ -1,38 +0,0 @@
-diff --git a/VTK/GUISupport/Qt/CMakeLists.txt b/VTK/GUISupport/Qt/CMakeLists.txt
-index 2c35be7..866f1aa 100644
--- a/VTK/GUISupport/Qt/CMakeLists.txt
-+++ b/VTK/GUISupport/Qt/CMakeLists.txt
-@@ -166,6 +166,7 @@ IF(DESIRED_QT_VERSION MATCHES 4)
-      )
-   ENDIF(QT_QTGUI_LIBRARY)
-   INCLUDE_DIRECTORIES(${QT_QTDESIGNER_INCLUDE_DIR})
-+  INCLUDE_DIRECTORIES(${QT_QTCORE_INCLUDE_DIR})
-   QT4_WRAP_CPP ( PluginMocSrcs ${PluginMocHeaders} )
- ELSE(DESIRED_QT_VERSION MATCHES 4)
-   QT_WRAP_CPP ( QVTKWidgetPlugin PluginMocSrcs ${PluginMocHeaders} )
-diff --git a/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h b/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h
-index 6782b90..ced3a67 100644
--- a/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h
-+++ b/VTK/GUISupport/Qt/vtkEventQtSlotConnect.h
-@@ -43,7 +43,7 @@
- #include "vtkObject.h"
- #include "vtkCommand.h"  // for event defines
- #include "QVTKWin32Header.h"  // for export define
-#include "qobject.h"          // for version info
-+#include <qobject.h>          // for version info
- 
- class QObject;
- class vtkQtConnections;
-diff --git a/VTK/GUISupport/Qt/vtkQtConnection.h b/VTK/GUISupport/Qt/vtkQtConnection.h
-index 923ec2e..b189ddc 100644
--- a/VTK/GUISupport/Qt/vtkQtConnection.h
-+++ b/VTK/GUISupport/Qt/vtkQtConnection.h
-@@ -33,7 +33,7 @@
- 
- #include "vtkObject.h"
- #include "vtkCommand.h"  // for event defines
-#include "qobject.h"
-+#include <qobject.h>
- 
- class QObject;
- class vtkCallbackCommand;
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@ -2,7 +2,10 @@ args: with args;
 stdenv.mkDerivation {
  name = "synergy-cvs";

-  src = bleedingEdgeRepos.sourceByName "synergy";
+  # REGION AUTO UPDATE:          { name="synergy"; type = "cvs"; cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; module="syngery"; }
+  src = sourceFromHead "synergy-F_09-55-29.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_09-55-28.tar.gz"; sha256 = "443bb8cf8d4e365b2adaadd8770096fcafa0c54532e83f6a267eb3b05042b84c"; });
+  # END
  /*
  fetchcvs {
    cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ b/pkgs/applications/networking/browsers/netsurf/default.nix
@ -8,8 +8,8 @@ rec {
  };

  libCSS = import ./libCSS.nix {
-    inherit fetchurl stdenv lib pkgconfig libParserUtils libwapcaplet;
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit fetchurl sourceFromHead stdenv lib pkgconfig libParserUtils
+      libwapcaplet;
  };

  libnsbmp = import ./libnsbmp.nix {
@ -21,13 +21,11 @@ rec {
  };

  libwapcaplet = import ./libwapcaplet.nix {
-    inherit fetchurl stdenv lib;
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit fetchurl sourceFromHead stdenv lib;
  };

  libsvgtiny = import ./libsvgtiny.nix {
-    inherit fetchurl stdenv lib pkgconfig gperf libxml2;
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit fetchurl sourceFromHead stdenv lib pkgconfig gperf libxml2;
  };

  hubub = stdenv.mkDerivation {
@ -55,7 +53,10 @@ rec {
  libdom = stdenv.mkDerivation {
    name = "libdom-devel";

-    src = bleedingEdgeRepos.sourceByName "libdom";
+    # REGION AUTO UPDATE:     { name="libdom"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/dom"; groups = "netsurf_group"; }
+    src= sourceFromHead "libdom-9721.tar.gz"
+                 (fetchurl { url = "http://mawercer.de/~nix/repos/libdom-9721.tar.gz"; sha256 = "ca4b94a8dd32036787331a14133c36a49daded40bdb4c04edc3eab99e2193abc"; });
+    # END
    installPhase = "make PREFIX=$out install";
    buildInputs = [pkgconfig];

@ -70,17 +71,15 @@ rec {
  */

  netsurfHaru = import ./haru.nix {
-    inherit fetchurl stdenv lib zlib libpng; 
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit fetchurl sourceFromHead stdenv lib zlib libpng; 
  };

  browser = import ./netsurf.nix {
-    inherit fetchurl stdenv lib pkgconfig
+    inherit fetchurl sourceFromHead stdenv lib pkgconfig
      libnsbmp libnsgif libsvgtiny libwapcaplet hubub libParserUtils
      libpng libxml2 libCSS lcms curl libmng;
    libharu = netsurfHaru;
    inherit (gnome) glib gtk libglade;
-    inherit (bleedingEdgeRepos) sourceByName;
  };


--- a/pkgs/applications/networking/browsers/netsurf/haru.nix
+++ b/pkgs/applications/networking/browsers/netsurf/haru.nix
@ -3,7 +3,10 @@ stdenv.mkDerivation {

  name = "netsurf-haru-trunk";

-  src = sourceByName "netsurf_haru";
+  # REGION AUTO UPDATE:     { name="netsurf_haru"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libharu"; groups = "netsurf_group"; }
+  src= sourceFromHead "netsurf_haru-9721.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/netsurf_haru-9721.tar.gz"; sha256 = "8113492823e1069f428ef8970c2c7a09b4c36c645480ce81f8351331ce097656"; });
+  # END

  preConfigure = "cd upstream";
  configureFlags = "--with-zlib=${zlib} --with-png=${libpng}";
--- a/pkgs/applications/networking/browsers/netsurf/libCSS.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libCSS.nix
@ -2,7 +2,10 @@ args: with args;
 stdenv.mkDerivation {
  name = "libCSS-devel";

-  src = sourceByName "libCSS";
+  # REGION AUTO UPDATE:       { name="libCSS"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libcss"; groups = "netsurf_group"; }
+  src= sourceFromHead "libCSS-9721.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/libCSS-9721.tar.gz"; sha256 = "47b44653f7b53c21da6224ffb1f81df934cc711d6a5795c5584755a8bd48e5ac"; });
+  # END

  installPhase = "make PREFIX=$out install";
  buildInputs = [pkgconfig libParserUtils libwapcaplet];
--- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
@ -2,7 +2,10 @@ args: with args;
 stdenv.mkDerivation {
  name = "libsvgtiny-devel";

-  src = sourceByName "libsvgtiny";
+  # REGION AUTO UPDATE:      { name="libsvgtiny"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libsvgtiny"; groups = "netsurf_group"; }
+  src= sourceFromHead "libsvgtiny-9721.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/libsvgtiny-9721.tar.gz"; sha256 = "0c4c8e357c220218a32ef789eb2ba8226a403d4c2b550d7c65f351a0af5d1a71"; });
+  # END

  installPhase = "make PREFIX=$out install";
  buildInputs = [pkgconfig gperf libxml2];
--- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
+++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
@ -2,7 +2,10 @@ args: with args;
 stdenv.mkDerivation {
  name = "libwapcaplet-devel";

-  src = sourceByName "libwapcaplet";
+  # REGION AUTO UPDATE:     { name="libwapcaplet"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libwapcaplet"; groups = "netsurf_group"; }
+  src= sourceFromHead "libwapcaplet-9721.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/libwapcaplet-9721.tar.gz"; sha256 = "7f9f32ca772c939d67f3bc8bf0705544c2b2950760da3fe6a4e069ad0f77d91a"; });
+  # END

  installPhase = "make PREFIX=$out install";
  buildInputs = [];
--- a/pkgs/applications/networking/browsers/netsurf/netsurf.nix
+++ b/pkgs/applications/networking/browsers/netsurf/netsurf.nix
@ -2,7 +2,10 @@ args: with args;
 stdenv.mkDerivation {

  name = "netsurf-devel";
-  src = sourceByName "netsurf";
+  # REGION AUTO UPDATE:      { name="netsurf"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/netsurf"; groups = "netsurf_group"; }
+  src= sourceFromHead "netsurf-9721.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/netsurf-9721.tar.gz"; sha256 = "4705f059596fbd95b1a80d9a6c5d08daf051fd0e5e868ccd40b30af8a45e8f56"; });
+  # END

  # name = "netsurf-2.1";
  /*
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@ -0,0 +1,62 @@
+{ stdenv, fetchurl, perl, nettools, polyml, emacs, emacsPackages }:
+# nettools needed for hostname
+
+let
+  pname = "Isabelle";
+  version = "2009-1";
+  name = "${pname}${version}";
+  theories = ["HOL" "FOL" "ZF"];
+  proofgeneral = (emacsPackages emacs).proofgeneral;
+in
+
+stdenv.mkDerivation {
+  inherit name theories;
+
+  src = fetchurl {
+    url = "http://www.cl.cam.ac.uk/research/hvg/${pname}/dist/${name}.tar.gz";
+    sha256 = "43ad7794e8b4214b3ace49fc136a69ed6cc65ead02831ae6071f846ecbe56f68";
+  };
+
+  buildInputs = [ perl polyml nettools ];
+
+  sourceRoot = name;
+
+  patches = [ ./settings.patch ];
+
+  postPatch = ''
+    ENV=$(type -p env)
+    patchShebangs "."
+    substituteInPlace lib/Tools/env \
+      --replace /usr/bin/env $ENV
+    substituteInPlace lib/Tools/install \
+      --replace /usr/bin/env $ENV
+    substituteInPlace src/Pure/IsaMakefile \
+      --replace /bin/bash /bin/sh
+    substituteInPlace etc/settings \
+      --subst-var-by ML_HOME "${polyml}/bin" \
+      --subst-var-by PROOFGENERAL_HOME "${proofgeneral}/share/emacs/site-lisp/ProofGeneral"
+  '';
+
+  buildPhase = ''
+    ./build $theories
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin
+    mv $TMP/$name $out
+    cd $out/$name
+    bin/isabelle install -p $out/bin
+  '';
+
+  meta = {
+    description = "A generic proof assistant";
+
+    longDescription = ''
+      Isabelle is a generic proof assistant.  It allows mathematical formulas
+      to be expressed in a formal language and provides tools for proving those
+      formulas in a logical calculus.
+    '';
+    homepage = http://isabelle.in.tum.de/;
+    license = "LGPL";
+  };
+}
--- a/pkgs/applications/science/logic/isabelle/settings.patch
+++ b/pkgs/applications/science/logic/isabelle/settings.patch
@ -0,0 +1,35 @@
+diff -Naur Isabelle2009-1/etc/settings Isabelle2009-1-patched/etc/settings
+--- Isabelle2009-1/etc/settings	2009-12-02 12:04:07.000000000 +0100
+++ Isabelle2009-1-patched/etc/settings	2009-12-04 16:15:40.000000000 +0100
+@@ -16,15 +16,8 @@
+ # Only one of the sections below should be activated.
+ 
+ # Poly/ML 5.x (automated settings)
+-POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")"
+ ML_PLATFORM=$("$ISABELLE_HOME/lib/scripts/polyml-platform")
+-ML_HOME=$(choosefrom \
+-  "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
+-  "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
+-  "/usr/local/polyml/$ML_PLATFORM" \
+-  "/usr/share/polyml/$ML_PLATFORM" \
+-  "/opt/polyml/$ML_PLATFORM" \
+-  $POLY_HOME)
+ML_HOME=@ML_HOME@
+ ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
+ ML_OPTIONS="-H 200"
+ ML_SOURCES="$ML_HOME/../src"
+@@ -185,13 +178,7 @@
+ ###
+ 
+ # Proof General home, look in a variety of places
+-PROOFGENERAL_HOME=$(choosefrom \
+-  "$ISABELLE_HOME/contrib/ProofGeneral" \
+-  "$ISABELLE_HOME/../ProofGeneral" \
+-  "/usr/local/ProofGeneral" \
+-  "/usr/share/ProofGeneral" \
+-  "/opt/ProofGeneral" \
+-  "")
+PROOFGENERAL_HOME=@PROOFGENERAL_HOME@
+ 
+ PROOFGENERAL_OPTIONS=""
+ #PROOFGENERAL_OPTIONS="-m no_brackets -m no_type_brackets"
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@ -4,7 +4,6 @@
 args: with args; with pkgs;
 let
  inherit (pkgs) stdenv fetchurl getConfig subversion;
-  inherit (pkgs.bleedingEdgeRepos) sourceByName;
 in
 rec {

@ -19,11 +18,10 @@ rec {
  };

  gitGit = import ./git/git-git.nix {
-    inherit fetchurl stdenv curl openssl zlib expat perl gettext
+    inherit fetchurl sourceFromHead stdenv curl openssl zlib expat perl gettext
      asciidoc texinfo xmlto docbook2x
      docbook_xsl docbook_xml_dtd_45 libxslt
      cpio tcl tk makeWrapper subversion autoconf;
-    inherit (bleedingEdgeRepos) sourceByName;
    svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
    guiSupport = getConfig ["git" "guiSupport"] false;
    perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
@ -36,9 +34,8 @@ rec {
  };

  qgitGit = import ./qgit/qgit-git.nix {
-    inherit fetchurl stdenv;
+    inherit fetchurl sourceFromHead stdenv;
    inherit (xlibs) libXext libX11;
-    inherit (bleedingEdgeRepos) sourceByName;
    qt = qt4;
  };

@ -49,7 +46,10 @@ rec {

  topGit = stdenv.mkDerivation {
    name = "TopGit-git"; # official release 0.8
-    src = sourceByName "topGit"; # destination directory is patched
+    # REGION AUTO UPDATE:    { name = "topGit"; type="git"; url="http://repo.or.cz/w/topgit.git"; }
+    src = sourceFromHead "topGit-f59e4f9e87e5f485fdaee0af002edd2105fa298a.tar.gz"
+                 (fetchurl { url = "http://mawercer.de/~nix/repos/topGit-f59e4f9e87e5f485fdaee0af002edd2105fa298a.tar.gz"; sha256 = "12aa6d34c82d505066b851e24069fe9d6930d70913b7d94a0cc6e8f06f127170"; });
+    # END
    phases="unpackPhase patchPhase installPhase";
    installPhase = ''
      mkdir -p $out/etc/bash_completion.d
@ -84,8 +84,8 @@ rec {
  };

  gitFastExport = import ./fast-export {
-    inherit fetchurl stdenv mercurial coreutils git makeWrapper subversion;
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit fetchurl sourceFromHead stdenv mercurial coreutils git makeWrapper
+      subversion;
  };

 }
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@ -2,7 +2,10 @@ args: with args;
 stdenv.mkDerivation {
  name = "fast-export";

-  src = sourceByName "git_fast_export";
+  # REGION AUTO UPDATE:    { name="git_fast_export"; type = "git"; url="git://repo.or.cz/hg2git.git"; }
+  src = sourceFromHead "git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"; sha256 = "0808bafddce07c8f3dc2116f2c33e56f5589927630e0b72219e64d8a6c8c0023"; });
+  # END

  buildInputs =([mercurial.python mercurial makeWrapper subversion]);

--- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix
@ -3,7 +3,7 @@
 , libxslt, tcl, tk, makeWrapper
 , svnSupport, subversion, perlLibs
 , guiSupport
-, sourceByName
+, sourceFromHead
 , autoconf
 }:

@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
  # contact marco-oweber@gmx.de if you want to know more details
  name = "git-git-with-glob-patch";

-  src = sourceByName "git";
+  # REGION AUTO UPDATE:     { name="git"; type="git"; url="git://git.kernel.org/pub/scm/git/git.git"; }
+  src = sourceFromHead "git-8b43d378dff4d490165dbac05a0bf5da2011bfa5.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/git-8b43d378dff4d490165dbac05a0bf5da2011bfa5.tar.gz"; sha256 = "a910bbac05c6e349a0bcfd9a27f7045916e5d07dc4acb4baf6d92475c30e28dc"; });
+  # END

  patchePhase = ''
    patch -p1 < ${./docbook2texi-2.patch}
--- a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix
@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt, libXext, libX11, sourceByName}:
+{stdenv, fetchurl, qt, libXext, libX11, sourceFromHead}:

 stdenv.mkDerivation rec {
  name = "qgit-git";
@ -8,7 +8,10 @@ stdenv.mkDerivation rec {
    homepage = "http://digilander.libero.it/mcostalba/";
    description = "Graphical front-end to Git";
  };
-  src = sourceByName "qgit";
+  # REGION AUTO UPDATE:    { name="qgit"; type="git"; url="git://git.kernel.org/pub/scm/qgit/qgit4.git"; }
+  src = sourceFromHead "qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz"; sha256 = "17e4727ac68b4f2e8503289d5b6a2c042547e7be133e7f8195b79e33eab61b93"; });
+  # END
  buildInputs = [qt libXext libX11];
  buildPhase = ''
    qmake PREFIX=$out
--- a/pkgs/applications/video/MPlayer/trunk.nix
+++ b/pkgs/applications/video/MPlayer/trunk.nix
@ -6,7 +6,7 @@
 , libXinerama ? null, libXrandr ? null, libdvdnav ? null, jackaudio ? null
 , cdparanoia ? null, cddaSupport ? true, jackaudioSupport ? true
 , mesa, pkgconfig
-, sourceByName
+, sourceFromHead
 }:

 assert alsaSupport -> alsa != null;
@ -35,7 +35,10 @@ stdenv.mkDerivation {

  name = "mplayer-trunk";

-  src = sourceByName "MPlayer";
+  # REGION AUTO UPDATE:     { name="MPlayer"; type = "svn"; url="svn://svn.mplayerhq.hu/mplayer/trunk"; }
+  src= sourceFromHead "MPlayer-29990.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/MPlayer-29990.tar.gz"; sha256 = "8d9ac59e7cc3e2bc9ca46281ac2c268d460e041aceac056b600205c8c5235169"; });
+  # END

  buildInputs =
    [x11 libXv freetype zlib mesa pkgconfig]
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@ -18,11 +18,9 @@ stdenv.mkDerivation {

  cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" +
    " -DGETTEXT_INCLUDE_DIR=${gettext}/include" +
-    " -DSDL_INCLUDE_DIR=${SDL}/include/SDL" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release";
+    " -DSDL_INCLUDE_DIR=${SDL}/include/SDL";

-  NIX_LDFLAGS="-lxml2 -lXv -lSDL -lQtGui -lQtCore -lpthread";
+  NIX_LDFLAGS="-lpthread";

  postInstall = ''
    cd $NIX_BUILD_TOP/$sourceRoot
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@ -1,25 +1,32 @@
 args:
+with args;
 args.stdenv.mkDerivation {
  name = "cinelerra-git";

-  src = args.sourceByName "cinelerra";
+  # REGION AUTO UPDATE:    { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; }
+  src= sourceFromHead "cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; });
+  # END

  perl = args.perl;

+  # touch confi.rpath: work around bug in automake 1.10 ?
  preConfigure = ''
    find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@$perl/bin/perl@" -i
+    touch config.rpath
    ./autogen.sh
    '';
  configureOptions = ["--enable-freetype2"];

  buildInputs =(with args; [
-      automake autoconf libtool pkgconfig
+      automake
+      autoconf libtool pkgconfig
      faad2 faac
      a52dec alsaLib   fftw lame libavc1394 libiec61883
      libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
      mjpegtools x264 gettext openexr esound 
      #
-      libXxf86vm libXv
+      libXxf86vm libXv libXi libX11 xextproto
      libtheora libpng libdv
      nasm
      perl
@ -29,6 +36,7 @@ args.stdenv.mkDerivation {
  meta = { 
      description = "Cinelerra - Video Editor";
      homepage = http://www.cinelerra.org;
+      maintainers = [lib.maintainers.marcweber];
      license = "GPLv2";
  };
 }
--- a/pkgs/build-support/gcc-wrapper2/README
+++ b/pkgs/build-support/gcc-wrapper2/README
@ -0,0 +1,6 @@
+To be removed after we merge stdenv-updates in.
+stdenv-updates should have this gcc-wrapper2 as gcc-wrapper.
+
+Changelog against gcc-wrapper:
+- Support for linking shared objects with direct mention of the /path/libxxx.so object,
+  thus, adding its path to the rpath.
--- a/pkgs/build-support/gcc-wrapper2/add-flags
+++ b/pkgs/build-support/gcc-wrapper2/add-flags
@ -0,0 +1,24 @@
+# `-B@out@/bin' forces gcc to use ld-wrapper.sh when calling ld.
+export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE"
+
+if test -e @out@/nix-support/libc-cflags; then
+    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
+fi
+
+if test -e @out@/nix-support/gcc-cflags; then
+    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE"
+fi
+
+if test -e @out@/nix-support/libc-ldflags; then
+    export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)"
+fi
+
+if test -e @out@/nix-support/gcc-ldflags; then
+    export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)"
+fi
+
+if test -e @out@/nix-support/libc-ldflags-before; then
+    export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE"
+fi
+
+export NIX_GCC_WRAPPER_FLAGS_SET=1
--- a/pkgs/build-support/gcc-wrapper2/builder.sh
+++ b/pkgs/build-support/gcc-wrapper2/builder.sh
@ -0,0 +1,135 @@
+source $stdenv/setup
+
+
+ensureDir $out/bin
+ensureDir $out/nix-support
+
+
+if test -z "$nativeLibc"; then
+    dynamicLinker="$libc/lib/$dynamicLinker"
+    echo $dynamicLinker > $out/nix-support/dynamic-linker
+
+    if test -e $libc/lib/32/ld-linux.so.2; then
+        echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
+    fi
+
+    # The "-B$libc/lib/" flag is a quick hack to force gcc to link
+    # against the crt1.o from our own glibc, rather than the one in
+    # /usr/lib.  (This is only an issue when using an `impure'
+    # compiler/linker, i.e., one that searches /usr/lib and so on.)
+    #
+    # Unfortunately, setting -B appears to override the default search
+    # path. Thus, the gcc-specific "../includes-fixed" directory is
+    # now longer searched and glibc's <limits.h> header fails to
+    # compile, because it uses "#include_next <limits.h>" to find the
+    # limits.h file in ../includes-fixed. To remedy the problem,
+    # another -idirafter is necessary to add that directory again.
+    echo "-B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
+
+    echo "-L$libc/lib" > $out/nix-support/libc-ldflags
+
+    # The dynamic linker is passed in `ldflagsBefore' to allow
+    # explicit overrides of the dynamic linker by callers to gcc/ld
+    # (the *last* value counts, so ours should come first).
+    echo "-dynamic-linker $dynamicLinker" > $out/nix-support/libc-ldflags-before
+fi
+
+if test -n "$nativeTools"; then
+    gccPath="$nativePrefix/bin"
+    ldPath="$nativePrefix/bin"
+else
+    if test -e "$gcc/lib64"; then
+        gccLDFlags="$gccLDFlags -L$gcc/lib64"
+    fi
+    gccLDFlags="$gccLDFlags -L$gcc/lib"
+    echo "$gccLDFlags" > $out/nix-support/gcc-ldflags
+
+    # GCC shows $gcc/lib in `gcc -print-search-dirs', but not
+    # $gcc/lib64 (even though it does actually search there...)..
+    # This confuses libtool.  So add it to the compiler tool search
+    # path explicitly.
+    if test -e "$gcc/lib64"; then
+        gccCFlags="$gccCFlags -B$gcc/lib64"
+    fi
+    echo "$gccCFlags" > $out/nix-support/gcc-cflags
+    
+    gccPath="$gcc/bin"
+    ldPath="$binutils/bin"
+fi
+
+
+doSubstitute() {
+    local src=$1
+    local dst=$2
+    # Can't use substitute() here, because replace may not have been
+    # built yet (in the bootstrap).
+    sed \
+        -e "s^@out@^$out^g" \
+        -e "s^@shell@^$shell^g" \
+        -e "s^@gcc@^$gcc^g" \
+        -e "s^@gccProg@^$gccProg^g" \
+        -e "s^@binutils@^$binutils^g" \
+        -e "s^@libc@^$libc^g" \
+        -e "s^@ld@^$ldPath/ld^g" \
+        < "$src" > "$dst" 
+}
+
+
+# Make wrapper scripts around gcc, g++, and gfortran.  Also make symlinks
+# cc, c++, and f77.
+mkGccWrapper() {
+    local dst=$1
+    local src=$2
+
+    if ! test -f "$src"; then
+        echo "$src does not exist (skipping)"
+        return
+    fi
+
+    gccProg="$src"
+    doSubstitute "$gccWrapper" "$dst"
+    chmod +x "$dst"
+}
+
+mkGccWrapper $out/bin/gcc $gccPath/gcc
+ln -s gcc $out/bin/cc
+
+mkGccWrapper $out/bin/g++ $gccPath/g++
+ln -s g++ $out/bin/c++
+
+if test -e $gccPath/gfortran; then
+    mkGccWrapper $out/bin/gfortran $gccPath/gfortran
+    ln -s gfortran $out/bin/g77
+    ln -s gfortran $out/bin/f77
+fi
+
+
+# Create a symlink to as (the assembler).  This is useful when a
+# gcc-wrapper is installed in a user environment, as it ensures that
+# the right assembler is called.
+ln -s $ldPath/as $out/bin/as
+
+
+# Make a wrapper around the linker.
+doSubstitute "$ldWrapper" "$out/bin/ld"
+chmod +x "$out/bin/ld"
+
+
+# Emit a setup hook.  Also store the path to the original GCC and
+# Glibc.
+test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc
+test -n "$libc" && echo $libc > $out/nix-support/orig-libc
+
+doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"
+
+doSubstitute "$setupHook" "$out/nix-support/setup-hook"
+
+cp -p $utils $out/nix-support/utils.sh
+
+
+# Propagate the wrapped gcc so that if you install the wrapper, you get
+# tools like gcov, the manpages, etc. as well (including for binutils
+# and Glibc).
+if test -z "$nativeTools"; then
+    echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages
+fi
--- a/pkgs/build-support/gcc-wrapper2/default.nix
+++ b/pkgs/build-support/gcc-wrapper2/default.nix
@ -0,0 +1,60 @@
+# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't
+# know where the C library and standard header files are.  Therefore
+# the compiler produced by that package cannot be installed directly
+# in a user environment and used from the command line.  This
+# stdenv.mkDerivation provides a wrapper that sets up the right environment
+# variables so that the compiler and the linker just "work".
+
+{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
+, gcc ? null, libc ? null, binutils ? null, shell ? ""
+}:
+
+assert nativeTools -> nativePrefix != "";
+assert !nativeTools -> gcc != null && binutils != null;
+assert !nativeLibc -> libc != null;
+
+let
+
+  gccVersion = (builtins.parseDrvName gcc.name).version;
+  gccName = (builtins.parseDrvName gcc.name).name;
+  
+in
+
+stdenv.mkDerivation {
+  name =
+    (if name != "" then name else gccName + "-wrapper") +
+    (if gcc != null && gccVersion != "" then "-" + gccVersion else "");
+  
+  builder = ./builder.sh;
+  setupHook = ./setup-hook.sh;
+  gccWrapper = ./gcc-wrapper.sh;
+  ldWrapper = ./ld-wrapper.sh;
+  utils = ./utils.sh;
+  addFlags = ./add-flags;
+  
+  inherit nativeTools nativeLibc nativePrefix gcc;
+  libc = if nativeLibc then null else libc;
+  binutils = if nativeTools then null else binutils;
+  
+  langC = if nativeTools then true else gcc.langC;
+  langCC = if nativeTools then true else gcc.langCC;
+  langFortran = if nativeTools then false else gcc ? langFortran;
+  shell = if shell == "" then stdenv.shell else shell;
+  
+  meta =
+    let gcc_ = if gcc != null then gcc else {}; in
+    (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) //
+    { description =
+        stdenv.lib.attrByPath ["meta" "description"] "System C compiler" gcc_
+        + " (wrapper script)";
+    };
+
+  # The dynamic linker has different names on different Linux platforms.
+  dynamicLinker =
+    if !nativeLibc then
+      (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
+       if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
+       if stdenv.system == "powerpc-linux" then "ld.so.1" else
+       abort "don't know the name of the dynamic linker for this platform")
+    else "";
+}
--- a/pkgs/build-support/gcc-wrapper2/gcc-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper2/gcc-wrapper.sh
@ -0,0 +1,148 @@
+#! @shell@ -e
+
+if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then
+    source "$NIX_GCC_WRAPPER_START_HOOK"
+fi
+
+if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then
+    source @out@/nix-support/add-flags.sh
+fi
+
+source @out@/nix-support/utils.sh
+
+
+# Figure out if linker flags should be passed.  GCC prints annoying
+# warnings when they are not needed.
+dontLink=0
+getVersion=0
+nonFlagArgs=0
+
+for i in "$@"; do
+    if test "$i" = "-c"; then
+        dontLink=1
+    elif test "$i" = "-S"; then
+        dontLink=1
+    elif test "$i" = "-E"; then
+        dontLink=1
+    elif test "$i" = "-E"; then
+        dontLink=1
+    elif test "$i" = "-M"; then
+        dontLink=1
+    elif test "$i" = "-MM"; then
+        dontLink=1
+    elif test "${i:0:1}" != "-"; then
+        nonFlagArgs=1
+    elif test "$i" = "-m32"; then
+        if test -e @out@/nix-support/dynamic-linker-m32; then
+            NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)"
+        fi
+    fi
+done
+
+# If we pass a flag like -Wl, then gcc will call the linker unless it
+# can figure out that it has to do something else (e.g., because of a
+# "-c" flag).  So if no non-flag arguments are given, don't pass any
+# linker flags.  This catches cases like "gcc" (should just print
+# "gcc: no input files") and "gcc -v" (should print the version).
+if test "$nonFlagArgs" = "0"; then
+    dontLink=1
+fi
+
+
+# Optionally filter out paths not refering to the store.
+params=("$@")
+if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
+    rest=()
+    n=0
+    while test $n -lt ${#params[*]}; do
+        p=${params[n]}
+        p2=${params[$((n+1))]}
+        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
+            skip $p
+        elif test "$p" = "-L" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then
+            skip $p
+        elif test "$p" = "-I" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        elif test "$p" = "-isystem" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        else
+            rest=("${rest[@]}" "$p")
+        fi
+        n=$((n + 1))
+    done
+    params=("${rest[@]}")
+fi
+
+
+# Add the flags for the C compiler proper.
+extraAfter=($NIX_CFLAGS_COMPILE)
+extraBefore=()
+
+if test "$dontLink" != "1"; then
+
+    # Add the flags that should only be passed to the compiler when
+    # linking.
+    extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK)
+
+    # Add the flags that should be passed to the linker (and prevent
+    # `ld-wrapper' from adding NIX_LDFLAGS again).
+    for i in $NIX_LDFLAGS_BEFORE; do
+        extraBefore=(${extraBefore[@]} "-Wl,$i")
+    done
+    for i in $NIX_LDFLAGS; do
+	if test "${i:0:3}" = "-L/"; then
+	    extraAfter=(${extraAfter[@]} "$i")
+	else
+	    extraAfter=(${extraAfter[@]} "-Wl,$i")
+	fi
+    done
+    export NIX_LDFLAGS_SET=1
+
+    if test "$NIX_STRIP_DEBUG" = "1"; then
+        # Add executable-stripping flags.
+        extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP)
+    fi
+fi
+
+# As a very special hack, if the arguments are just `-v', then don't
+# add anything.  This is to prevent `gcc -v' (which normally prints
+# out the version number and returns exit code 0) from printing out
+# `No input files specified' and returning exit code 1.
+if test "$*" = "-v"; then
+    extraAfter=()
+    extraBefore=()
+fi    
+
+# Optionally print debug info.
+if test "$NIX_DEBUG" = "1"; then
+  echo "original flags to @gccProg@:" >&2
+  for i in "${params[@]}"; do
+      echo "  $i" >&2
+  done
+  echo "extraBefore flags to @gccProg@:" >&2
+  for i in ${extraBefore[@]}; do
+      echo "  $i" >&2
+  done
+  echo "extraAfter flags to @gccProg@:" >&2
+  for i in ${extraAfter[@]}; do
+      echo "  $i" >&2
+  done
+fi
+
+if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then
+    source "$NIX_GCC_WRAPPER_EXEC_HOOK"
+fi
+
+
+# Call the real `gcc'.  Filter out warnings from stderr about unused
+# `-B' flags, since they confuse some programs.  Deep bash magic to
+# apply grep to stderr (by swapping stdin/stderr twice).
+if test -z "$NIX_GCC_NEEDS_GREP"; then
+    @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
+else
+    (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \
+        | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3-
+    exit $?
+fi    
--- a/pkgs/build-support/gcc-wrapper2/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper2/ld-wrapper.sh
@ -0,0 +1,155 @@
+#! @shell@ -e
+
+if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
+    source "$NIX_LD_WRAPPER_START_HOOK"
+fi
+
+if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then
+    source @out@/nix-support/add-flags.sh
+fi
+
+source @out@/nix-support/utils.sh
+
+
+# Optionally filter out paths not refering to the store.
+params=("$@")
+if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
+        -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then
+    rest=()
+    n=0
+    while test $n -lt ${#params[*]}; do
+        p=${params[n]}
+        p2=${params[$((n+1))]}
+        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
+            skip $p
+        elif test "$p" = "-L" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        elif test "$p" = "-rpath" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        elif test "$p" = "-dynamic-linker" && badPath "$p2"; then
+            n=$((n + 1)); skip $p2
+        elif test "${p:0:1}" = "/" && badPath "$p"; then
+            # We cannot skip this; barf.
+            echo "impure path \`$p' used in link" >&2
+            exit 1
+        else
+            rest=("${rest[@]}" "$p")
+        fi
+        n=$((n + 1))
+    done
+    params=("${rest[@]}")
+fi
+
+
+extra=()
+extraBefore=()
+
+if test -z "$NIX_LDFLAGS_SET"; then
+    extra=(${extra[@]} $NIX_LDFLAGS)
+    extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE)
+fi
+
+
+# Add all used dynamic libraries to the rpath.
+if test "$NIX_DONT_SET_RPATH" != "1"; then
+
+    # First, find all -L... switches.
+    allParams=("${params[@]}" ${extra[@]})
+    libPath=""
+    addToLibPath() {
+        local path="$1"
+        if test "${path:0:1}" != "/"; then return 0; fi
+        case "$path" in
+            *..*|*./*|*/.*|*//*)
+                local path2
+                if path2=$(readlink -f "$path"); then
+                    path="$path2"
+                fi
+                ;;
+        esac
+        case $libPath in
+            *\ $path\ *) return 0 ;;
+        esac
+        libPath="$libPath $path "
+    }
+    n=0
+    while test $n -lt ${#allParams[*]}; do
+        p=${allParams[n]}
+        p2=${allParams[$((n+1))]}
+        if test "${p:0:3}" = "-L/"; then
+            addToLibPath ${p:2}
+        elif test "$p" = "-L"; then
+            addToLibPath ${p2}
+            n=$((n + 1))
+        elif $(echo "$p" | grep -q '\.so\($\|\.\)'); then
+            path="$(dirname "$p")";
+            addToLibPath "${path}"
+        fi
+        n=$((n + 1))
+    done
+
+    # Second, for each directory in the library search path (-L...),
+    # see if it contains a dynamic library used by a -l... flag.  If
+    # so, add the directory to the rpath.
+    rpath=""
+    
+    addToRPath() {
+        # If the path is not in the store, don't add it to the rpath.
+        # This typically happens for libraries in /tmp that are later
+        # copied to $out/lib.  If not, we're screwed.
+        if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi
+        case $rpath in
+            *\ $1\ *) return 0 ;;
+        esac
+        rpath="$rpath $1 "
+    }
+
+    for i in $libPath; do
+        n=0
+        while test $n -lt ${#allParams[*]}; do
+            p=${allParams[n]}
+            p2=${allParams[$((n+1))]}
+            if test "${p:0:2}" = "-l" -a -f "$i/lib${p:2}.so"; then
+                addToRPath $i
+                break
+            elif test "$p" = "-l" -a -f "$i/lib${p2}"; then
+                # I haven't seen `-l foo', but you never know...
+                addToRPath $i
+                break
+            elif $(echo "$p" | grep -q '\.so\($\|\.\)'); then
+                path="$(dirname "$p")";
+                if test "$path" == "$i"; then
+                  addToRPath $i
+                  break;
+                fi
+            fi
+            n=$((n + 1))
+        done
+            
+    done
+    
+
+    # Finally, add `-rpath' switches.
+    for i in $rpath; do
+        extra=(${extra[@]} -rpath $i)
+    done
+fi
+
+
+# Optionally print debug info.
+if test "$NIX_DEBUG" = "1"; then
+  echo "original flags to @ld@:" >&2
+  for i in "${params[@]}"; do
+      echo "  $i" >&2
+  done
+  echo "extra flags to @ld@:" >&2
+  for i in ${extra[@]}; do
+      echo "  $i" >&2
+  done
+fi
+
+if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
+    source "$NIX_LD_WRAPPER_EXEC_HOOK"
+fi
+
+exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
--- a/pkgs/build-support/gcc-wrapper2/setup-hook.sh
+++ b/pkgs/build-support/gcc-wrapper2/setup-hook.sh
@ -0,0 +1,29 @@
+addCVars () {
+    if test -d $1/include; then
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
+    fi
+
+    if test -d $1/lib64; then
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64"
+    fi
+
+    if test -d $1/lib; then
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib"
+    fi
+}
+
+envHooks=(${envHooks[@]} addCVars)
+
+# Note: these come *after* $out in the PATH (see setup.sh).
+
+if test -n "@gcc@"; then
+    addToSearchPath PATH @gcc@/bin
+fi
+
+if test -n "@binutils@"; then
+    addToSearchPath PATH @binutils@/bin
+fi
+
+if test -n "@libc@"; then
+    addToSearchPath PATH @libc@/bin
+fi
--- a/pkgs/build-support/gcc-wrapper2/utils.sh
+++ b/pkgs/build-support/gcc-wrapper2/utils.sh
@ -0,0 +1,23 @@
+skip () {
+    if test "$NIX_DEBUG" = "1"; then
+        echo "skipping impure path $1" >&2
+    fi
+}
+
+
+# Checks whether a path is impure.  E.g., `/lib/foo.so' is impure, but
+# `/nix/store/.../lib/foo.so' isn't.
+badPath() {
+    local p=$1
+    
+    # Relative paths are okay (since they're presumably relative to
+    # the temporary build directory).
+    if test "${p:0:1}" != "/"; then return 1; fi
+    
+    # Otherwise, the path should refer to the store or some temporary
+    # directory (including the build directory).
+    test \
+        "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
+        "${p:0:4}" != "/tmp" -a \
+        "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
+}
--- a/pkgs/build-support/source-from-head-fun.nix
+++ b/pkgs/build-support/source-from-head-fun.nix
@ -0,0 +1,16 @@
+/*
+   purpose: mantain bleeding edge head sources.
+
+   you run
+   app --update
+   app --publish
+   to create source snapshots
+
+   The documentation is availible at http://github.com/MarcWeber/nix-repository-manager/raw/master/README
+
+*/
+{ getConfig }:
+  localTarName: publishedSrcSnapshot:
+  if getConfig ["sourceFromHead" "useLocalRepos"] false then
+    "${getConfig ["sourceFromHead" "managedRepoDir"] "/set/sourceFromHead.managedRepoDir/please"}/dist/${localTarName}"
+  else publishedSrcSnapshot
--- a/pkgs/development/compilers/ghc/6.10.1.nix
+++ b/pkgs/development/compilers/ghc/6.10.1.nix
@ -24,4 +24,35 @@ stdenv.mkDerivation rec {
    inherit homepage;
    description = "The Glasgow Haskell Compiler";
  };
+
+  
+  passthru = {
+    corePackages = [
+      [ "Cabal" "1.6.0.1" ]
+      [ "array" "0.2.0.0" ]
+      [ "base" "3.0.3.0" ]
+      [ "base" "4.0.0.0" ]
+      [ "bytestring" "0.9.1.4" ]
+      [ "containers" "0.2.0.0" ]
+      [ "directory" "1.0.0.2" ]
+      [ "editline" "0.2.1.0" ]
+      [ "filepath" "1.1.0.1" ]
+      [ "(ghc" "6.10.1)" ]
+      [ "ghc-prim" "0.1.0.0" ]
+      [ "haddock" "2.3.0" ]
+      [ "haskell98" "1.0.1.0" ]
+      [ "hpc" "0.5.0.2" ]
+      [ "integer" "0.1.0.0" ]
+      [ "old-locale" "1.0.0.1" ]
+      [ "old-time" "1.0.0.1" ]
+      [ "packedstring" "0.1.0.1" ]
+      [ "pretty" "1.0.1.0" ]
+      [ "process" "1.0.1.0" ]
+      [ "random" "1.0.0.1" ]
+      [ "rts" "1.0" ]
+      [ "syb" "0.1.0.0" ]
+      [ "template-haskell" "2.3.0.0" ]
+      [ "unix" "2.3.1.0" ]
+    ];
+  };
 }
--- a/pkgs/development/compilers/ghc/6.10.2.nix
+++ b/pkgs/development/compilers/ghc/6.10.2.nix
@ -24,4 +24,34 @@ stdenv.mkDerivation rec {
    inherit homepage;
    description = "The Glasgow Haskell Compiler";
  };
+
+  passthru = {
+    corePackages = [
+      [ "Cabal" "1.6.0.3" ]
+      [ "array" "0.2.0.0" ]
+      [ "base" "3.0.3.1" ]
+      [ "base" "4.1.0.0" ]
+      [ "bytestring" "0.9.1.4" ]
+      [ "containers" "0.2.0.1" ]
+      [ "directory" "1.0.0.3" ]
+      [ "editline" "0.2.1.0" ]
+      [ "filepath" "1.1.0.2" ]
+      [ "(ghc" "6.10.2)" ]
+      [ "ghc-prim" "0.1.0.0" ]
+      [ "haddock" "2.4.2" ]
+      [ "haskell98" "1.0.1.0" ]
+      [ "hpc" "0.5.0.3" ]
+      [ "integer" "0.1.0.1" ]
+      [ "old-locale" "1.0.0.1" ]
+      [ "old-time" "1.0.0.2" ]
+      [ "packedstring" "0.1.0.1" ]
+      [ "pretty" "1.0.1.0" ]
+      [ "process" "1.0.1.1" ]
+      [ "random" "1.0.0.1" ]
+      [ "rts" "1.0" ]
+      [ "syb" "0.1.0.1" ]
+      [ "template-haskell" "2.3.0.1" ]
+      [ "unix" "2.3.2.0" ]
+    ];
+  };
 }
--- a/pkgs/development/compilers/ghc/6.10.3.nix
+++ b/pkgs/development/compilers/ghc/6.10.3.nix
@ -24,4 +24,35 @@ stdenv.mkDerivation rec {
    inherit homepage;
    description = "The Glasgow Haskell Compiler";
  };
+
+
+  passthru = {
+    corePackages = [
+      [ "Cabal" "1.6.0.3" ]
+      [ "array" "0.2.0.0" ]
+      [ "base" "3.0.3.1" ]
+      [ "base" "4.1.0.0" ]
+      [ "bytestring" "0.9.1.4" ]
+      [ "containers" "0.2.0.1" ]
+      [ "directory" "1.0.0.3" ]
+      [ "extensible-exceptions" "0.1.1.0" ]
+      [ "filepath" "1.1.0.2" ]
+      [ "ghc" "6.10.3" ]
+      [ "ghc-prim" "0.1.0.0" ]
+      [ "haddock" "2.4.2" ]
+      [ "haskell98" "1.0.1.0" ]
+      [ "hpc" "0.5.0.3" ]
+      [ "integer" "0.1.0.1" ]
+      [ "old-locale" "1.0.0.1" ]
+      [ "old-time" "1.0.0.2" ]
+      [ "packedstring" "0.1.0.1" ]
+      [ "pretty" "1.0.1.0" ]
+      [ "process" "1.0.1.1" ]
+      [ "random" "1.0.0.1" ]
+      [ "rts" "1.0" ]
+      [ "syb" "0.1.0.1" ]
+      [ "template-haskell" "2.3.0.1" ]
+      [ "unix" "2.3.2.0" ]
+    ];
+  };
 }
--- a/pkgs/development/compilers/ghc/6.10.4.nix
+++ b/pkgs/development/compilers/ghc/6.10.4.nix
@ -24,4 +24,34 @@ stdenv.mkDerivation rec {
    inherit homepage;
    description = "The Glasgow Haskell Compiler";
  };
+
+  passthru = {
+    corePackages = [
+      [ "Cabal" "1.6.0.3" ]
+      [ "array" "0.2.0.0" ]
+      [ "base" "3.0.3.1" ]
+      [ "base" "4.1.0.0" ]
+      [ "bytestring" "0.9.1.4" ]
+      [ "containers" "0.2.0.1" ]
+      [ "directory" "1.0.0.3" ]
+      [ "extensible-exceptions" "0.1.1.0" ]
+      [ "filepath" "1.1.0.2" ]
+      [ "ghc" "6.10.4" ]
+      [ "ghc-prim" "0.1.0.0" ]
+      [ "haddock" "2.4.2" ]
+      [ "haskell98" "1.0.1.0" ]
+      [ "hpc" "0.5.0.3" ]
+      [ "integer" "0.1.0.1" ]
+      [ "old-locale" "1.0.0.1" ]
+      [ "old-time" "1.0.0.2" ]
+      [ "packedstring" "0.1.0.1" ]
+      [ "pretty" "1.0.1.0" ]
+      [ "process" "1.0.1.1" ]
+      [ "random" "1.0.0.1" ]
+      [ "rts" "1.0" ]
+      [ "syb" "0.1.0.1" ]
+      [ "template-haskell" "2.3.0.1" ]
+      [ "unix" "2.3.2.0" ]
+    ];
+  };
 }
--- a/pkgs/development/compilers/ghc/6.12.1.nix
+++ b/pkgs/development/compilers/ghc/6.12.1.nix
@ -35,4 +35,44 @@ stdenv.mkDerivation rec {
    inherit homepage;
    description = "The Glasgow Haskell Compiler";
  };
+
+
+  passthru = {
+    corePackages = [
+       [ "Cabal" "1.8.0" ]
+       [ "array" "0.3.0.0" ]
+       [ "base" "3.0.3.2" ]
+       [ "base" "4.2.0.0" ]
+       [ "bin-package-db" "0.0.0.0" ]
+       [ "bytestring" "0.9.1.5" ]
+       [ "containers" "0.3.0.0" ]
+       [ "directory" "1.0.1.0" ]
+       [ "dph-base" "0.4.0" ]
+       [ "dph-par" "0.4.0" ]
+       [ "dph-prim-interface" "0.4.0" ]
+       [ "dph-prim-par" "0.4.0" ]
+       [ "dph-prim-seq" "0.4.0" ]
+       [ "dph-seq" "0.4.0" ]
+       [ "extensible-exceptions" "0.1.1.1" ]
+       [ "ffi" "1.0" ]
+       [ "filepath" "1.1.0.3" ]
+       [ "ghc" "6.12.0.20091010" ]
+       [ "ghc-binary" "0.5.0.2" ]
+       [ "ghc-prim" "0.2.0.0" ]
+       [ "haskell98" "1.0.1.1" ]
+       [ "hpc" "0.5.0.4" ]
+       [ "integer-gmp" "0.2.0.0" ]
+       [ "old-locale" "1.0.0.2" ]
+       [ "old-time" "1.0.0.3" ]
+       [ "pretty" "1.0.1.1" ]
+       [ "process" "1.0.1.2" ]
+       [ "random" "1.0.0.2" ]
+       [ "rts" "1.0" ]
+       [ "syb" "0.1.0.2" ]
+       [ "template-haskell" "2.4.0.0" ]
+       [ "time" "1.1.4" ]
+       [ "unix" "2.4.0.0" ]
+       [ "utf8-string" "0.3.4" ]
+    ];
+  };
 }
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@ -1,9 +1,51 @@
 args: with args;

+let
+
+    src_haxe_swflib = {
+      # REGION AUTO UPDATE:                          { name = "haxe_swflib"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; }
+      src= sourceFromHead "haxe_swflib-F_01-25-00.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_swflib-F_01-25-00.tar.gz"; sha256 = "ddea39427de23ff58d3b942bbcce2aac7a25dc11ae06ef983653c82614eba9cd"; });
+      # END
+    }.src;
+
+    src_haxe_extc = { 
+      # REGION AUTO UPDATE:                          { name = "haxe_extc"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; }
+      src= sourceFromHead "haxe_extc-F_01-25-08.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extc-F_01-25-08.tar.gz"; sha256 = "ab2100391735d39c93c72b236ec6e9c5cf09461311a7e3a714d867861926ae37"; });
+      # END
+    }.src;
+
+    src_haxe_extlib_dev = { 
+      # REGION AUTO UPDATE:                          { name = "haxe_extlib_dev"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; }
+      src= sourceFromHead "haxe_extlib_dev-F_01-25-17.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_01-25-17.tar.gz"; sha256 = "01c3c8afdf47a98320e65c0652492508854ea28ead0437abd17a4228b33c8066"; });
+      # END
+    }.src;
+
+    src_haxe_xml_light = { 
+      # REGION AUTO UPDATE:                          { name = "haxe_xml_light"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; }
+      src= sourceFromHead "haxe_xml_light-F_01-25-24.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_01-25-24.tar.gz"; sha256 = "7fe244681698995af54085bb2ab873d3dd1ff2fac33aa8e7b00fcbbc50249334"; });
+      # END
+    }.src;
+
+    src_haxe_neko_include = { 
+      # REGION AUTO UPDATE:                          { name = "haxe_neko_include"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; }
+      src= sourceFromHead "haxe_neko_include-F_01-25-28.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_01-25-28.tar.gz"; sha256 = "8b642598889cf2fd1f99dfa037eef09b2511d30a8f5a6a75ee02b2e98fa4c6b7"; });
+      # END
+    }.src;
+
+in
+
 stdenv.mkDerivation {
  name = "haxe-cvs";

-  src = sourceByName "haxe";
+  # REGION AUTO UPDATE:                             { name="haxe"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "haxe"; groups = "haxe_group"; }
+  src= sourceFromHead "haxe-F_01-25-35.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/haxe-F_01-25-35.tar.gz"; sha256 = "8e5e5330e2fd7ffbbfe48d40bda03256aefbe30cf1be1d9c9065117b2b179f24"; });
+  # END

  buildInputs = [ocaml zlib makeWrapper];

@ -16,11 +58,11 @@ stdenv.mkDerivation {
    tar xfz $src --strip-components=1 -C haxe

    t(){ tar xfz $1 -C $2 --strip-components=2; }
-    t ${sourceByName "haxe_swflib"} ocaml/swflib
-    t ${sourceByName "haxe_extc"} ocaml/extc
-    t ${sourceByName "haxe_extlib_dev"} ocaml/extlib-dev
-    t ${sourceByName "haxe_xml_light"} ocaml/xml-light
-    t ${sourceByName "haxe_neko_include"} neko/libs
+    t ${src_haxe_swflib} ocaml/swflib
+    t ${src_haxe_extc} ocaml/extc
+    t ${src_haxe_extlib_dev} ocaml/extlib-dev
+    t ${src_haxe_xml_light} ocaml/xml-light
+    t ${src_haxe_neko_include} neko/libs

    sed -e '/download();/d' \
        -e "s@/usr/lib/@''${zlib}/lib/@g" \
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@ -14,7 +14,10 @@ composableDerivation {} ( fixed : {

  name = "neko-cvs";

-  src = sourceByName "neko";
+  # REGION AUTO UPDATE:           { name="neko"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; }
+  src= sourceFromHead "neko-F_01-20-32.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_01-20-32.tar.gz"; sha256 = "785449f6df718fe26b6c87a2b7aa3cc587a72e7127582e6300ce966d97d6d16b"; });
+  # END

  # optionally remove apache mysql like gentoo does?
  # they just remove libs/{apache,mod_neko}
--- a/pkgs/development/compilers/ocaml/3.11.1.nix
+++ b/pkgs/development/compilers/ocaml/3.11.1.nix
@ -26,8 +26,27 @@ stdenv.mkDerivation (rec {

  meta = {
    homepage = http://caml.inria.fr/ocaml;
-    license = "QPL, LGPL2 (library part)";
-    desctiption = "Most popular variant of the Caml language";
+    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    description = "Objective Caml, the most popular variant of the Caml language";
+
+    longDescription =
+      '' Objective Caml is the most popular variant of the Caml language.
+         From a language standpoint, it extends the core Caml language with a
+         fully-fledged object-oriented layer, as well as a powerful module
+         system, all connected by a sound, polymorphic type system featuring
+         type inference.
+
+         The Objective Caml system is an industrial-strength implementation
+         of this language, featuring a high-performance native-code compiler
+         (ocamlopt) for 9 processor architectures (IA32, PowerPC, AMD64,
+         Alpha, Sparc, Mips, IA64, HPPA, StrongArm), as well as a bytecode
+         compiler (ocamlc) and an interactive read-eval-print loop (ocaml)
+         for quick development and portability.  The Objective Caml
+         distribution includes a comprehensive standard library, a replay
+         debugger (ocamldebug), lexer (ocamllex) and parser (ocamlyacc)
+         generators, a pre-processor pretty-printer (camlp4) and a
+         documentation generator (ocamldoc).
+       '';
  };

 })
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+
+let
+  pname = "polyml";
+  version = "5.3";
+in
+
+stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${pname}.${version}.tar.gz";
+    sha256 = "154e836f4e65b5c72f8190d3c02e5ed237921cef716cb49add1e0e1e35fb2af4";
+  };
+
+  meta = {
+    description = "Standard ML compiler and interpreter";
+    longDescription = ''
+      Poly/ML is a full implementation of Standard ML.
+    '';
+    homepage = http://www.polyml.org/;
+    license = "LGPL";
+  };
+}
--- a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
+++ b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
@ -3,6 +3,17 @@ compiling with `-O0' (as is done with coverage analysis) since there may
 be many false references held on the stack, leading to the failure of
 such tests.

+--- a/test-suite/tests/gc.test
+++ b/test-suite/tests/gc.test
+@@ -59,6 +59,7 @@
+ 
+ (with-test-prefix "gc"
+   (pass-if "Unused modules are removed"
+           (throw 'unresolved)
+ 	   (let* ((guard (make-guardian))
+                   (total 1000))
+ 
+
 --- a/test-suite/tests/threads.test
 +++ b/test-suite/tests/threads.test
@@ -366,6 +366,7 @@
--- a/pkgs/development/interpreters/octave/hg.nix
+++ b/pkgs/development/interpreters/octave/hg.nix
@ -1,5 +1,5 @@
 {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex,
- bison, autoconf, automake, sourceByName, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}:
+ bison, autoconf, automake, sourceFromHead, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}:

 let commonBuildInputs = [gfortran readline ncurses perl glibc qhull libX11 texinfo]; in

@ -14,7 +14,10 @@ stdenv.mkDerivation ({
 } // (
  if (getConfig ["octave" "devVersion"] false) then {
    name = "octave-hg"; # developement version mercurial repo
-    src =  sourceByName "octave";
+    # REGION AUTO UPDATE:   { name="octave"; type = "hg"; url = "http://www.octave.org/hg/octave"; }
+    src = sourceFromHead "octave-03b414516dd8.tar.gz"
+                 (fetchurl { url = "http://mawercer.de/~nix/repos/octave-03b414516dd8.tar.gz"; sha256 = "30877f1e2ff1a456e7a76153aabf7c59ce7c7a8b63eda0515b1eead6a4351ce7"; });
+    # END
    # HOME is set to $TMP because octave needs to access ${HOME}/.octave_hist while running targets
    # in doc/interpreter.. Maybe this can be done better. This hack is fastest :)
    preConfigure = ''
--- a/pkgs/development/interpreters/perl-5.8/default.nix
+++ b/pkgs/development/interpreters/perl-5.8/default.nix
@ -5,7 +5,8 @@
 stdenv.mkDerivation {
  name = "perl-5.8.8";

-  builder =
+  phases = "phase";
+  phase =
   ''
 source $stdenv/setup

@ -28,6 +29,7 @@ postInstall() {
    cp $setupHook $out/nix-support/setup-hook
 }

+unset phases
 genericBuild

   '';
--- a/pkgs/development/interpreters/python-new/2.5/default.nix
+++ b/pkgs/development/interpreters/python-new/2.5/default.nix
@ -13,7 +13,7 @@
 p: # p = pkgs
 let 
  inherit (builtins) isAttrs hasAttr;
-  inherit (p) lib fetchurl stdenv getConfig;
+  inherit (p) lib fetchurl stdenv getConfig sourceFromHead;
  inherit (p.composableDerivation) composableDerivation;
  # withName prevents  nix-env -qa \* from aborting (pythonLibStub is a derivation but hasn't a name)
  withName = lib.mapAttrs (n : v : if (isAttrs v && (!hasAttr "name" v)) then null else v);
@ -382,22 +382,6 @@ in
    };
  };

-#  zope = t.pythonLibStub.merge rec {
-#[> version = "3.3.1";
-#    version = "svn";
-#    name = "zope-${version}";
-#    [>src = p.blending.sourceByName "zope";
-#    src = "/home/marc/managed_repos/zope";
-
-#    [>fetchurl {
-#    [> Doh! Python version 2.4.3 before continuing. Versions
-#    [> 2.4.7 2.4.6 2.4.5 2.4.4 2.4.2 2.4.1 also work, but not as optimally.
-#    [>  url = "http://www.zope.org/Products/Zope3/${version}/Zope-${version}.tgz";
-#    [>  sha256 = "1qvvh384j7blzhwgfmd5kqvr5vzpv5khaj8ha46ln3hrwffrk2b1";
-#    [>};
-#    pyCheck = "";
-#  };
-
  setuptools = t.pythonLibSetup.merge {
    name = "setuptools-0.6c9";
    postUnpack = ''
@ -537,7 +521,10 @@ in
    name = "soappy-0.12";
    pyCheck = "from SOAPpy import WSDL";
    propagatedBuildInputs = [ t.fpconst ];
-    src = p.bleedingEdgeRepos.sourceByName "pywebcvs";
+    # REGION AUTO UPDATE:   { name="pywebcvs"; type = "svn"; url = "https://pywebsvcs.svn.sourceforge.net/svnroot/pywebsvcs/trunk"; }
+    src = sourceFromHead "pywebcvs-1493.tar.gz"
+                 (fetchurl { url = "http://mawercer.de/~nix/repos/pywebcvs-1493.tar.gz"; sha256 = "54e9faca87d8a59a22e06374b8416555cf76d3f411fa2be168ad542c2d8e6fc1"; });
+    # END
    postUnpack = "sourceRoot=$sourceRoot/SOAPpy";
    /* The release is buggy. I can't get list of dedicated netboots from ovh ?
    src = fetchurl {
@ -560,7 +547,10 @@ in
      import sqlalchemy.orm
      import sqlalchemy.orm.collections
    '';
-    src = p.bleedingEdgeRepos.sourceByName "sqlalchemy05";
+    # REGION AUTO UPDATE:   { name="sqlalchemy05"; type = "svn"; url="http://svn.sqlalchemy.org/sqlalchemy/trunk"; }
+    src = sourceFromHead "sqlalchemy05-6076.tar.gz"
+                 (fetchurl { url = "http://mawercer.de/~nix/repos/sqlalchemy05-6076.tar.gz"; sha256 = "f35e6475996f7591d49affbc935c40b4c93e4cdaff86a50af9321774de2025b2"; });
+    # END
    meta = { 
      description = "sql orm wrapper for python";
      homepage = http://www.sqlalchemy.org;
@ -578,11 +568,18 @@ in

      iElectric: column.alter could be broken ..
    */
-    installMigration = ''
+    installMigration =
+    let src = {
+      # REGION AUTO UPDATE:   { name="sqlalchemyMigrate"; type = "svn"; url="http://sqlalchemy-migrate.googlecode.com/svn/trunk"; }
+      src = sourceFromHead "sqlalchemyMigrate-569.tar.gz"
+                   (fetchurl { url = "http://mawercer.de/~nix/repos/sqlalchemyMigrate-569.tar.gz"; sha256 = "3b076b33aa13bb2923e719489fd7988a5660bd8d8e87dac03f453b510e2695f4"; });
+      # END
+    }.src; in
+    ''
      cd $TMP
      mkdir migrate
      cd migrate
-      unpackFile ${p.bleedingEdgeRepos.sourceByName "sqlalchemyMigrate"}
+      unpackFile ${src}
      cd *
      python setup.py $setupFlags build
      python setup.py $setupFlags install --prefix=$out
@ -605,7 +602,10 @@ in
      import migrate.changeset
      import migrate.changeset.schema
    '';
-    src = p.bleedingEdgeRepos.sourceByName "sqlalchemyMigrate";
+    # REGION AUTO UPDATE:   { name="sqlalchemyMigrate"; type = "svn"; url="http://sqlalchemy-migrate.googlecode.com/svn/trunk"; }
+    src = sourceFromHead "sqlalchemyMigrate-569.tar.gz"
+                 (fetchurl { url = "http://mawercer.de/~nix/repos/sqlalchemyMigrate-569.tar.gz"; sha256 = "2bfbd41e31c9dce4434ca4cb209338ccef1fd0394999b18111be838b79db703b"; });
+    # END
    meta = { 
      description = "sqlalchemy database versioning and scheme migration";
      homepage = http://packages.python.org/sqlalchemy-migrate/download.html;
--- a/pkgs/development/libraries/haskell/get-options/default.nix
+++ b/pkgs/development/libraries/haskell/get-options/default.nix
@ -1,10 +1,13 @@
-{cabal, sourceByName, mtl}:
+{cabal, fetchurl, sourceFromHead, mtl}:

 cabal.mkDerivation (self : {
  pname = "get-options";
  version = "x"; # ? 
  name = self.fname;
-  src = sourceByName "getOptions";
+  # REGION AUTO UPDATE:             { name="getOptions"; type="darcs"; url = "http://repetae.net/john/repos/GetOptions"; }
+  src = sourceFromHead "getOptions-nrmtag1.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/getOptions-nrmtag1.tar.gz"; sha256 = "0e884687b2c676a5b7e79826a2236991cb045f794c5fd625813529a2b30224cd"; });
+  # END
  extraBuildInputs = [ mtl ];
  meta = {
    description = "Simple to use get option library";
--- a/pkgs/development/libraries/haskell/ghc-syb/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-syb/default.nix
@ -1,10 +1,13 @@
-{cabal, syb, sourceByName}:
+{cabal, fetchurl, syb, sourceFromHead}:

 cabal.mkDerivation (self : {
  pname = "ghc-syb";
  version = "dev";
  name = self.fname;
-  src = sourceByName "ghc_syb";
+  # REGION AUTO UPDATE:   { name="ghc_syb"; type = "git"; url = "git://github.com/nominolo/ghc-syb.git"; groups="haskell scien"; }
+  src = sourceFromHead "ghc_syb-876b121e73f1b5ca4b17b0c6908b27ba7efb0374.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/ghc_syb-876b121e73f1b5ca4b17b0c6908b27ba7efb0374.tar.gz"; sha256 = "bb5071ee8a6a6cd99634e0f146c921592e8c77b13d511cde0c91fedc406a0a07"; });
+  # END
  extraBuildInputs = [syb];
  meta = {
    description = "Source code suggestions";
--- a/pkgs/development/libraries/openal/default.nix
+++ b/pkgs/development/libraries/openal/default.nix
@ -12,24 +12,6 @@ stdenv.mkDerivation rec {

  buildInputs = [ cmake alsaLib ];

-  cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/\"" +
-    " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" +
-    " -DCMAKE_SKIP_BUILD_RPATH=ON" +
-    " -DCMAKE_BUILD_TYPE=Release" +
-    " -DCMAKE_INSTALL_PREFIX=$out";
-
-  dontUseCmakeConfigure = true;
-
-  # I rewrote the configure phase to get the $out references evaluated in
-  # cmakeFlags
-  configurePhase = ''
-    set -x
-    mkdir -p build;
-    cd build
-    eval -- "cmake .. $cmakeFlags"
-    set +x
-    '';
-
  meta = {
    description = "OpenAL, a cross-platform 3D audio API";

--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@ -3,8 +3,8 @@
 stdenv.mkDerivation {
  name = "vtk-5.2.1";
  src = fetchurl {
-    url = http://www.vtk.org/files/release/5.2/vtk-5.2.1.tar.gz;
-    sha256 = "c81521b3767a044745336212cbde500d6e97a1f8ba647bc590857e36f57003bb";
+    url = http://www.vtk.org/files/release/5.4/vtk-5.4.2.tar.gz;
+    sha256 = "0gd7xlxiqww6xxcs2kicz0g6k147y3200np4jnsf10vlxs10az03";
  };
  buildInputs = [ cmake mesa libX11 xproto libXt ];

--- a/pkgs/development/misc/bleeding-edge-repos/default.nix
+++ b/pkgs/development/misc/bleeding-edge-repos/default.nix
@ -1,105 +0,0 @@
-args: 
-  with args;
-  let inherit (builtins) pathExists hasAttr getAttr head; in
-  rec {
-  /*
-    tries to get source in this order
-    1) Local .tar.gz in ${HOME}/managed_repos/dist/name.tar.gz (-> see nixRepositoryManager)
-    2) By importing                                           
-        pkgs/misc/bleeding-edge-fetch-info/name.nix
-        (generated by nixRepositoryManager --publish)
-  */ 
-
-  managedRepoDir = getConfig [ "bleedingEdgeRepos" "managedRepoDir" ] (builtins.getEnv "HOME" + "/managed_repos");
-
-  sourceByName = name :
-    let fetchinfo = if (hasAttr name fetchInfos) 
-          then (getAttr name fetchInfos) { inherit fetchurl; }
-          else throw "no bleeding edge source attribute found in bleeding-edge-fetch-infos.nix with name ${name}\n"
-                     "run NO_FETCH=1 nix-repository-manager <path to nixpkgs> --update <reponame> to add it automatically";
-        localTarGZ = managedRepoDir+"/dist/${ builtins.baseNameOf (head fetchinfo.urls) }"; # hack, dropPath should be implemented as primop
-        fetchInfos = import ../../../misc/bleeding-edge-fetch-infos.nix; in
-    if (getConfig ["bleedingEdgeRepos" "useLocalRepos"] false && builtins.pathExists localTarGZ)
-        then localTarGZ else fetchinfo;
-
-  repos = 
-      let kde4support = builtins.listToAttrs (map (n: lib.nameValuePair ("kdesupport_"+n) { type = "svn"; url = "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/${n}"; groups="kdesupport"; })
-                          [ "akode" "eigen" "gmm" "qca" "qimageblitz" "soprano" "strigi" "taglib" 
-                          "automoc" "akonadi" "cpptoxml" "decibel" "emerge" "phonon" "tapioca_qt" "telepathy_qt"]); in
-      # in trunk but not yet supported by nix: akonadi/ automoc/ cpptoxml/ decibel/ emerge/ kdewin-installer/ kdewin32/ phonon/ tapioca-qt/ telepathy-qt/
-    {
-    # each repository has 
-    # a type, url and maybe a tag
-    # you can add groups names to update some repositories at once
-    # see nix-repository-manager expression in haskellPackages
-
-      unsermake = { type = "svn"; url = "svn://anonsvn.kde.org/home/kde/trunk/kdenonbeta/unsermake"; };
-
-      nix_repository_manager = { type = "darcs"; url = "http://mawercer.de/~marc/repos/nix-repository-manager"; };
-
-      pywebcvs = { type = "svn"; url = "https://pywebsvcs.svn.sourceforge.net/svnroot/pywebsvcs/trunk"; };
-
-      plugins = { type = "darcs"; url="http://code.haskell.org/~dons/code/hs-plugins/"; groups="haskell"; };
-
-      git_fast_export = { type = "git"; url="git://repo.or.cz/hg2git.git"; };
-
-      MPlayer = { type = "svn"; url="svn://svn.mplayerhq.hu/mplayer/trunk"; };
-
-      # darcs repositories haskell 
-      http =  { type= "darcs"; url="http://darcs.haskell.org/http/"; groups="happs"; };
-      syb_with_class =  { type="darcs"; url="http://happs.org/HAppS/syb-with-class"; groups="happs"; };
-      happs_data =  { type="darcs"; url=http://happs.org/repos/HAppS-Data; groups="happs"; };
-      happs_util =  { type="darcs"; url=http://happs.org/repos/HAppS-Util; groups="happs"; };
-      happs_state =  { type="darcs"; url=http://happs.org/repos/HAppS-State; groups="happs"; };
-      happs_plugins =  { type="darcs"; url=http://happs.org/repos/HAppS-Plugins; groups="happs"; };
-      happs_ixset =  { type="darcs"; url=http://happs.org/repos/HAppS-IxSet; groups="happs"; };
-      happs_server =  { type="darcs"; url=http://happs.org/repos/HAppS-Server; groups="happs"; };
-      happs_hsp = { type="darcs"; url="http://code.haskell.org/HSP/happs-hsp"; groups="happs haskell hsp"; };
-      happs_hsp_template = { type="darcs"; url="http://code.haskell.org/HSP/happs-hsp-template"; groups="happs haskell hsp"; };
-      # haskell_src_exts_metaquote = { type="darcs"; url=http://code.haskell.org/~morrow/code/haskell/haskell-src-exts-metaquote; groups="happs haskell hsp"; };
-      haskell_src_exts = { type="darcs"; url=http://code.haskell.org/HSP/haskell-src-exts/; groups="happs haskell hsp"; };
-      
-      hsp = { type="darcs"; url="http://code.haskell.org/HSP/hsp"; groups="happs haskell hsp"; };
-      hsp_xml = { type="darcs"; url="http://code.haskell.org/HSP/hsp-xml"; groups="happs haskell hsp"; };
-      hspCgi = { type="darcs"; url="http://code.haskell.org/HSP/hsp-cgi"; groups="happs haskell hsp"; };
-      hjscript = { type="darcs"; url="http://code.haskell.org/HSP/hjscript"; groups="happs haskell hsp"; };
-      hjquery = { type="darcs"; url="http://code.haskell.org/HSP/hjquery"; groups="happs haskell hsp"; };
-      hjavascript = { type="darcs"; url="http://code.haskell.org/HSP/hjavascript"; groups="happs haskell hsp"; };
-      takusen = { type="darcs"; url=http://darcs.haskell.org/takusen/; };
-      cabal = { type="darcs"; url=http://darcs.haskell.org/cabal; };
-      haxml = { type="darcs"; url=http://www.cs.york.ac.uk/fp/darcs/HaXml; groups = "pg_haskell"; };
-      storableVector = { type="darcs"; url=http://darcs.haskell.org/storablevector/; groups = "haskell"; };
-
-      kdepimlibs = { type="svn"; url="svn://anonsvn.kde.org/home/kde/trunk/KDE/kdepimlibs"; groups = "kde"; };
-      kdebase = { type="svn"; url="svn://anonsvn.kde.org/home/kde/trunk/KDE/kdebase"; groups = "kde"; };
-
-      cinelerra =  { type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; };
-      ctags = { type = "svn"; url = "https://ctags.svn.sourceforge.net/svnroot/ctags/trunk"; };
-      autofs = { type="git"; url="http://ftp.riken.go.jp/Linux/kernel.org/scm/linux/storage/autofs/autofs.git"; };
-
-      # git repositories 
-      hypertable =  { type="git"; url="git://scm.hypertable.org/pub/repos/hypertable.git"; groups=""; };
-
-      getOptions = { type="darcs"; url="http://repetae.net/john/repos/GetOptions"; groups=""; };
-      ghc_syb = { type = "git"; url = "git://github.com/nominolo/ghc-syb.git"; groups="haskell scien"; };
-
-      libCSS = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libcss"; groups = "netsurf_group"; };
-      netsurf = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/netsurf"; groups = "netsurf_group"; };
-      libwapcaplet = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libwapcaplet"; groups = "netsurf_group"; };
-      libsvgtiny = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libsvgtiny"; groups = "netsurf_group"; };
-      libdom = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/dom"; groups = "netsurf_group"; };
-      netsurf_haru = { type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libharu"; groups = "netsurf_group"; };
-
-      # haxe
-      haxe = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "haxe"; groups = "haxe_group"; };
-      haxe_swflib = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; };
-      haxe_extc = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; };
-      haxe_extlib_dev = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; };
-      haxe_xml_light = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; };
-      haxe_neko_include = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; };
-
-      neko = { type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; };
-
-
-    } // kde4support // getConfig [ "bleedingEdgeRepos" "repos" ] {};
-}
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@ -1,10 +1,10 @@
 {fetchurl, stdenv, replace, ncurses}:

 stdenv.mkDerivation rec {
-  name = "cmake-2.6.4";
+  name = "cmake-2.8.0";

  # We look for cmake modules in .../share/cmake-${majorVersion}/Modules.
-  majorVersion = "2.6";
+  majorVersion = "2.8";

  setupHook = ./setup-hook.sh;

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://www.cmake.org/files/v${majorVersion}/${name}.tar.gz";
-    sha256 = "1wpxr5x4aggaqrqzjq3kg4hh09f0vyr1njik1pad01bvwd923pcw";
+    sha256 = "0va7kxczqb920n61xnyhr99ajs4v05mssk4n0p6z55yvr9g62zc4";
  };

  patches = [ ./findqt4.patch ];
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@ -39,6 +39,9 @@ cmakeConfigurePhase()
        cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-g++ -DCMAKE_C_COMPILER=$crossConfig-gcc $cmakeFlags"
    fi

+    # Avoid cmake resetting the rpath of binaries, on make install
+    cmakeFlags="-DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags"
+
    echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"

    cmake ${cmakeDir:-.} $cmakeFlags ${cmakeFlagsArray[@]}
--- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix
+++ b/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 ];
  };
 }
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/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 ];
  };
 }
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/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
+  };
+}
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/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;
  };
 }
--- a/pkgs/development/tools/misc/ctags/default.nix
+++ b/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
--- a/pkgs/development/tools/misc/hsc2hs/default.nix
+++ b/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";
-  };
-}
--- a/pkgs/misc/bleeding-edge-fetch-infos.nix
+++ b/pkgs/misc/bleeding-edge-fetch-infos.nix
@ -1,326 +0,0 @@
-{ # Warning, this file is updated automatically by nix-repository-manager
-  # which will add or replace exsiting attribute sets only
-  # new items will be added before the last line, 4 lines will be removed when
-  # replacing always, matched by "name ="
-
-  cabal = args: with args; fetchurl { # Thu Aug 21 09:07:56 UTC 2008
-    url = http://mawercer.de/~nix/repos/cabal.tar.gz;
-    sha256 = "2c370636ef30593325b1c01eed37eb0e993923acb6387724d97a5eed51b00887";
-  };
-  getOptions = args: with args; fetchurl { # Thu Jul  9 23:31:53 CEST 2009
-    url = "http://mawercer.de/~nix/repos/getOptions-nrmtag1.tar.gz";
-    sha256 = "5ec39b43a58a507ed3652bc53d57d9b785a6fbb72a8824b951590e076c704589";
-  };
-  ghc_lambdavm = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/ghc_lambdavm.tar.gz;
-    sha256 = "3d10e839b8226987383e870258ff38b56442ff254688f7c50983850676f992cb";
-  };
-  git = args: with args; fetchurl { # Tue Jan 20 22:28:04 UTC 2009
-    url = "http://mawercer.de/~nix/repos/git-a227bce65f3fcdfbf28f109809b7e2e518b906f8.tar.gz";
-    sha256 = "7420a385718c7edec956fb0cba1a8a11d4b45edc833d7c06bf7c4764188ce180";
-  };
-  happs_data = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/happs_data.tar.gz;
-    sha256 = "084c5a3ddb8393fd41679ad7e87e6057b3434556b3508e062175edbcd8fb1cac";
-  };
-  happs_hsp = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/happs_hsp.tar.gz;
-    sha256 = "cc4df8509468ec83e3f448bb1e1fe5cb7e1f2408851861df31f139778e3c8cc8";
-  };
-  happs_hsp_template = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/happs_hsp_template.tar.gz;
-    sha256 = "b41336352ab878c1342c872e82354de1853366ddaf3abeb213ccad073052c9ac";
-  };
-  happs_ixset = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/happs_ixset.tar.gz;
-    sha256 = "c3972895d312256f0b126cead4a425bbf8d310af4ef3040708e64a614488b263";
-  };
-  happs_plugins = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/happs_plugins.tar.gz;
-    sha256 = "0ecb644e0ab07b719c54ffb67185302575feafd9dd747ac16ffc7428521be8e9";
-  };
-  happs_server = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/happs_server.tar.gz;
-    sha256 = "5170e7a1f725809615a90cabac11fbdb3d23b57d6684db3786b24b2de87d6fb5";
-  };
-  happs_state = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/happs_state.tar.gz;
-    sha256 = "29f3e5a857a9eda66cf55257cbd2daf00a9fa5921cadeb90db5b2d8e2aa1ecfd";
-  };
-  happs_util = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/happs_util.tar.gz;
-    sha256 = "799de3edbac7f408ab5f4129702a75926903f9ebc43bf4ae11b5af214d051e43";
-  };
-  haskellnet = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/haskellnet.tar.gz;
-    sha256 = "fde6f79b09d6cfbc6021aed9fa54ed186715a6eaacd4634f07554d4d3777f70d";
-  };
-  haskell__exts = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/haskell__exts.tar.gz;
-    sha256 = "6cb2214ee3a62083325c907e47979b5fdf6809ce0ef2cd400fba0219b3f42090";
-  };
-  hjavascript = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hjavascript.tar.gz;
-    sha256 = "fcf76a344eda3afca9b87f8e8ae1d343953b1bdda5da062f887a47f7d5a3c0da";
-  };
-  hjquery = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hjquery.tar.gz;
-    sha256 = "32691467d83acd73f733c695266fbeeb4978ee43f4380d3b3554350bfb7cbb0e";
-  };
-  hjscript = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hjscript.tar.gz;
-    sha256 = "fba290645b5ada63030143137d653d34ca5874660e8ab31072a76a57933dfce2";
-  };
-  hsc2hs = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hsc2hs.tar.gz;
-    sha256 = "3179eba85e56f30250793dbb612ffb8ad869e37297a185c2e0fb29134afb73af";
-  };
-  hsjava = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hsjava.tar.gz;
-    sha256 = "952839e53f63fc43c7c8a760bab97d150c504e148ebdd407be5e642661ed048f";
-  };
-  hspCgi = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hspCgi.tar.gz;
-    sha256 = "87bd8cb7e3ccad0147c36ce7af0f3089684b739f4149376821e258445b83f7b6";
-  };
-  hsp = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hsp.tar.gz;
-    sha256 = "bfaf83e5eff20226f9602c7889462f86d176b673b1cf677c280aeabb6dd560a3";
-  };
-  hsp_xml = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hsp_xml.tar.gz;
-    sha256 = "203efdd5ec3784be0b1580569e56f278e102c2275350934a3b2ee4850b7ee34f";
-  };
-  hsql = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hsql.tar.gz;
-    sha256 = "9856e6811a4fc78bf55a1c4bb08091075a343995696b7026a0ef0dae91abc99a";
-  };
-  hsutils = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hsutils.tar.gz;
-    sha256 = "6d1cc9881fb2684016e52d3ab8e6666c5396da168eb298c3a549294668f6aa52";
-  };
-  http = args: with args; fetchurl { # Thu Aug 21 09:04:57 UTC 2008
-    url = http://mawercer.de/~nix/repos/http.tar.gz;
-    sha256 = "3166d17951bd5a052c059e161cd3f44afdb2b6a329c49b645f9cfdccda416d37";
-  };
-  hypertable = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/hypertable.tar.gz;
-    sha256 = "d8a385def778d817415a6dd9d7ce10a60525c3c4a4d4dd8ec3bd8cfd359d2ab4";
-  };
-  libnih = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/libnih.tar.gz;
-    sha256 = "443c7af0363d1fb3b040d1903ff28cbd520c9f32634bff639263b8315b293acc";
-  };
-  mkcabal = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/mkcabal.tar.gz;
-    sha256 = "9f231756c36b46d29516ed327a320837194799a76de4833dc6a5c88e5ccd1658";
-  };
-  nix_repository_manager = args: with args; fetchurl { # Sun Sep  6 16:46:13 CEST 2009
-    url = "http://mawercer.de/~nix/repos/nix_repository_manager-nrmtag6.tar.gz";
-    sha256 = "6c5daa1b320ada16ce7e8c2279ab3a27726e23fa3c1115f8c0bbd64ff806c7b7";
-  };
-  plugins = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/plugins.tar.gz;
-    sha256 = "33206e33258b64fbb077291cd1f5f20629c6129c5541c177e51074a3082f59fa";
-  };
-  syb_with_class = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/syb_with_class.tar.gz;
-    sha256 = "f67c979bb980e69856f26f89b9bdcb5cf962e4db0b1fb859f53928c2d6b45f5b";
-  };
-  synergy = args: with args; fetchurl { # Mon Mar 30 10:08:36 CEST 2009
-    url = "http://mawercer.de/~nix/repos/synergy-F_10-08-35.tar.gz";
-    sha256 = "764b88b69f342017094380f62099f4a0dfdcddb6a289abb6b646f7ac2f37d675";
-  };
-  takusen = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/takusen.tar.gz;
-    sha256 = "35f3dbededae1a8d3bf648b229cbaf983907ff762b80674a65505f13c44147df";
-  };
-  upstart = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/upstart.tar.gz;
-    sha256 = "3243857ce4e0cd0d6fe28dbdcaa294b5590befed79b54a306b40cb5c65b381db";
-  };
-  haxml = args: with args; fetchurl { # Wed Aug 20 23:33:52 UTC 2008
-    url = http://mawercer.de/~nix/repos/haxml.tar.gz;
-    sha256 = "71ab127d11c06781fa62e76eda12fe979227c89e767961740222ab2f3a912cbe";
-  };
-  haskell_src_exts = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/haskell_src_exts.tar.gz;
-    sha256 = "6cb2214ee3a62083325c907e47979b5fdf6809ce0ef2cd400fba0219b3f42090";
-  };
-  storableVector = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/storableVector.tar.gz;
-    sha256 = "ce7ac7973e12ff92ceb371b95fc74430c7870f0fc27ae02fad4792b1643653b6";
-  };
-  kdesupport_akode = args: with args; fetchurl { # Wed Aug 13 15:09:07 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_akode.tar.gz;
-    sha256 = "9fb2a363c3331fe67cc3bddcc430df30f8f1b9869ec7673fb97ecb18313ef710";
-  };
-  kdesupport_eigen = args: with args; fetchurl { # Wed Aug 13 15:28:37 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_eigen.tar.gz;
-    sha256 = "25854580e5fcb222e6463cf02802e5160ca0e037d9f86bee4b5edf22d8161607";
-  };
-  kdesupport_gmm = args: with args; fetchurl { # Wed Aug 13 15:09:46 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_gmm.tar.gz;
-    sha256 = "70faafe70e0eac747f6ffa47cebd537c6bda7509739d634a0c49cb85bc797668";
-  };
-  kdesupport_qca = args: with args; fetchurl { # Wed Aug 13 15:10:38 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_qca.tar.gz;
-    sha256 = "ca0d8c0ffdec7b81a3d3574e8d16fd423f8a42a9793ecd8d2997671a48c8d62b";
-  };
-  kdesupport_qimageblitz = args: with args; fetchurl { # Wed Aug 13 14:55:54 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_qimageblitz.tar.gz;
-    sha256 = "25e31db3fdd73f97dda82a071031b766ecbacf583924ed1d8af7418bf408204d";
-  };
-  kdesupport_soprano = args: with args; fetchurl { # Wed Aug 13 14:59:54 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_soprano.tar.gz;
-    sha256 = "4a3a6ff41d29b7efb1fe9b80db232579f76cc683b18a95f45d6f2bda9bb25800";
-  };
-  kdesupport_strigi = args: with args; fetchurl { # Wed Aug 13 15:00:49 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_strigi.tar.gz;
-    sha256 = "77ff3345a49ffdcc57f3fca48c20b751967a18db9d0ee3922dca7c20ff2f400f";
-  };
-  kdesupport_taglib = args: with args; fetchurl { # Wed Aug 13 15:01:45 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_taglib.tar.gz;
-    sha256 = "ae6c92e2ed40bec330f764d7549e7d200477ba1e3126dba41539225b3a9ad13a";
-  };
-  kdesupport_akonadi = args: with args; fetchurl { # Wed Aug 13 15:11:30 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_akonadi.tar.gz;
-    sha256 = "a845ed8e82e9545de9ac2a086e510d0ad81efccd068a677a928c25f5f6481ece";
-  };
-  kdesupport_automoc = args: with args; fetchurl { # Wed Aug 13 15:28:25 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_automoc.tar.gz;
-    sha256 = "b40161ec6dd1ef040a488a6926bd75d54b0230025b03df9fde8fd2207882aae7";
-  };
-  kdesupport_cpptoxml = args: with args; fetchurl { # Wed Aug 13 15:11:49 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_cpptoxml.tar.gz;
-    sha256 = "8c4909dc0f57a337d07d3d3d365baeecd021f41705a2998ba6d3ff8d992b6a09";
-  };
-  kdesupport_decibel = args: with args; fetchurl { # Wed Aug 13 15:12:09 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_decibel.tar.gz;
-    sha256 = "76f98fb2f020ec5ba2f8017c54e0db392a8f660e1d9ddb20f6125f5feab1caff";
-  };
-  kdesupport_emerge = args: with args; fetchurl { # Wed Aug 13 15:12:30 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_emerge.tar.gz;
-    sha256 = "acfce47b2cbb3b7af864ec8dd7df664d2cb8b4cbf6484e91adc912562422bfa6";
-  };
-  kdesupport_phonon = args: with args; fetchurl { # Wed Aug 13 15:13:48 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_phonon.tar.gz;
-    sha256 = "36e8fc19ab376991cd820143994900c976b5a3d4905923eee56d8b153083bdd2";
-  };
-  kdesupport_tapioca_qt = args: with args; fetchurl { # Wed Aug 13 15:13:50 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_tapioca_qt.tar.gz;
-    sha256 = "9d313cdd685c6532b6052adc63a51a89a10aae5c5648d71e93e3d4eed8af8c0f";
-  };
-  kdesupport_telepathy_qt = args: with args; fetchurl { # Wed Aug 13 15:13:52 UTC 2008
-    url = http://mawercer.de/~nix/repos/kdesupport_telepathy_qt.tar.gz;
-    sha256 = "022599182ff629662bbd01acdea6ead9aec64b3e73e8da3eb58ef857803035f2";
-  };
-  cinelerra = args: with args; fetchurl { # Tue Oct 14 12:36:49 UTC 2008
-    url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz";
-    sha256 = "1e84ff59dcd7a3c80343eb9be302f822e510c95398fd1a6c8f2e4b163fd51e45";
-  };
-  hg2git = args: with args; fetchurl { # Tue Jan 20 22:49:27 UTC 2009
-    url = "http://mawercer.de/~nix/repos/hg2git-0fabb998a19c850cb8fcfcf72414b18070d94378.tar.gz";
-    sha256 = "ce7cd089681e6eee24f5bc9ab3b73f1e49d368b83a32d00695eadca00533ac5d";
-  };
- octave = args: with args; fetchurl { # Mon Dec  1 23:23:49 UTC 2008
-   url = "http://mawercer.de/~nix/repos/octave-03b414516dd8.tar.gz";
-   sha256 = "28ca0be1407954e746909241bda95c5bf0a04f611e73100c1e3967ddc249c519";
- };
-  zsh = args: with args; fetchurl { # Sun Dec 21 12:50:24 UTC 2008
-    url = "http://mawercer.de/~nix/repos/zsh-2008-12-21_12-50-23.tar.gz";
-    sha256 = "9af16f89205759d7ade51268dbdfa02cec3db10b35dc7a56ffe8e1fde2074ae7";
-  };
-  topGit = args: with args; fetchurl { # Sat Sep 26 02:02:43 CEST 2009
-    url = "http://mawercer.de/~nix/repos/topGit-f59e4f9e87e5f485fdaee0af002edd2105fa298a.tar.gz";
-    sha256 = "04e3c5e60570f414c1d2ee9ed64b80362b1958ebbac7d5c235cce17e9a339c94";
-  };
-  qgit = args: with args; fetchurl { # Tue Jan 20 21:35:00 UTC 2009
-    url = "http://mawercer.de/~nix/repos/qgit-b5dd5fd691e9423124cf356abe26e641bc33d159.tar.gz";
-    sha256 = "e04de308feb40716a6b02d1f69dc834f4fa859865b64e8f91beb6018fa953f96";
-  };
-  autofs = args: with args; fetchurl { # Thu Apr 30 04:42:28 CEST 2009
-    url = "http://mawercer.de/~nix/repos/autofs-9a77464b8a661d33a6205756955e0047727d5c1f.tar.gz";
-    sha256 = "0260817c5deb87210a4cea340d0ef0f35577ef14f37bd7da05a2f08be385ac2f";
-  };
-  ctags = args: with args; fetchurl { # Thu May  7 20:12:55 CEST 2009
-    url = "http://mawercer.de/~nix/repos/ctags-703.tar.gz";
-    sha256 = "3f897b303f446aa8b52832d2aef280d359979bb2cd8768a2e70b6475adc64d61";
-  };
-  sqlalchemy05 = args: with args; fetchurl { # Fri Jun 26 00:00:40 CEST 2009
-    url = "http://mawercer.de/~nix/repos/sqlalchemy05-6076.tar.gz";
-    sha256 = "7baad2cda5a61bcbc4093a6026727d69bc7bd7c0399e25e479eaa2e2000f69b1";
-  };
-  sqlalchemyMigrate = args: with args; fetchurl { # Fri Jun 26 00:22:43 CEST 2009
-    url = "http://mawercer.de/~nix/repos/sqlalchemyMigrate-569.tar.gz";
-    sha256 = "7775d9bf7e25a8270ac112d9b1d916a36691a73beb9a87a6473d005d3ee0f0bf";
-  };
-  ghc_syb = args: with args; fetchurl { # Thu Jul  9 23:41:34 CEST 2009
-    url = "http://mawercer.de/~nix/repos/ghc_syb-876b121e73f1b5ca4b17b0c6908b27ba7efb0374.tar.gz";
-    sha256 = "325a19962e90dc5fb07845d2ac4df6e332061cda4b8950b95bcb782706ed3e31";
-  };
-  pywebcvs = args: with args; fetchurl { # Wed Aug 12 15:00:25 CEST 2009
-    url = "http://mawercer.de/~nix/repos/pywebcvs-1493.tar.gz";
-    sha256 = "4183b18f48738cf607ef29baae75f7edec46504d1fb31bdedfbc897dcadbe599";
-  };
-  MPlayer = args: with args; fetchurl { # Sun Sep  6 16:46:45 CEST 2009
-    url = "http://mawercer.de/~nix/repos/MPlayer-29652.tar.gz";
-    sha256 = "c202a43041d753b78777c3bb22a60068626b8a8aaf59f1d2cd054844a7c8546b";
-  };
-  netsurf = args: with args; fetchurl { # Tue Oct 27 17:37:11 CET 2009
-    url = "http://mawercer.de/~nix/repos/netsurf-9654.tar.gz";
-    sha256 = "cf0cf1d6283e331174b5377cf0e458756987b99a8264807c567cc06ece501880";
-  };
-  libCSS = args: with args; fetchurl { # Tue Oct 27 17:35:11 CET 2009
-    url = "http://mawercer.de/~nix/repos/libCSS-9654.tar.gz";
-    sha256 = "a9ee85fcbba00543a634037f793f16ba1b8f02535fbfa6c2dfed074309ccc7a6";
-  };
-  libwapcaplet = args: with args; fetchurl { # Tue Oct 27 17:37:04 CET 2009
-    url = "http://mawercer.de/~nix/repos/libwapcaplet-9654.tar.gz";
-    sha256 = "471c13e0e5ac58c27e17261116401c3aba7760d3012ac878fe90a1c6cb5b3383";
-  };
-  libsvgtiny = args: with args; fetchurl { # Tue Oct 27 17:36:54 CET 2009
-    url = "http://mawercer.de/~nix/repos/libsvgtiny-9654.tar.gz";
-    sha256 = "250a1e1f7d53b3d211910edadf478147ae52c4c136a7763fb8df54cd7a296c2b";
-  };
-  libdom = args: with args; fetchurl { # Tue Oct 27 17:35:49 CET 2009
-    url = "http://mawercer.de/~nix/repos/libdom-9654.tar.gz";
-    sha256 = "31a002dcb68550d061c343eda146dd8578fc33121ee6f3a3c0920faaa28ee26e";
-  };
-  netsurf_haru = args: with args; fetchurl { # Tue Oct 27 17:38:50 CET 2009
-    url = "http://mawercer.de/~nix/repos/netsurf_haru-9654.tar.gz";
-    sha256 = "ca8fcdcbcb1e4007742d2214adf2eaa49829e988b6d9f0fe74108ca18e487d3b";
-  };
-  git_fast_export = args: with args; fetchurl { # Mon Oct 26 07:16:34 CET 2009
-    url = "http://mawercer.de/~nix/repos/git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz";
-    sha256 = "4d99bf7eefe86dd3305fc5ce27581830fc7dfe10f66ff5c5da054f737704b0bd";
-  };
-  haxe = args: with args; fetchurl { # Fri Nov 27 00:39:37 CET 2009
-    url = "http://mawercer.de/~nix/repos/haxe-F_00-39-37.tar.gz";
-    sha256 = "7c5f275568b1a5ce7b672bfad232696004e5b6607f3767bbfe8c32880d6583b1";
-  };
-  haxe_extc = args: with args; fetchurl { # Fri Nov 27 00:39:38 CET 2009
-    url = "http://mawercer.de/~nix/repos/haxe_extc-F_00-39-38.tar.gz";
-    sha256 = "78800c67ecc328fd5358ebdbf561189f40125238f3f35045eb8b5416e77fc115";
-  };
-  haxe_extlib_dev = args: with args; fetchurl { # Fri Nov 27 00:39:39 CET 2009
-    url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_00-39-39.tar.gz";
-    sha256 = "383044c91d39585e960c416b9c2eeaaa3f89613171662cb78dcb75fe6fe918b7";
-  };
-  haxe_neko_include = args: with args; fetchurl { # Fri Nov 27 00:39:40 CET 2009
-    url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_00-39-40.tar.gz";
-    sha256 = "efbb4ce93d01a649b2d32e46c4a0e1fb016d104a136cd428b8cc1704b4ab3dc7";
-  };
-  haxe_swflib = args: with args; fetchurl { # Fri Nov 27 00:39:45 CET 2009
-    url = "http://mawercer.de/~nix/repos/haxe_swflib-F_00-39-45.tar.gz";
-    sha256 = "05ae9c8006b2ffac91794c13db7189b5f21687a4afe0d1358fd3681be18705ba";
-  };
-  haxe_xml_light = args: with args; fetchurl { # Fri Nov 27 00:39:46 CET 2009
-    url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_00-39-46.tar.gz";
-    sha256 = "b23004c09d5e76b76de5a1938333c1aaccf059ebe62ad25728a267df79069a43";
-  };
-  neko = args: with args; fetchurl { # Fri Nov 27 18:37:43 CET 2009
-    url = "http://mawercer.de/~nix/repos/neko-F_18-37-40.tar.gz";
-    sha256 = "eac9c6144872d741c31a1c15539672b001977e877f30f01b9649f69b4df1d97c";
-  };
-}
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@ -4,8 +4,13 @@ args: with args;
 stdenv.mkDerivation {
  name = "lilypond-2.13.3";

-  #src = sourceByName "lilypond";
+  /*
+  # REGION AUTO UPDATE:    { name="lilypond"; type = "git"; url = "git://git.sv.gnu.org/lilypond.git"; }
+  src= sourceFromHead "lilypond-7d065cae414aac445a40c0c6646c3baf6f358cb3.tar.gz"
+               (throw "source not not published yet: lilypond");
+  # END
  #preConfigure = "./autogen.sh";
+  */

  src = fetchurl {
    url = http://download.linuxaudio.org/lilypond/sources/v2.13/lilypond-2.13.3.tar.gz;
--- a/pkgs/misc/source-and-tags/default.nix
+++ b/pkgs/misc/source-and-tags/default.nix
@ -24,17 +24,18 @@ args: with args; {
            TAG_FILE="$SRC_DEST/${a.name}$tagSuffix"
            echo running tag cmd "${a.tagCmd}" in `pwd`
            ${a.tagCmd}
-            TAG_FILES="$TAG_FILES\''${TAG_FILES:+:}$TAG_FILE"
+            TAG_FILES="$TAG_FILES''${TAG_FILES:+:}$TAG_FILE"
           '') createTagFiles );
      in ''
      SRC_DEST=$out/src/$name
      ensureDir $SRC_DEST
+      pwd; ls
      cp -r $srcDir $SRC_DEST
      cd $SRC_DEST
      ${createTags}

      ensureDir $out/nix-support
-      echo "TAG_FILES=\"\$TAG_FILES\\''${TAG_FILES:+:}$TAG_FILES\"" >> $out/nix-support/setup-hook
+      echo "TAG_FILES=\"\$TAG_FILES\''${TAG_FILES:+:}$TAG_FILES\"" >> $out/nix-support/setup-hook
    '';
  };
  # example usage
@ -51,7 +52,14 @@ args: with args; {
         createTagFiles = [
               { name = "${deriv.name}_haskell";
                 # tagCmd = "${toString ghcsAndLibs.ghc68.ghc}/bin/hasktags --ignore-close-implementation --ctags `find . -type f -name \"*.*hs\"`; sort tags > \$TAG_FILE"; }
-                 tagCmd = "${toString hasktags}/bin/hasktags-modified --ignore-close-implementation --ctags `find . -type f -name \"*.*hs\"`; sort tags > \$TAG_FILE"; }
+                 # *.*hs.* to catch gtk2hs .hs.pp files
+                 tagCmd = "
+                   srcs=\"`find . -type f -name \"*.*hs\"; find . -type f -name \"*.*hs.*\";`\"
+                   [ -z \"$srcs\" ] || {
+                    ${toString hasktags}/bin/hasktags-modified --ignore-close-implementation --ctags $srcs
+                    sort tags > \$TAG_FILE
+                   }";
+              }
          ];
       };
    };
--- a/pkgs/os-specific/linux/autofs/autofs-v5.nix
+++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix
@ -8,7 +8,10 @@ stdenv.mkDerivation {

  # It's too tiresome to apply all patches which are availible (see previous rev).
  # Using git repo which seems to be the same anyway..
-  src = bleedingEdgeRepos.sourceByName "autofs";
+  # REGION AUTO UPDATE:   { name="autofs"; type="git"; url="http://ftp.riken.go.jp/Linux/kernel.org/scm/linux/storage/autofs/autofs.git"; }
+  src = sourceFromHead "autofs-9a77464b8a661d33a6205756955e0047727d5c1f.tar.gz"
+               (fetchurl { url = "http://mawercer.de/~nix/repos/autofs-9a77464b8a661d33a6205756955e0047727d5c1f.tar.gz"; sha256 = "405c769b87f8ec2116faaca021ae03bb69d0a996cd574493b4eede34cb587061"; });
+  # END
  /*fetchurl {
    url = "${baseURL}/autofs-5.0.4.tar.bz2";
    sha256 = "06ysv24jwhwvl8vbafy4jxcg9ps1iq5nrz2nyfm6c761rniy27v3";
--- a/pkgs/tools/cd-dvd/cdrkit/default.nix
+++ b/pkgs/tools/cd-dvd/cdrkit/default.nix
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {

  buildInputs = [cmake libcap zlib bzip2];

+  patches = [ ./include-path.patch ];
+
  postInstall = ''
    # file name compatibility with the old cdrecord (growisofs wants this name)
    ln -s $out/bin/genisoimage $out/bin/mkisofs
--- a/pkgs/tools/cd-dvd/cdrkit/include-path.patch
+++ b/pkgs/tools/cd-dvd/cdrkit/include-path.patch
@ -0,0 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 57edba6..d06b6d9 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1,3 +1,4 @@
+ PROJECT (cdrkit C)
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
+ SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
+ 
--- a/pkgs/tools/package-management/nix-repository-manager/default.nix
+++ b/pkgs/tools/package-management/nix-repository-manager/default.nix
@ -1,78 +0,0 @@
-{lib, bleedingEdgeRepos, writeText, ghcReal, getConfig, stdenv, writeScriptBin }:
-
-/* usage
-   see pkgs/development/misc/bleeding-edge-repos/default.nix [1]
-   and pkgs/misc/bleeding-edge-fetch-infos.nix
-
-   Either add repository definitions which can be used by sourceByName "foo"
-   to [1] or config.nix. Example:
-
-   bleedingEdgeRepos = {
-     useLocalRepos = true; # prefer local dist file if availible
-
-     repos = {
-        # the attr names are equal to the repo IDs [2]
-        getOptions = { type="darcs"; url="http://repetae.net/john/repos/GetOptions"; };
-        nobug = { type = "git"; url="git://git.pipapo.org/nobug"; };
-        anyterm = { type = "svn"; url="http://svn.anyterm.org/anyterm/tags/releases/1.1/1.1.25/"; };
-        gnash = { type = "cvs"; cvsRoot=":pserver:anonymous@cvs.sv.gnu.org:/sources/gnash"; module="gnash"; };
-        octave = { type = "hg"; url="http://www.octave.org/hg/octave"; groups="octave_group"; };
-     };
-   };
-
-
-   to fetch / update the repository given by ID [2] use:
-   $ run-nix-repository-manager-with-config [$PATH_TO_NIXPKGS] --update ID
-   This will also calculate the current hash of the dist file which will be
-   saved to $PATH_TO_NIXPKGS/pkgs/misc/bleeding-edge-fetch-infos.nix.
-
-   Distribute the dist file which is stored in ~/managed_repos/dist using
-   $ run-nix-repository-manager-with-config --publish ID
-   this will upload the file to my server. Contact MarcWeber to get login data.
-   It should be easy to add multiple mirror locations instead (?)
-
-   You can add groups="xorg"; as seen above to update / distribute all
-   packages belonging to that group.
-*/
-
-let
-  inherit (builtins) getAttr attrNames;
-  inherit (lib) concatStringsSep mapAttrsFlatten;
-  toConfigLine = name : set : 
-    "[(\"name\",\"${name}\")," + ( concatStringsSep "," (map (a: "(\"${a}\",\"${getAttr a set}\")" ) (attrNames set)))+"]";
-  config = writeText "nix-repository-manager_config"
-        (bleedingEdgeRepos.managedRepoDir+"\n" +
-        concatStringsSep "\n" (mapAttrsFlatten toConfigLine (bleedingEdgeRepos.repos)));
-
-  cfg = getConfig ["nixRepositoryManager" ] {};
-
-  provideSource = if (builtins.hasAttr "sourcefile" cfg) then
-     "cp ${cfg.sourcefile} source.hs "
-    else ''
-      src="${bleedingEdgeRepos.sourceByName "nix_repository_manager"}"
-      unpackPhase
-      mv nix_repsoitory_manager_tmp_dir/nix-repository-manager.hs source.hs
-    '';
-
-  nixRepositoryManager = stdenv.mkDerivation {
-    name = "nix-repository-manager";
-
-    phases="buildPhase";
-    buildPhase = ''
-      ${provideSource}
-      ensureDir $out/bin
-      ghc --make source.hs -o $out/bin/nix-repository-manager
-    '';
-
-    buildInputs = [ ghcReal ];
-
-    meta = { 
-        description = "makes it easy to keep some packages up to date";
-        license = "GPL";
-    };
-  };
-in writeScriptBin "run-nix-repository-manager-with-config" 
-''
-#!/bin/sh
-exec ${nixRepositoryManager}/bin/nix-repository-manager ${config} $@
-''
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@ -7,4 +7,9 @@ stdenv.mkDerivation {
    sha256 = "1xvgqzdb2rw6j4ss65k4hrzrbsl74p7k5l4qgf5dbfcw522kw7lb";
  };
  buildInputs = [libjpeg libX11];
+  patches = [ ( fetchurl {
+      url = "http://bugs.gentoo.org/attachment.cgi?id=145622";
+      sha256 = "0c3bdrkr0qsrd3jybzz84z9gs4bq90rvxg87ffw08149v5qjz7a1";
+      name = "patch.patch";
+  } ) ]; # from gentoo. Don't know why it broke. Make it compile again.
 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1807,6 +1807,7 @@ let
  });

  gcc44 = useFromStdenv "gcc" gcc44_real;
+  gcc44_wrapper2 = wrapGCC2 gcc44.gcc;

  gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) {
    inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
@ -1947,11 +1948,13 @@ let

  #ghc = haskellPackages.ghc;

+  /*
  ghc642Binary = lowPrio (import ../development/compilers/ghc/6.4.2-binary.nix {
    inherit fetchurl stdenv ncurses gmp;
-    readline = if stdenv.system == "i686-linux" then readline4 else readline;
+    readline = if stdenv.system == "i686-linux" then readline4 else readline5;
    perl = perl58;
  });
+  */

  ghc6101Binary = lowPrio (import ../development/compilers/ghc/6.10.1-binary.nix {
    inherit fetchurl stdenv perl ncurses gmp libedit;
@ -1966,6 +1969,7 @@ let

  haskellPackages = haskellPackages_ghc6104;

+  /*
  haskellPackages_ghc642 = import ./haskell-packages.nix {
    inherit pkgs;
    ghc = import ../development/compilers/ghc/6.4.2.nix {
@ -1985,7 +1989,8 @@ let
  haskellPackages_ghc682 = import ./haskell-packages.nix {
    inherit pkgs;
    ghc = import ../development/compilers/ghc/6.8.2.nix {
-      inherit fetchurl stdenv readline perl gmp ncurses m4;
+      inherit fetchurl stdenv perl gmp ncurses m4;
+      readline = readline5;
      ghc = ghc642Binary;
    };
  };
@ -2004,6 +2009,7 @@ let
      };
    };
  });
+  */

  haskellPackages_ghc6101 = import ./haskell-packages.nix {
    inherit pkgs;
@ -2055,8 +2061,7 @@ let
  };

  haxe = import ../development/compilers/haxe {
-    inherit fetchurl stdenv lib ocaml zlib makeWrapper;
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper;
  };

  falcon = builderDefsPackage (import ../development/interpreters/falcon) {
@ -2166,9 +2171,8 @@ let
  };

  neko = import ../development/compilers/neko {
-    inherit (bleedingEdgeRepos) sourceByName ;
-    inherit fetchurl stdenv lib pkgconfig composableDerivation boehmgc apacheHttpd
-      mysql zlib sqlite pcre apr makeWrapper;
+    inherit sourceFromHead fetchurl stdenv lib pkgconfig composableDerivation
+      boehmgc apacheHttpd mysql zlib sqlite pcre apr makeWrapper;
    inherit (gtkLibs) gtk;
  };

@ -2279,6 +2283,7 @@ let
  };

  wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc;
+  wrapGCC2 = wrapGCCWith (import ../build-support/gcc-wrapper2) glibc;

  wrapGCCCross =
    {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}:
@ -2376,12 +2381,11 @@ let

  # mercurial (hg) bleeding edge version
  octaveHG = import ../development/interpreters/octave/hg.nix {
-    inherit fetchurl readline ncurses perl flex atlas getConfig glibc qhull gfortran;
+    inherit fetchurl sourceFromHead readline ncurses perl flex atlas getConfig glibc qhull gfortran;
    inherit automake autoconf bison gperf lib python gnuplot texinfo texLive; # for dev Version
    inherit stdenv;
    inherit (xlibs) libX11;
    #stdenv = overrideGCC stdenv gcc40;
-    inherit (bleedingEdgeRepos) sourceByName;
  };

  perl58 = import ../development/interpreters/perl-5.8 {
@ -2419,6 +2423,10 @@ let
      libXt;
  };

+  polyml = import ../development/compilers/polyml {
+    inherit stdenv fetchurl;
+  };
+
  python = if getConfig ["python" "full"] false then pythonFull else pythonBase;
  python25 = if getConfig ["python" "full"] false then python25Full else python25Base;
  pythonBase = python25Base;
@ -2560,8 +2568,8 @@ let
  };
  */

-  bleedingEdgeRepos = import ../development/misc/bleeding-edge-repos {
-    inherit getConfig fetchurl lib;
+  sourceFromHead = import ../build-support/source-from-head-fun.nix {
+    inherit getConfig;
  };

  ecj = import ../development/eclipse/ecj {
@ -2709,7 +2717,7 @@ let
  };

  ctags = import ../development/tools/misc/ctags {
-    inherit fetchurl stdenv bleedingEdgeRepos automake autoconf;
+    inherit fetchurl sourceFromHead stdenv automake autoconf;
  };

  ctagsWrapped = import ../development/tools/misc/ctags/wrapped.nix {
@ -2720,6 +2728,10 @@ let
    inherit fetchurl stdenv replace ncurses;
  };

+  coccinelle = import ../development/tools/misc/coccinelle {
+    inherit fetchurl stdenv perl python ocaml ncurses makeWrapper;
+  };
+
  cproto = import ../development/tools/misc/cproto {
    inherit fetchurl stdenv flex bison;
  };
@ -2838,14 +2850,6 @@ let
    inherit (gtkLibs) gtk;
  };

-  /*
-  hsc2hs = import ../development/tools/misc/hsc2hs {
-    inherit bleedingEdgeRepos stdenv;
-    ghc = ghcsAndLibs.ghc68.ghc;
-    libs = with (ghc68extraLibs ghcsAndLibs.ghc68 // ghcsAndLibs.ghc68.core_libs); [ base directory process cabal_darcs ];
-  };
-  */
-
  guileLint = import ../development/tools/guile/guile-lint {
    inherit fetchurl stdenv guile;
  };
@ -4353,7 +4357,8 @@ let
  };

  openal = import ../development/libraries/openal {
-    inherit fetchurl stdenv cmake alsaLib;
+    inherit fetchurl cmake alsaLib;
+    stdenv = overrideGCC stdenv gcc43_wrapper2;
  };

  # added because I hope that it has been easier to compile on x86 (for blender)
@ -5268,7 +5273,7 @@ let
  ### OS-SPECIFIC

  autofs5 = import ../os-specific/linux/autofs/autofs-v5.nix {
-    inherit bleedingEdgeRepos fetchurl stdenv flex bison kernelHeaders;
+    inherit sourceFromHead fetchurl stdenv flex bison kernelHeaders;
  };

  _915resolution = import ../os-specific/linux/915resolution {
@ -6382,12 +6387,14 @@ let
  };

  autopanosiftc = import ../applications/graphics/autopanosiftc {
-    inherit fetchurl stdenv cmake libpng libtiff libjpeg panotools libxml2;
+    inherit fetchurl cmake libpng libtiff libjpeg panotools libxml2;
+    stdenv = overrideGCC stdenv gcc43_wrapper2;
  };

  avidemux = import ../applications/video/avidemux {
-    inherit fetchurl stdenv cmake pkgconfig libxml2 qt4 gettext SDL libxslt x264
+    inherit fetchurl cmake pkgconfig libxml2 qt4 gettext SDL libxslt x264
      alsaLib lame faac faad2 libvorbis;
+    stdenv = overrideGCC stdenv gcc43_wrapper2;
    inherit (gtkLibs) gtk;
    inherit (xlibs) libXv pixman libpthreadstubs libXau libXdmcp;
  };
@ -6408,7 +6415,6 @@ let
  beast = import ../applications/audio/beast {
 # stdenv = overrideGCC stdenv gcc34;
    inherit stdenv fetchurl zlib guile pkgconfig intltool libogg libvorbis python libxml2 bash perl gettext;
-    inherit (bleedingEdgeRepos) sourceByName;
    inherit (gtkLibs) gtk glib;
    inherit (gnome) libgnomecanvas libart_lgpl;
    inherit automake autoconf;
@ -6509,7 +6515,7 @@ let


  cinelerra = import ../applications/video/cinelerra {
-    inherit fetchurl stdenv
+    inherit lib fetchurl sourceFromHead stdenv
      automake autoconf libtool
      a52dec alsaLib   lame libavc1394 libiec61883 libraw1394 libsndfile
      libvorbis libogg libjpeg libtiff freetype mjpegtools x264
@ -6517,8 +6523,7 @@ let
      pkgconfig;
      openexr = openexr_1_6_1;
    fftw = fftwSinglePrec;
-    inherit (xorg) libXxf86vm libXv;
-    inherit (bleedingEdgeRepos) sourceByName;
+    inherit (xorg) libXxf86vm libXv libXi libX11 xextproto;
    inherit (gnome) esound;
  };

@ -6774,6 +6779,10 @@ let
      inherit fetchurl stdenv;
    };

+    proofgeneral = import ../applications/editors/emacs-modes/proofgeneral {
+       inherit stdenv fetchurl emacs perl;
+    };
+
    quack = import ../applications/editors/emacs-modes/quack {
      inherit fetchurl stdenv emacs;
    };
@ -6916,7 +6925,8 @@ let
  };

  freepv = import ../applications/graphics/freepv {
-    inherit fetchurl stdenv mesa freeglut libjpeg zlib cmake libxml2 libpng;
+    inherit fetchurl mesa freeglut libjpeg zlib cmake libxml2 libpng;
+    stdenv = overrideGCC stdenv gcc43_wrapper2;
    inherit (xlibs) libX11 libXxf86vm;
  };

@ -7066,10 +7076,11 @@ let
  };

  hugin = import ../applications/graphics/hugin {
-    inherit stdenv fetchurl cmake panotools libtiff libpng boost pkgconfig
+    inherit fetchurl cmake panotools libtiff libpng boost pkgconfig
      exiv2 gettext ilmbase enblendenfuse autopanosiftc;
    inherit wxGTK;
    openexr = openexr_1_6_1;
+    stdenv = overrideGCC stdenv gcc43_wrapper2;
  };

  i810switch = import ../applications/misc/i810 {
@ -7344,9 +7355,8 @@ let
    };

  MPlayerTrunk = import ../applications/video/MPlayer/trunk.nix {
-    inherit (bleedingEdgeRepos) sourceByName;
-    inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav
-      cdparanoia mesa pkgconfig jackaudio;
+    inherit fetchurl sourceFromHead stdenv freetype x11 zlib libtheora libcaca
+      freefont_ttf libdvdnav cdparanoia mesa pkgconfig jackaudio;
    inherit (xlibs) libX11 libXv libXinerama libXrandr;
    alsaSupport = true;
    alsa = alsaLib;
@ -7433,7 +7443,8 @@ let
  };

  paraview = import ../applications/graphics/paraview {
-    inherit fetchurl stdenv cmake qt4;
+    inherit fetchurl cmake qt4;
+    stdenv = overrideGCC stdenv gcc43_wrapper2;
  };

  partitionManager = import ../tools/misc/partition-manager {
@ -7634,7 +7645,7 @@ let

  # linux only by now
  synergy = import ../applications/misc/synergy {
-    inherit fetchurl bleedingEdgeRepos stdenv x11;
+    inherit fetchurl sourceFromHead stdenv x11;
    inherit (xlibs) xextproto libXtst inputproto libXi;
  };

@ -8319,6 +8330,10 @@ let
    camlp5 = camlp5_transitional;
  };

+  isabelle = import ../applications/science/logic/isabelle {
+    inherit (pkgs) stdenv fetchurl nettools perl polyml emacs emacsPackages;
+  };
+
  ssreflect = import ../applications/science/logic/ssreflect {
    inherit stdenv fetchurl ocaml coq;
    camlp5 = camlp5_transitional;
@ -8466,8 +8481,7 @@ let
  };

  lilypond = import ../misc/lilypond {
-    inherit (bleedingEdgeRepos) sourceByName;
-    inherit fetchurl stdenv lib automake autoconf
+    inherit fetchurl sourceFromHead stdenv lib automake autoconf
      ghostscript texinfo imagemagick texi2html guile python gettext
      perl bison pkgconfig texLive fontconfig freetype fontforge help2man;
    inherit (gtkLibs) pango;
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -4,6 +4,10 @@ let ghcReal = pkgs.lowPrio ghc; in

 rec {

+  # ==> You're looking for a package but can't find it? Get hack-nix.
+  # -> http://github.com/MarcWeber/hack-nix. Read its README file.
+  # You can install (almost) all packages from hackage easily.
+
  inherit ghcReal;

  # In the remainder, `ghc' refers to the wrapper.  This is because
@ -129,7 +133,8 @@ rec {
  };

  getOptions = import ../development/libraries/haskell/get-options {
-    inherit cabal mtl; inherit (pkgs.bleedingEdgeRepos) sourceByName;
+    inherit (pkgs) fetchurl sourceFromHead;
+    inherit cabal mtl;
  };

  ghcCore = import ../development/libraries/haskell/ghc-core {
@ -141,7 +146,8 @@ rec {
  };

  ghcSyb = import ../development/libraries/haskell/ghc-syb {
-    inherit cabal syb; inherit (pkgs.bleedingEdgeRepos) sourceByName;
+    inherit (pkgs) fetchurl sourceFromHead;
+    inherit cabal syb;
  };

  gitit = import ../development/libraries/haskell/gitit {
@ -744,11 +750,6 @@ rec {
    inherit (pkgs) stdenv fetchurl;
  };

-  nixRepositoryManager = import ../tools/package-management/nix-repository-manager {
-    inherit (pkgs) stdenv lib writeText writeScriptBin getConfig bleedingEdgeRepos ;
-    inherit ghcReal;
-  };
-
  # Games.

  LambdaHack = import ../games/LambdaHack {