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

9 files changed, 94 insertions, 168 deletions

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 8b69ecc72c5f1..0f1aeddf64bc8 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 10b1a85f71dc5..e229bd0db028c 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 a1c6af84e2bb0..a908ddc0fc884 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 40dca3402dcde..d47a063f63bb0 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 1a8df7a1bad58..1371f1719a3fd 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 bb193370d3e62..7c94a0f389dac 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 7ebdde347ffb0..0000000000000
--- 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 ffe4504407609..29384a1d1574b 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 cfa9e3b56f692..0000000000000
--- 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";
-  };
-}