removing old bleeding edge cruft replacing it by a niftier version using

source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

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

28 files changed, 210 insertions, 562 deletions

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 0493fe44631..eebbbe2edd2 100644
--- 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";
diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
index 53b42a4e661..e9e0d502c2d 100644
--- 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;
   };
 
 
diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix
index a99ccdc0ccc..883cf94b06f 100644
--- 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}";
diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix
index eff8e43fb74..67cd2eb45e4 100644
--- 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 = "b6ac015351e78c080b71bbe834eadee0d1cb2c6c4657c338be6cbf0f51d5f8a9"; });
+  # END
 
   installPhase = "make PREFIX=$out install";
   buildInputs = [pkgconfig libParserUtils libwapcaplet];
diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
index 11d81bacb12..a90e6fa193c 100644
--- 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];
diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
index d40051a28e9..c4e4a60fbd6 100644
--- 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 = [];
diff --git a/pkgs/applications/networking/browsers/netsurf/netsurf.nix b/pkgs/applications/networking/browsers/netsurf/netsurf.nix
index 9d91e674bb9..2d2253f43ef 100644
--- 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";
   /*
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a1e8cb903f6..1f5e78bca13 100644
--- 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;
   };
 
 }
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index 2c1b055f311..aa942f5e8d7 100644
--- 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]);
 
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-git.nix b/pkgs/applications/version-management/git-and-tools/git/git-git.nix
index 3a0e3aa9fa8..0e4efa26fd3 100644
--- 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}
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix
index b794b34052c..c3b3469ca1a 100644
--- 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
diff --git a/pkgs/applications/video/MPlayer/trunk.nix b/pkgs/applications/video/MPlayer/trunk.nix
index 785ffe727db..19da6d91b7c 100644
--- 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]
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 2029c98037f..7d8b2dca272 100644
--- 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";
   };
 }
diff --git a/pkgs/build-support/source-from-head-fun.nix b/pkgs/build-support/source-from-head-fun.nix
new file mode 100644
index 00000000000..3281cec5444
--- /dev/null
+++ 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
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 8b69ecc72c5..0f1aeddf64b 100644
--- 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" \
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 10b1a85f71d..e229bd0db02 100644
--- 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}
diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix
index a1c6af84e2b..a908ddc0fc8 100644
--- 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 = ''
diff --git a/pkgs/development/interpreters/python-new/2.5/default.nix b/pkgs/development/interpreters/python-new/2.5/default.nix
index 40dca3402dc..d47a063f63b 100644
--- 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;
diff --git a/pkgs/development/libraries/haskell/get-options/default.nix b/pkgs/development/libraries/haskell/get-options/default.nix
index 1a8df7a1bad..1371f1719a3 100644
--- 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";
diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix
index bb193370d3e..7c94a0f389d 100644
--- 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";
diff --git a/pkgs/development/misc/bleeding-edge-repos/default.nix b/pkgs/development/misc/bleeding-edge-repos/default.nix
deleted file mode 100644
index 7ebdde347ff..00000000000
--- a/pkgs/development/misc/bleeding-edge-repos/default.nix
+++ /dev/null
@@ -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" ] {};
-}
diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix
index ffe45044076..29384a1d157 100644
--- 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
diff --git a/pkgs/development/tools/misc/hsc2hs/default.nix b/pkgs/development/tools/misc/hsc2hs/default.nix
deleted file mode 100644
index cfa9e3b56f6..00000000000
--- a/pkgs/development/tools/misc/hsc2hs/default.nix
+++ /dev/null
@@ -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";
-  };
-}
diff --git a/pkgs/misc/bleeding-edge-fetch-infos.nix b/pkgs/misc/bleeding-edge-fetch-infos.nix
deleted file mode 100644
index e1914d86311..00000000000
--- a/pkgs/misc/bleeding-edge-fetch-infos.nix
+++ /dev/null
@@ -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";
-  };
-}
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 358401238e5..29f2e0b3d73 100644
--- 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;
diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix
index e3c18a82a4e..592dc52f34c 100644
--- 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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 896dbc783c0..6fc9ac82aae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1995,8 +1995,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) {
@@ -2106,9 +2105,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;
   };
 
@@ -2307,12 +2305,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 {
@@ -2495,8 +2492,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 {
@@ -2639,7 +2636,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 {
@@ -2768,14 +2765,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;
   };
@@ -5143,7 +5132,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 {
@@ -6266,7 +6255,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;
@@ -6367,7 +6355,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
@@ -6375,8 +6363,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;
   };
 
@@ -7204,9 +7191,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;
@@ -7495,7 +7481,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;
   };
 
@@ -8325,8 +8311,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;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9421d5c53b6..f4bd96f99dc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -133,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 {
@@ -145,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 {