about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2008-08-06 16:56:05 +0000
committerMarc Weber <marco-oweber@gmx.de>2008-08-06 16:56:05 +0000
commitec717200c805f089fe3c08ca174f79b16d2b9249 (patch)
tree288f049a5c2c27f3abf8a1df3d23b07bd2591fdf /pkgs
parentdecf974c94bb6335dbb7f27748b93aa48728e17a (diff)
downloadnixlib-ec717200c805f089fe3c08ca174f79b16d2b9249.tar
nixlib-ec717200c805f089fe3c08ca174f79b16d2b9249.tar.gz
nixlib-ec717200c805f089fe3c08ca174f79b16d2b9249.tar.bz2
nixlib-ec717200c805f089fe3c08ca174f79b16d2b9249.tar.lz
nixlib-ec717200c805f089fe3c08ca174f79b16d2b9249.tar.xz
nixlib-ec717200c805f089fe3c08ca174f79b16d2b9249.tar.zst
nixlib-ec717200c805f089fe3c08ca174f79b16d2b9249.zip
ghc68extralibraries: tidied up, no longer many small files, nicer indentation (at least same level now)
svn path=/nixpkgs/trunk/; revision=12517
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/misc/bleeding-edge-repos/default.nix17
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/cabal.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/getOptions.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/ghc_lambdavm.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/git.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/happs_data.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/happs_hsp.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/happs_hsp_template.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/happs_ixset.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/happs_plugins.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/happs_server.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/happs_state.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/happs_util.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/haskell_src_exts.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/haskellnet.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hjavascript.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hjquery.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hjscript.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hsc2hs.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hsjava.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hsp.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hspCgi.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hsp_xml.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hsql.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hsutils.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/http.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/hypertable.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/libnih.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/mkcabal.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/nix_repository_manager.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/plugins.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/syb_with_class.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/synergy.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/takusen.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-info/upstart.nix3
-rw-r--r--pkgs/misc/bleeding-edge-fetch-infos.nix145
-rw-r--r--pkgs/misc/ghc68extraLibs/default.nix345
-rw-r--r--pkgs/misc/ghc68extraLibs/hsp-darcs.patch (renamed from pkgs/misc/ghc68extraLibs/hsp-darcs-patch)0
-rw-r--r--pkgs/misc/ghc68extraLibs/plugins-darcs.patch (renamed from pkgs/misc/ghc68extraLibs/plugins-darcs-patches)0
-rw-r--r--pkgs/tools/package-management/nixRepositoryManager/default.nix3
-rw-r--r--pkgs/top-level/all-packages.nix2
41 files changed, 313 insertions, 301 deletions
diff --git a/pkgs/development/misc/bleeding-edge-repos/default.nix b/pkgs/development/misc/bleeding-edge-repos/default.nix
index 0b3f782a96d5..506a6a329480 100644
--- a/pkgs/development/misc/bleeding-edge-repos/default.nix
+++ b/pkgs/development/misc/bleeding-edge-repos/default.nix
@@ -8,25 +8,18 @@ args:
     2) By importing                                           
         pkgs/misc/bleeding-edge-fetch-info/name.nix
         (generated by nixRepositoryManager --publish)
-    3) Fall back to fetch_xy given with information given by A) But
-      the sum wil propably be wrong..
-      (not everything is implemented now)
   */ 
 
   managedRepoDir = getConfig [ "bleedingEdgeRepos" "managedRepoDir" ] (builtins.getEnv "HOME" + "/managed_repos");
 
-  sourceByName = name : (
+  sourceByName = name :
     let localTarGZ = managedRepoDir+"/dist/${name}.tar.gz"; 
-        fetchUrlInfoFile = ../../../misc/bleeding-edge-fetch-info + "/${name}.nix"; in
+        fetchInfos = import ../../../misc/bleeding-edge-fetch-infos.nix; in
     if pathExists localTarGZ
     then localTarGZ
-    else if pathExists fetchUrlInfoFile
-         then (import fetchUrlInfoFile) { inherit fetchurl; }
-         else builtins.trace "warning, no bleeding edge source info (${fetchUrlInfoFile}) found for ${name}, hash will propably be wrong"
-               (let attr = __getAttr name repos;
-                 in if (attr.type == "darcs")
-                   then fetchdarcs2 { inherit (attr) url md5; }
-                   else throw "TODO") );
+    else if __hasAttr name fetchInfos
+         then (__getAttr name fetchInfos) { inherit fetchurl; }
+         else throw "warning, no bleeding edge source attribute found in bleeding-edge-fetch-infos.nix with name ${name}";
 
   repos = {
     # each repository has 
diff --git a/pkgs/misc/bleeding-edge-fetch-info/cabal.nix b/pkgs/misc/bleeding-edge-fetch-info/cabal.nix
deleted file mode 100644
index e3d8ad5df33e..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/cabal.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/cabal.tar.gz;
-  sha256 = "33bdbe8f0c213dcc28da88a2775f81f72e89209806e26b412699220c3db206ec";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/getOptions.nix b/pkgs/misc/bleeding-edge-fetch-info/getOptions.nix
deleted file mode 100644
index a4a7c360e9b0..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/getOptions.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/getOptions.tar.gz;
-  sha256 = "6475f2e5762cee2b8544d051c2b831ed5bd22a5711eca86fd6e0f0e95ac8b8b0";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/ghc_lambdavm.nix b/pkgs/misc/bleeding-edge-fetch-info/ghc_lambdavm.nix
deleted file mode 100644
index e7ec63931707..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/ghc_lambdavm.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/ghc_lambdavm.tar.gz;
-  sha256 = "3d10e839b8226987383e870258ff38b56442ff254688f7c50983850676f992cb";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/git.nix b/pkgs/misc/bleeding-edge-fetch-info/git.nix
deleted file mode 100644
index e6a18a7b6a52..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/git.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/git.tar.gz;
-  sha256 = "1f0df3da8d6c9425ab80bd9c623570b7a35e5a622fbf56b903e1bf82a01d4e5f";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/happs_data.nix b/pkgs/misc/bleeding-edge-fetch-info/happs_data.nix
deleted file mode 100644
index 964e8b4f5b5f..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/happs_data.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/happs_data.tar.gz;
-  sha256 = "26aec1571b1c1e69bf5a79fa6b3346e7493e3a4e00efe4c23a57b04e35e8d5a3";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/happs_hsp.nix b/pkgs/misc/bleeding-edge-fetch-info/happs_hsp.nix
deleted file mode 100644
index 9cea2e0b3659..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/happs_hsp.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/happs_hsp.tar.gz;
-  sha256 = "cc4df8509468ec83e3f448bb1e1fe5cb7e1f2408851861df31f139778e3c8cc8";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/happs_hsp_template.nix b/pkgs/misc/bleeding-edge-fetch-info/happs_hsp_template.nix
deleted file mode 100644
index 3d99a1583524..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/happs_hsp_template.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/happs_hsp_template.tar.gz;
-  sha256 = "b41336352ab878c1342c872e82354de1853366ddaf3abeb213ccad073052c9ac";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/happs_ixset.nix b/pkgs/misc/bleeding-edge-fetch-info/happs_ixset.nix
deleted file mode 100644
index 5d4a4be4f167..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/happs_ixset.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/happs_ixset.tar.gz;
-  sha256 = "80c857775cccdff49c55f28be069b53e14653b2812808ef9b4456aa500431241";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/happs_plugins.nix b/pkgs/misc/bleeding-edge-fetch-info/happs_plugins.nix
deleted file mode 100644
index fc285b94b774..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/happs_plugins.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/happs_plugins.tar.gz;
-  sha256 = "ff4ec49f4fcfb835a92ef9ec12ef7d1644d21318ca32a064ba8b72ea083bc103";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/happs_server.nix b/pkgs/misc/bleeding-edge-fetch-info/happs_server.nix
deleted file mode 100644
index 00a98a3ae4a8..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/happs_server.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/happs_server.tar.gz;
-  sha256 = "76dbb45796c8795f93df39ea3a87cd9028eb4fcdbea1e3c611596298dbbc0f69";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/happs_state.nix b/pkgs/misc/bleeding-edge-fetch-info/happs_state.nix
deleted file mode 100644
index 188135c14f03..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/happs_state.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/happs_state.tar.gz;
-  sha256 = "d59f13b2cdcfbf412be0ee973c3824c2035b55c613f293ae98894dc8bd9de9f2";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/happs_util.nix b/pkgs/misc/bleeding-edge-fetch-info/happs_util.nix
deleted file mode 100644
index 5ceb76e6db57..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/happs_util.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/happs_util.tar.gz;
-  sha256 = "c5c5b363c79bba39ab7c30a6e7371fec9401e26dea4be82be1e4777acab5b965";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/haskell_src_exts.nix b/pkgs/misc/bleeding-edge-fetch-info/haskell_src_exts.nix
deleted file mode 100644
index ca109ff9421c..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/haskell_src_exts.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/haskell_src_exts.tar.gz;
-  sha256 = "6cb2214ee3a62083325c907e47979b5fdf6809ce0ef2cd400fba0219b3f42090";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/haskellnet.nix b/pkgs/misc/bleeding-edge-fetch-info/haskellnet.nix
deleted file mode 100644
index b5102f6d04d8..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/haskellnet.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/haskellnet.tar.gz;
-  sha256 = "fde6f79b09d6cfbc6021aed9fa54ed186715a6eaacd4634f07554d4d3777f70d";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hjavascript.nix b/pkgs/misc/bleeding-edge-fetch-info/hjavascript.nix
deleted file mode 100644
index 7e4ba331c2c0..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hjavascript.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hjavascript.tar.gz;
-  sha256 = "fcf76a344eda3afca9b87f8e8ae1d343953b1bdda5da062f887a47f7d5a3c0da";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hjquery.nix b/pkgs/misc/bleeding-edge-fetch-info/hjquery.nix
deleted file mode 100644
index 6a5581266666..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hjquery.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hjquery.tar.gz;
-  sha256 = "32691467d83acd73f733c695266fbeeb4978ee43f4380d3b3554350bfb7cbb0e";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hjscript.nix b/pkgs/misc/bleeding-edge-fetch-info/hjscript.nix
deleted file mode 100644
index 3b2ebbf6d941..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hjscript.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hjscript.tar.gz;
-  sha256 = "fba290645b5ada63030143137d653d34ca5874660e8ab31072a76a57933dfce2";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hsc2hs.nix b/pkgs/misc/bleeding-edge-fetch-info/hsc2hs.nix
deleted file mode 100644
index 8d0bdea1a9a1..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hsc2hs.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hsc2hs.tar.gz;
-  sha256 = "3179eba85e56f30250793dbb612ffb8ad869e37297a185c2e0fb29134afb73af";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hsjava.nix b/pkgs/misc/bleeding-edge-fetch-info/hsjava.nix
deleted file mode 100644
index b275c6bc1a19..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hsjava.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hsjava.tar.gz;
-  sha256 = "952839e53f63fc43c7c8a760bab97d150c504e148ebdd407be5e642661ed048f";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hsp.nix b/pkgs/misc/bleeding-edge-fetch-info/hsp.nix
deleted file mode 100644
index c089b287b249..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hsp.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hsp.tar.gz;
-  sha256 = "bfaf83e5eff20226f9602c7889462f86d176b673b1cf677c280aeabb6dd560a3";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hspCgi.nix b/pkgs/misc/bleeding-edge-fetch-info/hspCgi.nix
deleted file mode 100644
index 3511fcb6bb64..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hspCgi.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hspCgi.tar.gz;
-  sha256 = "87bd8cb7e3ccad0147c36ce7af0f3089684b739f4149376821e258445b83f7b6";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hsp_xml.nix b/pkgs/misc/bleeding-edge-fetch-info/hsp_xml.nix
deleted file mode 100644
index 455941de8402..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hsp_xml.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hsp_xml.tar.gz;
-  sha256 = "203efdd5ec3784be0b1580569e56f278e102c2275350934a3b2ee4850b7ee34f";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hsql.nix b/pkgs/misc/bleeding-edge-fetch-info/hsql.nix
deleted file mode 100644
index f8f7e494d583..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hsql.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hsql.tar.gz;
-  sha256 = "9856e6811a4fc78bf55a1c4bb08091075a343995696b7026a0ef0dae91abc99a";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hsutils.nix b/pkgs/misc/bleeding-edge-fetch-info/hsutils.nix
deleted file mode 100644
index 7f4d93f97ef2..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hsutils.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hsutils.tar.gz;
-  sha256 = "6d1cc9881fb2684016e52d3ab8e6666c5396da168eb298c3a549294668f6aa52";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/http.nix b/pkgs/misc/bleeding-edge-fetch-info/http.nix
deleted file mode 100644
index 4ef8410096d0..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/http.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/http.tar.gz;
-  sha256 = "3e463fa090c6a7ddb06e88b592b1788a216db7eaf9384850b6d462217ba5be62";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/hypertable.nix b/pkgs/misc/bleeding-edge-fetch-info/hypertable.nix
deleted file mode 100644
index 022c1d87e0a6..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/hypertable.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/hypertable.tar.gz;
-  sha256 = "d8a385def778d817415a6dd9d7ce10a60525c3c4a4d4dd8ec3bd8cfd359d2ab4";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/libnih.nix b/pkgs/misc/bleeding-edge-fetch-info/libnih.nix
deleted file mode 100644
index db92d6427352..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/libnih.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/libnih.tar.gz;
-  sha256 = "443c7af0363d1fb3b040d1903ff28cbd520c9f32634bff639263b8315b293acc";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/mkcabal.nix b/pkgs/misc/bleeding-edge-fetch-info/mkcabal.nix
deleted file mode 100644
index 16f530dd6025..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/mkcabal.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/mkcabal.tar.gz;
-  sha256 = "9f231756c36b46d29516ed327a320837194799a76de4833dc6a5c88e5ccd1658";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/nix_repository_manager.nix b/pkgs/misc/bleeding-edge-fetch-info/nix_repository_manager.nix
deleted file mode 100644
index 3a99365c32f7..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/nix_repository_manager.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/nix_repository_manager.tar.gz;
-  sha256 = "449065f8411c5628b9fe88445601558dfd9a5f87b1703df9465838ef0afb9d34";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/plugins.nix b/pkgs/misc/bleeding-edge-fetch-info/plugins.nix
deleted file mode 100644
index 0e28c8b04060..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/plugins.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/plugins.tar.gz;
-  sha256 = "33206e33258b64fbb077291cd1f5f20629c6129c5541c177e51074a3082f59fa";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/syb_with_class.nix b/pkgs/misc/bleeding-edge-fetch-info/syb_with_class.nix
deleted file mode 100644
index 97339411ee15..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/syb_with_class.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/syb_with_class.tar.gz;
-  sha256 = "6893a44c6831b3fd10587c275b82903d24b8a51409eead9ec2c530300f2e6542";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/synergy.nix b/pkgs/misc/bleeding-edge-fetch-info/synergy.nix
deleted file mode 100644
index a585e3bf5be7..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/synergy.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/synergy.tar.gz;
-  sha256 = "c86dde2f10e7071d823cff542ea6c98a7e29a45e4909034edbd7605caa775a47";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/takusen.nix b/pkgs/misc/bleeding-edge-fetch-info/takusen.nix
deleted file mode 100644
index b2550a44087e..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/takusen.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/takusen.tar.gz;
-  sha256 = "35f3dbededae1a8d3bf648b229cbaf983907ff762b80674a65505f13c44147df";}
diff --git a/pkgs/misc/bleeding-edge-fetch-info/upstart.nix b/pkgs/misc/bleeding-edge-fetch-info/upstart.nix
deleted file mode 100644
index 76bf354d20c2..000000000000
--- a/pkgs/misc/bleeding-edge-fetch-info/upstart.nix
+++ /dev/null
@@ -1,3 +0,0 @@
- args: with args; fetchurl { 
-  url = http://mawercer.de/~nix/repos/upstart.tar.gz;
-  sha256 = "3243857ce4e0cd0d6fe28dbdcaa294b5590befed79b54a306b40cb5c65b381db";}
diff --git a/pkgs/misc/bleeding-edge-fetch-infos.nix b/pkgs/misc/bleeding-edge-fetch-infos.nix
new file mode 100644
index 000000000000..1f2f5b26a2da
--- /dev/null
+++ b/pkgs/misc/bleeding-edge-fetch-infos.nix
@@ -0,0 +1,145 @@
+{ cabal = args: with args; fetchurl {
+    url = http://mawercer.de/~nix/repos/cabal.tar.gz;
+    sha256 = "33bdbe8f0c213dcc28da88a2775f81f72e89209806e26b412699220c3db206ec";
+  };
+  getOptions = args: with args; fetchurl {
+    url = http://mawercer.de/~nix/repos/getOptions.tar.gz;
+    sha256 = "6475f2e5762cee2b8544d051c2b831ed5bd22a5711eca86fd6e0f0e95ac8b8b0";
+  };
+  ghc_lambdavm = args: with args; fetchurl {
+    url = http://mawercer.de/~nix/repos/ghc_lambdavm.tar.gz;
+    sha256 = "3d10e839b8226987383e870258ff38b56442ff254688f7c50983850676f992cb";
+  };
+  git = args: with args; fetchurl {
+    url = http://mawercer.de/~nix/repos/git.tar.gz;
+    sha256 = "1f0df3da8d6c9425ab80bd9c623570b7a35e5a622fbf56b903e1bf82a01d4e5f";
+  };
+  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 {
+    url = http://mawercer.de/~nix/repos/http.tar.gz;
+    sha256 = "3e463fa090c6a7ddb06e88b592b1788a216db7eaf9384850b6d462217ba5be62";
+  };
+  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 {
+    url = http://mawercer.de/~nix/repos/nix_repository_manager.tar.gz;
+    sha256 = "449065f8411c5628b9fe88445601558dfd9a5f87b1703df9465838ef0afb9d34";
+  };
+  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 {
+    url = http://mawercer.de/~nix/repos/synergy.tar.gz;
+    sha256 = "c86dde2f10e7071d823cff542ea6c98a7e29a45e4909034edbd7605caa775a47";
+  };
+  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 {
+    url = http://mawercer.de/~nix/repos/haxml.tar.gz;
+    sha256 = "916bc2c4f3d24c0d99ac771f503a6c5eb96d98b656274ab358c7383c606d27f0";
+  };
+  haskell_src_exts = args: with args; fetchurl {
+    url = http://mawercer.de/~nix/repos/haskell_src_exts.tar.gz;
+    sha256 = "6cb2214ee3a62083325c907e47979b5fdf6809ce0ef2cd400fba0219b3f42090";
+  };
+}
diff --git a/pkgs/misc/ghc68extraLibs/default.nix b/pkgs/misc/ghc68extraLibs/default.nix
index 9d9d8fecb96c..f97e2b22fa23 100644
--- a/pkgs/misc/ghc68extraLibs/default.nix
+++ b/pkgs/misc/ghc68extraLibs/default.nix
@@ -1,4 +1,18 @@
-# contains libraries and maybe applications in the future. That's why I'm putting it into misc. Feel free to move it somewhere else
+/* hackish collection of ghc packages
+   this will be replaced in the future
+
+   A library is defined by this attribute set:
+   <attr name> = {
+     name =
+     src =
+     p_deps = [ x.<attr name> x.<attr name> ] # x = recursive list of packages defined here and the core packages shipping with ghc
+     srcDir = <subDir of source> # optional
+     pass = {
+      # stuff passed to the builder as is (used for patches most of the time
+     };
+    }
+*/
+
 
 # TODO use nix names (regexCompat instead of regex_compat)
 args : ghc: with args;
@@ -17,7 +31,7 @@ rec {
                                    sha256 = "2a9b70b92c96ef1aa3eaa3426e224c0994c24bfdaccbf2b673edef65ba3cffce"; };
                  inherit (bleedingEdgeRepos) sourceByName;
              in {
-          # ghc extra packages 
+          # ghc extra packages
           mtl     = { name="mtl-1.1.0.0";     srcDir="libraries/mtl";    p_deps=[ x.base ]; src = ghc.extra_src; };
           parsec  = { name="parsec-2.1.0.0";  srcDir="libraries/parsec"; p_deps=[ x.base ]; src = ghc.extra_src; };
           network = { name="network-2.1.0.0"; srcDir="libraries/network"; p_deps=[ x.base x.parsec3 x.haskell98 ];       src = ghc.extra_src; };
@@ -29,33 +43,22 @@ rec {
           quickcheck = { name="QuickCheck-1.1.0.0"; srcDir="libraries/QuickCheck"; p_deps=[x.base x.random]; src = ghc.extra_src; };
           tagsoup = { name = "tagsoup-0.4"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/tagsoup/0.4/tagsoup-0.4.tar.gz; sha256 = "0rdy303qaw63la1fhw1z8h6k8cs33f71955pwlzxyx0n45g58hc7";};  p_deps = [ x.base x.mtl x.network ]; };
           hxt = { name = "hxt-7.5"; src =fetchurl { url = http://hackage.haskell.org/packages/archive/hxt/7.5/hxt-7.5.tar.gz; sha256 ="00q6m90a4qm4d5cg1x9r6b7f0rszcf2y7ifzs9mvy9kmzfl5ga7n"; };  p_deps = [x.base x.haskell98 x.http_darcs x.hunit x.network x.parsec x.tagsoup ]; };
-          haskellnet = { name = "HaskellNet-0.2"; src = sourceByName "haskellnet"; p_deps = [ x.base x.haskell98 x.network x.crypto x.mtl x.parsec x.time x.haxml x.bytestring x.pretty x.array x.dataenc x.containers x.old_locale x.old_time ]; 
-             pass = { 
+          haskellnet = { name = "HaskellNet-0.2"; src = sourceByName "haskellnet"; p_deps = [ x.base x.haskell98 x.network x.crypto x.mtl x.parsec x.time x.haxml x.bytestring x.pretty x.array x.dataenc x.containers x.old_locale x.old_time ];
+             pass = {
                patchPhase = "
                  patch -p1 < \$patch
                  sed -i 's/mtl/mtl, bytestring, pretty, array, dataenc, containers, old-locale, old-time/' *.cabal
-                 "; 
-               patch= ./haskellnetPatch ; 
+                 ";
+               patch= ./haskellnetPatch ;
              };
           };
           dataenc = { name = "dataenc-0.10.2"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/dataenc/0.10.2/dataenc-0.10.2.tar.gz; sha256="1kl087994ajbwy65f24qjnz6wchlhmk5vkdw1506zzfbi5fr6x7r"; }; p_deps = [ x.base ]; };
           # other pacakges  (hackage etc)
           polyparse = { name = "polyparse-2.3"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/polyparse/1.1/polyparse-1.1.tar.gz; sha256 = "0mrrk3hhfrn68xn5y4jfg4ba0pa08bj05l007862vrxyyb4bksl7"; }; p_deps = [ x.base x.haskell98 ]; };
-          /*
-bash: HaXml: command not found
-marc@nixos: ~ ]$ nix-prefetch-url http://hackage.haskell.org/packages/archive/hexpat/0.2/hexpat-0.2.tar.gz
-######################################################################## 100.0%
-hash is 05pcrh1czs6s3d7wv3ygiwf40ilmkiiygb86m1as2w2vwk9mqm6q
-path is /nix/store/ikrbg8w0xxnbnggbvld5af2ib1bdpcfn-hexpat-0.2.tar.gz
-05pcrh1czs6s3d7wv3ygiwf40ilmkiiygb86m1as2w2vwk9mqm6q
-
-
-*/
-
           # plugins doesn't compile with recent cabal
           # plugins = { name="plugins-1.2"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/plugins/1.2/plugins-1.2.tar.gz; sha256 = "1v2b3p3d2d3ab8zlzad4i6yy3zmarvkd09r71yc237xx66s7i9s5"; }; p_deps = [ x.array x.base x.cabal_darcs x.containers x.directory x.ghc x.haskellSrc x.process x.random ]; };
-          plugins_darcs = { name="plugins-darcs"; src = sourceByName "plugins"; p_deps = [ x.array x.base x.cabal_darcs x.containers x.directory x.ghc x.haskellSrc x.process x.random ]; 
-              pass = { patches = ./plugins-darcs-patches; };
+          plugins_darcs = { name="plugins-darcs"; src = sourceByName "plugins"; p_deps = [ x.array x.base x.cabal_darcs x.containers x.directory x.ghc x.haskellSrc x.process x.random ];
+              pass = { patches = ./plugins-darcs.patch; };
           };
           hinotify = { name="hinitofy-0.2"; src = fetchurl{ url = http://hackage.haskell.org/packages/archive/hinotify/0.2/hinotify-0.2.tar.gz; sha256 = "1x9mnlqy8lsq3qy9d559kxwqlj32smr9an76nf5i4hj67vicw1al"; };  p_deps = [ x.base x.containers x.directory x.unix ]; };
           harp = { name="harp-0.2.1"; src = fetchurl{ url = http://hackage.haskell.org/packages/archive/harp/0.2.1/harp-0.2.1.tar.gz; sha256 = "865e8c229e1ff89297b4348be95d93c10e373b63b7910da1e6b3330b48b96b87"; };  p_deps = [x.base]; };
@@ -64,13 +67,13 @@ path is /nix/store/ikrbg8w0xxnbnggbvld5af2ib1bdpcfn-hexpat-0.2.tar.gz
           # haskell_src_exts_metaquote = { name = "haskell_src_exts_metaquote-darcs"; src = sourceByName "haskell_src_exts_metaquote"; p_deps = [ x.base x.mtl x.containers x.array x.pretty x.binary x.packaged_string ]; };
 
           # hint = { name="hint-0.1"; src = fetchurl { url = "http://hackage.haskell.org/packages/archive/hint/0.1/hint-0.1.tar.gz"; sha256 = "1adydl2la4lxxl6zz24lm4vbdrsi4bkpppzxhpkkmzsjhhkpf2f9"; }; p_deps = [ x.base x.ghc x.haskellSrc x.mtl ]; };
-          pcreLight = { name="pcre-light-0.3.1"; src= fetchurl { url = http://hackage.haskell.org/packages/archive/pcre-light/0.3.1/pcre-light-0.3.1.tar.gz; sha256 = "1h0qhfvqjcx59zkqhvsy7vw23l4444czg2z7b2lndy6cmkqc719m"; }; p_deps = [x.base x.bytestring pcre x.haskell98 ]; 
-            pass = { patchPhase = "                      
+          pcreLight = { name="pcre-light-0.3.1"; src= fetchurl { url = http://hackage.haskell.org/packages/archive/pcre-light/0.3.1/pcre-light-0.3.1.tar.gz; sha256 = "1h0qhfvqjcx59zkqhvsy7vw23l4444czg2z7b2lndy6cmkqc719m"; }; p_deps = [x.base x.bytestring pcre x.haskell98 ];
+            pass = { patchPhase = "
                   echo \"    extra-lib-dirs: ${pcre}/lib\" >> pcre-light.cabal
                   ";
           }; };
-          hsHaruPDF = { name = "HsHaruPDF-0.0.0"; src = fetchurl{url= "http://hackage.haskell.org/packages/archive/HsHaruPDF/0.0.0/HsHaruPDF-0.0.0.tar.gz"; sha256="1yifhxk1m3z2i7gaxgwlmk6cv2spbpx8fny4sn59ybca8wd9z7ps";}; p_deps = [ x.base x.haskell98 ]; 
-                        pass = { buildInputs = [ mysql zlib libpng ]; 
+          hsHaruPDF = { name = "HsHaruPDF-0.0.0"; src = fetchurl{url= "http://hackage.haskell.org/packages/archive/HsHaruPDF/0.0.0/HsHaruPDF-0.0.0.tar.gz"; sha256="1yifhxk1m3z2i7gaxgwlmk6cv2spbpx8fny4sn59ybca8wd9z7ps";}; p_deps = [ x.base x.haskell98 ];
+                        pass = { buildInputs = [ mysql zlib libpng ];
                           patchPhase = "
                             sed 's/include-dirs:.*/include-dirs: haru/'  -i HsHaruPDF.cabal
                             sed 's=extra-lib-dirs:.*=extra-lib-dirs: ${libpng}/lib ${zlib}/lib=' -i HsHaruPDF.cabal
@@ -104,11 +107,6 @@ path is /nix/store/ikrbg8w0xxnbnggbvld5af2ib1bdpcfn-hexpat-0.2.tar.gz
           tar = rec { name = "tar-0.1.1.1"; p_deps = [ x.base x.bytestring x.haskell98 x.binary x.unixCompat ];
                            src = fetchurl { url = "http://hackage.haskell.org/packages/archive/tar/0.1.1.1/tar-0.1.1.1.tar.gz";
                                         sha256 = "08ns56xxw6519q0f7fqdznhcwx5dj2rc531mivxdyja6lmmjcfcb"; };
-                    #pass = {
-                      #patchPhase = ''
-                        #echo      "  extra-lib-dirs: ${zlib}/lib" >> zlib.cabal
-                        #echo      "  include-dirs: ${zlib}/include" >> zlib.cabal'';
-               #}; 
           };
           zlib = rec { name = "zlib-0.4.0.4"; p_deps = [ x.base x.bytestring x.haskell98 ];
                            src = fetchurl { url = "http://hackage.haskell.org/packages/archive/zlib/0.4.0.4/zlib-0.4.0.4.tar.gz";
@@ -140,7 +138,7 @@ path is /nix/store/ikrbg8w0xxnbnggbvld5af2ib1bdpcfn-hexpat-0.2.tar.gz
                                      #sha256 = "0j2lkvg5c0x5gf2sy7zmmgrda0c3l73i9d6hyka2f15d5n1rfjc9"; };
                       #pass = { patchPhase = "
                                     #sed -e 's=build-depends:.*=build-depends: base, old-locale, old-time=' -i hsql.cabal
-                                    #echo \"extensions: 
+                                    #echo \"extensions:
                                     #ForeignFunctionInterface, TypeSynonymInstances, CPP, ExistentialQuantification, GeneralizedNewtypeDeriving, PatternSignatures, ScopedTypeVariables, Rank2Types, DeriveDataTypeable \" >> hsql.cabal
                                     #"; };
               #};
@@ -161,7 +159,7 @@ path is /nix/store/ikrbg8w0xxnbnggbvld5af2ib1bdpcfn-hexpat-0.2.tar.gz
           #                           sha256 = "180c8acp4p9hsl5h8ryhhli9mlqcmcfjqaxzr7sa074gpzq29vfc"; };
           #            pass = { patchPhase = "
           #                          sed -e 's=build-depends:.*=build-depends: base, old-locale, old-time=' -i hsql.cabal
-          #                          echo \"extensions: 
+          #                          echo \"extensions:
           #                          ForeignFunctionInterface, TypeSynonymInstances, CPP, ExistentialQuantification, GeneralizedNewtypeDeriving, PatternSignatures, ScopedTypeVariables, Rank2Types, DeriveDataTypeable \" >> hsql.cabal
           #                          "; };
           #    };
@@ -209,7 +207,7 @@ path is /nix/store/ikrbg8w0xxnbnggbvld5af2ib1bdpcfn-hexpat-0.2.tar.gz
                               };
           };
 
-          gtk2hs = rec { name = "gtk2hs-0.9.12.1"; p_deps = [ x.haskell98 x.mtl x.bytestring pkgconfig ] ++ (with gtkLibs; [ glib pango gtk gnome.glib gnome.gtksourceview]); 
+          gtk2hs = rec { name = "gtk2hs-0.9.12.1"; p_deps = [ x.haskell98 x.mtl x.bytestring pkgconfig ] ++ (with gtkLibs; [ glib pango gtk gnome.glib gnome.gtksourceview]);
                           src = fetchurl {
                             url = "http://downloads.sourceforge.net/gtk2hs/${name}.tar.gz";
                             sha256 = "110z6v9gzhg6nzlz5gs8aafmipbva6rc50b8z1jgq0k2g25hfy22"; };
@@ -233,7 +231,7 @@ path is /nix/store/ikrbg8w0xxnbnggbvld5af2ib1bdpcfn-hexpat-0.2.tar.gz
           };
 
           wxcore = rec {
-                         
+
                         name = "wxhaskel-${wxVersion}"; p_deps = [ x.haskell98 x.mtl x.bytestring x.parsec3 pkgconfig wxGTK  ] ++ (with gtkLibs; [ glib pango gtk gnome.glib]);
                         src = wxSrc;
                         pass = {
@@ -255,7 +253,7 @@ path is /nix/store/ikrbg8w0xxnbnggbvld5af2ib1bdpcfn-hexpat-0.2.tar.gz
                 #  TODO rempove pwd
                 pass = { patchPhase = "pwd; cp {,wx/}license.txt"; };
             };
-                  
+
           typecompose = { name="TypeCompose-0.4"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/TypeCompose/0.5/TypeCompose-0.5.tar.gz; sha256 = "0mzjvwjixkp0jxfzxjw1pq8k1sm61sb5y96fk07xm91nn4sgpaqj"; }; p_deps = [ x.base ]; };
           reactive = { name="reactive-0.5"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/reactive/0.5/reactive-0.5.tar.gz; sha256 = "1giv5p2nks4rw683bkmnjmdanpx8mgqi6dzj099cjbk93jag9581"; }; p_deps = [ x.base x.typecompose ]; };
           phooey = { name="phooey-2.0"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/phooey/2.0/phooey-2.0.tar.gz; sha256 = "1bb6cn2vk7b57gaxh863ymidb4l7ldiwcnpif790rd4bq44fwfvf"; }; p_deps = [ x.base x.typecompose x.reactive x.wx x.wxcore ]; };
@@ -269,193 +267,172 @@ path is /nix/store/ikrbg8w0xxnbnggbvld5af2ib1bdpcfn-hexpat-0.2.tar.gz
 
           deeparrow = { name = "DeepArrow-0.2"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/DeepArrow/0.2/DeepArrow-0.2.tar.gz; sha256 = "1rm55nryg2z4r5919da2cc3nq08cg0g9gf59qfzl50lfccq8x2wd"; }; p_deps = [ x.base x.mtl x.typecompose x.haskellSrc ]; };
           tv = { name = "TV-0.4"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/TV/0.4/TV-0.4.tar.gz; sha256 = "0hracvx6pydmqfkx9n906k0463b0qaxskis91kir63ivf91zwndp"; }; p_deps = [ x.base  x.typecompose x.deeparrow]; };
-          guitv = { name = "GuiTV-0.4"; src = fetchurl { url = http://darcs.haskell.org/packages/GuiTV/dist/GuiTV-0.4.tar.gz; sha256 = "15mndbxm83q0d8ci3vj51zwrmzl0f5i5yqv0caw05vlzfsr4ib5i";}; p_deps = [ x.base x.deeparrow x.typecompose x.phooey x.tv ]; }; 
+          guitv = { name = "GuiTV-0.4"; src = fetchurl { url = http://darcs.haskell.org/packages/GuiTV/dist/GuiTV-0.4.tar.gz; sha256 = "15mndbxm83q0d8ci3vj51zwrmzl0f5i5yqv0caw05vlzfsr4ib5i";}; p_deps = [ x.base x.deeparrow x.typecompose x.phooey x.tv ]; };
 
-          haskellSrc = { name = "haskell-src-1.0.1.1"; src = fetchurl { url = "http://hackage.haskell.org/packages/archive/haskell-src/1.0.1.1/haskell-src-1.0.1.1.tar.gz"; sha256 = "06kilrf7y5h6dxj57kwymr20zvdsq6zhchwn4wky12mrmzjxyj01"; }; p_deps = [ x.haskell98 x.base x.pretty x.array ]; 
+          haskellSrc = { name = "haskell-src-1.0.1.1"; src = fetchurl { url = "http://hackage.haskell.org/packages/archive/haskell-src/1.0.1.1/haskell-src-1.0.1.1.tar.gz"; sha256 = "06kilrf7y5h6dxj57kwymr20zvdsq6zhchwn4wky12mrmzjxyj01"; }; p_deps = [ x.haskell98 x.base x.pretty x.array ];
                       pass = { buildInputs = (with executables; [ happy alex ] ); };
                       };
-          haskellSrcExt = { name = "haskell-src-exts-0.3.3.tar.gz"; src = fetchurl  { url = "http://hackage.haskell.org/packages/archive/haskell-src-exts/0.3.3/haskell-src-exts-0.3.3.tar.gz"; sha256 = "0g9ibjj1k5k3mqfx5mp8pqr0zx53pp9dkf52r8cdv18bl8xhzbpx"; }; p_deps = [ x.base x.base x.array x.pretty ]; 
+          haskellSrcExt = { name = "haskell-src-exts-0.3.3.tar.gz"; src = fetchurl  { url = "http://hackage.haskell.org/packages/archive/haskell-src-exts/0.3.3/haskell-src-exts-0.3.3.tar.gz"; sha256 = "0g9ibjj1k5k3mqfx5mp8pqr0zx53pp9dkf52r8cdv18bl8xhzbpx"; }; p_deps = [ x.base x.base x.array x.pretty ];
                       pass = { buildInputs = (with executables; [ happy alex ] ); };
                     };
-          haskellSrcExtDarcs = { name = "haskell-src-exts-darcs"; src = sourceByName "haskell_src_exts"; p_deps = [ x.base x.base x.array x.pretty ]; 
+          haskellSrcExtDarcs = { name = "haskell-src-exts-darcs"; src = sourceByName "haskell_src_exts"; p_deps = [ x.base x.base x.array x.pretty ];
                       pass = { buildInputs = (with executables; [ happy alex ] ); };
                     };
 
-          # haskelldb 
-          haskelldb = { name = "haskelldb-0.10"; src = fetchurl  { url = "http://hackage.haskell.org/packages/archive/haskelldb/0.10/haskelldb-0.10.tar.gz"; sha256 = "1i4kgsgajr9cijg0a2c04rn1zqwiasfvdbvs8c5qm49vkbdzm7l5"; }; p_deps = [ x.base x.haskell98 x.mtl x.pretty x.old_time x.directory x.old_locale]; 
+          # haskelldb
+          haskelldb = { name = "haskelldb-0.10"; src = fetchurl  { url = "http://hackage.haskell.org/packages/archive/haskelldb/0.10/haskelldb-0.10.tar.gz"; sha256 = "1i4kgsgajr9cijg0a2c04rn1zqwiasfvdbvs8c5qm49vkbdzm7l5"; }; p_deps = [ x.base x.haskell98 x.mtl x.pretty x.old_time x.directory x.old_locale];
                     pass = { patchPhase = "sed -i 's/mtl/mtl, pretty, old-time, directory, old-locale/' haskelldb.cabal
                                             echo 'ghc-options: -O2 -fglasgow-exts -fallow-undecidable-instances' >> haskelldb.cabal"; };
           };
-            #hsql drivers
-
-          haskelldbHsql = { name= "haskelldb-hsql--0.10"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/haskelldb-hsql/0.10/haskelldb-hsql-0.10.tar.gz; sha256 = "0s3bjm080hzw23zjxr4412m81v408ll9y6gqb2yyw30n886ixzgh"; }; p_deps = [ x.base x.haskell98 x.mtl x.hsqlDarcs x.haskelldb x.old_time x.old_locale ]; 
-                    pass = { patchPhase = "sed -i 's/mtl/mtl, pretty, old-time, directory, old-locale/' haskelldb-hsql.cabal
-                                            echo 'ghc-options: -O2 -fglasgow-exts -fallow-undecidable-instances' >> haskelldb-hsql.cabal"; };
-                    };
-          haskelldbHsqlMysql = { name= "haskelldb-hsql-mysql-0.10"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/haskelldb-hsql-mysql/0.10/haskelldb-hsql-mysql-0.10.tar.gz; sha256 = "0nfgq0xn45rhwxr8jvawviqfhgvhqr56l7ki1d72605y34dfx7rw"; }; p_deps = [ x.base x.haskell98 x.mtl x.hsqlDarcs x.haskelldbHsql x.hsqlMysqlDarcs x.haskelldb ]; 
-          };
-
-
-          /*
-
-          haskelldb-hsql-postgresql-0.10.tar.gz
-          ######################################################################## 100.0%
-          hash is 00nva5hhaknm5via4c1p2wj7ibyn6q874f0c3izjb9dk7rivfvgv
-          path is /nix/store/9n86rzpn0c4zyb7wpilpfcpkfnq68fch-haskelldb-hsql-postgresql-0.10.tar.gz
-          00nva5hhaknm5via4c1p2wj7ibyn6q874f0c3izjb9dk7rivfvgv
-          */
-
+          #hsql drivers
+          haskelldbHsql = { name= "haskelldb-hsql--0.10"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/haskelldb-hsql/0.10/haskelldb-hsql-0.10.tar.gz; sha256 = "0s3bjm080hzw23zjxr4412m81v408ll9y6gqb2yyw30n886ixzgh"; }; p_deps = [ x.base x.haskell98 x.mtl x.hsqlDarcs x.haskelldb x.old_time x.old_locale ];
+                        pass = { patchPhase = "sed -i 's/mtl/mtl, pretty, old-time, directory, old-locale/' haskelldb-hsql.cabal
+                                                echo 'ghc-options: -O2 -fglasgow-exts -fallow-undecidable-instances' >> haskelldb-hsql.cabal"; };
+                        };
+          haskelldbHsqlMysql = { name= "haskelldb-hsql-mysql-0.10"; src = fetchurl { url = http://hackage.haskell.org/packages/archive/haskelldb-hsql-mysql/0.10/haskelldb-hsql-mysql-0.10.tar.gz; sha256 = "0nfgq0xn45rhwxr8jvawviqfhgvhqr56l7ki1d72605y34dfx7rw"; }; p_deps = [ x.base x.haskell98 x.mtl x.hsqlDarcs x.haskelldbHsql x.hsqlMysqlDarcs x.haskelldb ]; };
 
           getOptions = rec { name = "GetOptions"; p_deps = [ x.haskell98 x.base x.mtl ];
-                       src = sourceByName "getOptions";
-                 };
+                           src = sourceByName "getOptions";
+                     };
 
           # 1.13 is stable. There are more recent non stable versions
           haxml = rec { name = "HaXml-1.13.3"; p_deps = [ x.base x.rts x.directory x.process x.pretty x.containers x.filepath x.haskell98 ];
-                       src = fetchurl { url = "http://www.haskell.org/HaXml/${name}.tar.gz";
-                                        sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0"; };
-                 };
+                           src = fetchurl { url = "http://www.haskell.org/HaXml/${name}.tar.gz";
+                                            sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0"; };
+                     };
           haxml_darcs = { name = "HaXml-darcs"; p_deps = [ x.base x.rts x.directory x.process x.pretty x.containers x.filepath x.haskell98 x.polyparse x.bytestring ];
-                       src = sourceByName "haxml";
-                 };
+                           src = sourceByName "haxml";
+                     };
           xhtml = rec { name = "xhtml-3000.0.2.2"; p_deps = [ x.base ];
-                       src = fetchurl { url = "http://hackage.haskell.org/packages/archive/xhtml/3000.0.2.2/xhtml-3000.0.2.2.tar.gz";
-                                        sha256 = "112mbq26ksh7r22y09h0xvm347kba3p4ns12vj5498fqqj333878"; };
-                 };
+                           src = fetchurl { url = "http://hackage.haskell.org/packages/archive/xhtml/3000.0.2.2/xhtml-3000.0.2.2.tar.gz";
+                                            sha256 = "112mbq26ksh7r22y09h0xvm347kba3p4ns12vj5498fqqj333878"; };
+                     };
           html = rec { name = "html-1.0.1.1"; p_deps = [ x.base ];
-                       src = fetchurl { url = "http://hackage.haskell.org/packages/archive/html/1.0.1.1/html-1.0.1.1.tar.gz";
-                                        sha256 = "10fayfm18p83zlkr9ikxlqgnzxg1ckdqaqvz6wp1xj95fy3p6yl1"; };
-                 };
+                           src = fetchurl { url = "http://hackage.haskell.org/packages/archive/html/1.0.1.1/html-1.0.1.1.tar.gz";
+                                            sha256 = "10fayfm18p83zlkr9ikxlqgnzxg1ckdqaqvz6wp1xj95fy3p6yl1"; };
+                     };
           crypto = rec { name = "crypto-4.1.0"; p_deps = [ x.base x.array x.pretty x.quickcheck x.random x.hunit ];
-                       src = fetchurl { url = "http://hackage.haskell.org/packages/archive/Crypto/4.1.0/Crypto-4.1.0.tar.gz";
-                                        sha256 = "13rbpbn6p1da6qa9m6f7dmkzdkmpnx6jiyyndzaz99nzqlrwi109"; };
-                 };
+                           src = fetchurl { url = "http://hackage.haskell.org/packages/archive/Crypto/4.1.0/Crypto-4.1.0.tar.gz";
+                                            sha256 = "13rbpbn6p1da6qa9m6f7dmkzdkmpnx6jiyyndzaz99nzqlrwi109"; };
+                     };
           hslogger = rec { name = "hslogger-1.0.4"; p_deps = [ x.containers x.directory x.mtl x.network x.process];
-                       src = fetchurl { url = "http://hackage.haskell.org/packages/archive/hslogger/1.0.4/hslogger-1.0.4.tar.gz";
-                                        sha256 = "0kmz8xs1q41rg2xwk22fadyhxdg5mizhw0r4d74y43akkjwj96ar"; };
-                 };
+                           src = fetchurl { url = "http://hackage.haskell.org/packages/archive/hslogger/1.0.4/hslogger-1.0.4.tar.gz";
+                                            sha256 = "0kmz8xs1q41rg2xwk22fadyhxdg5mizhw0r4d74y43akkjwj96ar"; };
+                     };
           parsep = { name = "parsep-0.1"; p_deps = [ x.base x.mtl x.bytestring ];
-                         src = fetchurl { url = "http://twan.home.fmf.nl/parsep/parsep-0.1.tar.gz";
-                                        sha256 = "1y5pbs5mzaa21127cixsamahlbvmqzyhzpwh6x0nznsgmg2dpc9q"; };
-                         pass = { patchPhase = "sed -i 's/fps/bytestring/' *.cabal"; };
-                 };
+                             src = fetchurl { url = "http://twan.home.fmf.nl/parsep/parsep-0.1.tar.gz";
+                                            sha256 = "1y5pbs5mzaa21127cixsamahlbvmqzyhzpwh6x0nznsgmg2dpc9q"; };
+                             pass = { patchPhase = "sed -i 's/fps/bytestring/' *.cabal"; };
+                     };
           time = { name = "time-1.1.2.0"; p_deps = [ x.base x.old_locale ];
-                         src = fetchurl { url = "http://hackage.haskell.org/packages/archive/time/1.1.2.0/time-1.1.2.0.tar.gz";
-                                        sha256 = "0zm4qqczwbqzy2pk7wz5p1virgylwyzd9zxp0406s5zvp35gvl89"; };
-                  };
+                             src = fetchurl { url = "http://hackage.haskell.org/packages/archive/time/1.1.2.0/time-1.1.2.0.tar.gz";
+                                            sha256 = "0zm4qqczwbqzy2pk7wz5p1virgylwyzd9zxp0406s5zvp35gvl89"; };
+                      };
           rjson = { name = "RJson-0.3.3"; p_deps = [ x.base x.mtl x.parsec3 x.bytestring x.iconv x.array x.containers x.syb_with_class_darcs ];
-                        src = fetchurl { url = http://hackage.haskell.org/packages/archive/RJson/0.3.3/RJson-0.3.3.tar.gz;
-                                        sha256 = "0va1rbgjb8m3rij02318a31bi9gmy3zwyx5z12164c7iwafnd5v2"; };
-                  };
+                            src = fetchurl { url = http://hackage.haskell.org/packages/archive/RJson/0.3.3/RJson-0.3.3.tar.gz;
+                                            sha256 = "0va1rbgjb8m3rij02318a31bi9gmy3zwyx5z12164c7iwafnd5v2"; };
+                      };
           iconv = { name = "iconv-0.4"; p_deps = [ x.base x.bytestring ];
-                        src = fetchurl { url = http://hackage.haskell.org/packages/archive/iconv/0.4/iconv-0.4.tar.gz;
-                                        sha256 = "1snqzz7hi2qa83m5v3098rsldb485kz2jggd335qhvjahcp4bj1p"; };
-                  };
+                            src = fetchurl { url = http://hackage.haskell.org/packages/archive/iconv/0.4/iconv-0.4.tar.gz;
+                                            sha256 = "1snqzz7hi2qa83m5v3098rsldb485kz2jggd335qhvjahcp4bj1p"; };
+                      };
 
           utf8string = { name = "utf8-string-0.3"; p_deps = [ x.base x.bytestring ];
-                        src = fetchurl { url = http://hackage.haskell.org/packages/archive/utf8-string/0.3/utf8-string-0.3.tar.gz;
-                                        sha256 = "11mln2r0ym4y12zxizn6n40xbgsi6q4n6n810rcg94bv35gqgcby"; };
-                  };
+                            src = fetchurl { url = http://hackage.haskell.org/packages/archive/utf8-string/0.3/utf8-string-0.3.tar.gz;
+                                            sha256 = "11mln2r0ym4y12zxizn6n40xbgsi6q4n6n810rcg94bv35gqgcby"; };
+                      };
           x11 = { name = "x11-1.4.1"; p_deps = [ x.base x.haskell98 x.bytestring ] ++ (with xlibs; [ libX11 libXext ]);
-                        src = fetchurl { url = http://hackage.haskell.org/packages/archive/X11/1.4.1/X11-1.4.1.tar.gz;
-                                        sha256 = "0yczl1m7g3lggcxh56fy2br13kbk4c5vrkcc4w76ys0m2ia3h475"; };
-                  };
+                            src = fetchurl { url = http://hackage.haskell.org/packages/archive/X11/1.4.1/X11-1.4.1.tar.gz;
+                                            sha256 = "0yczl1m7g3lggcxh56fy2br13kbk4c5vrkcc4w76ys0m2ia3h475"; };
+                      };
           x11extras = { name = "X11-extras-0.4"; p_deps = [ x.base x.bytestring x.x11 xlibs.libXinerama ];
-                        src = fetchurl { url = http://hackage.haskell.org/packages/archive/X11-extras/0.4/X11-extras-0.4.tar.gz;
-                                        sha256 = "1cpjr09gddcjd0wqwvaankv1zj7fyc6hbfdvar63f51g3vvw627a"; };
-                  };
-          /*
+                            src = fetchurl { url = http://hackage.haskell.org/packages/archive/X11-extras/0.4/X11-extras-0.4.tar.gz;
+                                            sha256 = "1cpjr09gddcjd0wqwvaankv1zj7fyc6hbfdvar63f51g3vvw627a"; };
+                      };
+              /*
           x11xft = { name = "xft-0.2"; p_deps = [ x.base x.bytestring x.haskell98 x.x11 x.utf8string x.bytestring xlibs.libXft freetype];
-                        src = fetchurl { url = http://hackage.haskell.org/packages/archive/X11-xft/0.2/X11-xft-0.2.tar.gz;
-                                        sha256 = "1ahvpkgh5mr6v8gisv1sc9s4075hqh85cpqcqh1ylr6lkf7dz31w"; };
-                         pass = { 
-                            inherit freetype;
-                            patchPhase = "sed -i \"s=include-dirs:.*=include-dirs: $freetype/include=\" *.cabal"; };
-                  };
-          */
+                            src = fetchurl { url = http://hackage.haskell.org/packages/archive/X11-xft/0.2/X11-xft-0.2.tar.gz;
+                                            sha256 = "1ahvpkgh5mr6v8gisv1sc9s4075hqh85cpqcqh1ylr6lkf7dz31w"; };
+                             pass = {
+                                inherit freetype;
+                                patchPhase = "sed -i \"s=include-dirs:.*=include-dirs: $freetype/include=\" *.cabal"; };
+                      };
+              */
 
-        # HAPPS - Libraries
+          # HAPPS - Libraries
           http_darcs = { name="http-darcs"; p_deps = [x.network x.parsec3];
-                  src = sourceByName "http";
-                   #src = fetchdarcs { url = "http://darcs.haskell.org/http/"; md5 = "4475f858cf94f4551b77963d08d7257c"; };
-                 };
+                      src = sourceByName "http";
+                       #src = fetchdarcs { url = "http://darcs.haskell.org/http/"; md5 = "4475f858cf94f4551b77963d08d7257c"; };
+                     };
           syb_with_class_darcs = { name="syb-with-class-darcs"; p_deps = [x.template_haskell x.bytestring ];
-                   src =
-                    # fetchdarcs { url = "http://happs.org/HAppS/syb-with-class"; md5 = "b42336907f7bfef8bea73bc36282d6ac"; };
-                     sourceByName "syb_with_class"; # { url = "http://happs.org/HAppS/syb-with-class"; md5 = "b42336907f7bfef8bea73bc36282d6ac"; };
-                 };
+                       src =
+                        # fetchdarcs { url = "http://happs.org/HAppS/syb-with-class"; md5 = "b42336907f7bfef8bea73bc36282d6ac"; };
+                         sourceByName "syb_with_class"; # { url = "http://happs.org/HAppS/syb-with-class"; md5 = "b42336907f7bfef8bea73bc36282d6ac"; };
+                     };
 
-        happs_data_darcs = { name="HAppS-Data-darcs"; p_deps=[ x.base x.mtl x.template_haskell x.syb_with_class_darcs x.haxml x.happs_util_darcs x.regex_compat x.bytestring x.pretty x.binary ];
-                    src = sourceByName "happs_data"; # fetchdarcs { url = "http://happs.org/repos/HAppS-Data"; md5 = "10c505dd687e9dc999cb187090af9ba7"; };
-                    };
-        happs_util_darcs = { name="HAppS-Util-darcs"; p_deps=[ x.base x.mtl x.hslogger x.template_haskell x.array x.bytestring x.old_time x.process x.directory ];
-                    src = sourceByName "happs_util"; # fetchdarcs { url = "http://happs.org/repos/HAppS-Util"; md5 = "693cb79017e522031c307ee5e59fc250"; };
-                    };
-      
-        happs_state_darcs = { name="HAppS-State-darcs"; p_deps=[ x.base x.haxml
-                      x.mtl x.network x.stm x.template_haskell x.hslogger
-                        x.happs_util_darcs x.happs_data_darcs x.bytestring x.containers
-                        x.random x.old_time x.old_locale x.unix x.directory x.binary x.hspread ];
-                      src = sourceByName "happs_state";
-                      #src = fetchdarcs { url = "http://happs.org/repos/HAppS-State"; 
-                      #                   md5 = "956e5c293b60f4a98148fedc5fa38acc"; 
-                      #                 };
-                    };
+          happs_data_darcs = { name="HAppS-Data-darcs"; p_deps=[ x.base x.mtl x.template_haskell x.syb_with_class_darcs x.haxml x.happs_util_darcs x.regex_compat x.bytestring x.pretty x.binary ];
+                        src = sourceByName "happs_data"; # fetchdarcs { url = "http://happs.org/repos/HAppS-Data"; md5 = "10c505dd687e9dc999cb187090af9ba7"; };
+                        };
+          happs_util_darcs = { name="HAppS-Util-darcs"; p_deps=[ x.base x.mtl x.hslogger x.template_haskell x.array x.bytestring x.old_time x.process x.directory ];
+                        src = sourceByName "happs_util"; # fetchdarcs { url = "http://happs.org/repos/HAppS-Util"; md5 = "693cb79017e522031c307ee5e59fc250"; };
+                        };
+
+          happs_state_darcs = { name="HAppS-State-darcs"; p_deps=[ x.base x.haxml
+                          x.mtl x.network x.stm x.template_haskell x.hslogger
+                            x.happs_util_darcs x.happs_data_darcs x.bytestring x.containers
+                            x.random x.old_time x.old_locale x.unix x.directory x.binary x.hspread ];
+                          src = sourceByName "happs_state";
+                          #src = fetchdarcs { url = "http://happs.org/repos/HAppS-State";
+                          #                   md5 = "956e5c293b60f4a98148fedc5fa38acc";
+                          #                 };
+                        };
 
 
-      happs_hsp_darcs = { name="happs-hsp-darcs"; src=sourceByName "happs_hsp"; p_deps=[x.base x.mtl x.bytestring x.plugins_darcs x.happs_server_darcs x.hsp_darcs x.containers x.rjson x.directory x.hinotify x.filepath]; 
-        pass = { patches = ./hsp-darcs-patch; };
-      };
-      happs_hsp_template_darcs = { name="happs-hsp-template-darcs"; src=sourceByName "happs_hsp_template"; p_deps=[ x.base x.bytestring x.filepath x.directory x.mtl x.containers x.network x.hinotify x.plugins_darcs x.rjson x.happs_server_darcs x.hsp_darcs]; };
-      hsp_darcs = { name="hsp-darcs"; src=sourceByName "hsp"; p_deps=[x.base x.mtl x.harp x.hsx x.hjscript_darcs]; 
-            pass = { inherit (x) hsx; postUnpack=''PATH=$PATH:$hsx/usr/local/bin''; };
+          happs_hsp_darcs = { name="happs-hsp-darcs"; src=sourceByName "happs_hsp"; p_deps=[x.base x.mtl x.bytestring x.plugins_darcs x.happs_server_darcs x.hsp_darcs x.containers x.rjson x.directory x.hinotify x.filepath];
+            pass = { patches = ./hsp-darcs.patch; };
+          };
+          happs_hsp_template_darcs = { name="happs-hsp-template-darcs"; src=sourceByName "happs_hsp_template"; p_deps=[ x.base x.bytestring x.filepath x.directory x.mtl x.containers x.network x.hinotify x.plugins_darcs x.rjson x.happs_server_darcs x.hsp_darcs]; };
+          hsp_darcs = { name="hsp-darcs"; src=sourceByName "hsp"; p_deps=[x.base x.mtl x.harp x.hsx x.hjscript_darcs];
+                pass = { inherit (x) hsx; postUnpack=''PATH=$PATH:$hsx/usr/local/bin''; };
+                };
+          #hsp_xml_darcs = { name="hsp-xml-darcs"; src=sourceByName "hsp_xml"; p_deps=[x.base x.haskell98 x.hsp_darcs x.hsx x.mtl x.harp x.haxml_darcs];
+          #      pass = { inherit (x) hsx; postUnpack=''PATH=$PATH:$hsx/usr/local/bin''; };
+          #  };
+          hspCgi_darcs = { name="hsp-cgi-darcs"; src=sourceByName "hspCgi"; p_deps=[x.base x.hsp_darcs x.network x.containers x.harp];
+                pass = { inherit (x) hsx; postUnpack=''PATH=$PATH:$hsx/usr/local/bin''; };
+            };
+          hjscript_darcs = { name="hjscript-darcs"; src=sourceByName "hjscript"; p_deps=[x.base x.hjavascript_darcs x.mtl x.hsx]; };
+          hjquery_darcs = { name="hjquery-darcs"; src=sourceByName "hjquery"; p_deps=[x.base x.hjscript_darcs ]; };
+          hjavascript_darcs = { name="darcs"; src=sourceByName "hjavascript"; p_deps=[x.base x.pretty]; };
+
+           #happs_plugins_darcs = { name="HAppS-plugins-darcs"; p_deps=[ x.base x.mtl x.hslogger x.happs_util_darcs x.happs_data_darcs x.happs_state_darcs x.containers ];
+                       #src = bleedingEdgeRepos.sourceByName "happs_plugins";
+                       #};
+            # there is no .cabal yet
+            #happs_smtp_darcs = { name="HAppS-smtp-darcs"; p_deps=[];
+                        #src = fetchdarcs { url = "http://happs.org/repos/HAppS-smtp"; md5 = "5316917e271ea1ed8ad261080bcb47db"; };
+                        #};
+
+          happs_ixset_darcs = { name="HAppS-IxSet-darcs"; p_deps=[ x.base x.mtl
+                              x.hslogger x.happs_util_darcs x.happs_state_darcs x.happs_data_darcs
+                              x.template_haskell x.syb_with_class_darcs x.containers ];
+                        src = sourceByName "happs_ixset";
+                        };
+          happs_server_darcs = { name="HAppS-Server-darcs"; p_deps=[x.haxml x.parsec3 x.mtl
+                    x.network x.regex_compat x.hslogger x.happs_data_darcs
+                      x.happs_util_darcs x.happs_state_darcs x.happs_ixset_darcs x.http_darcs
+                      x.template_haskell x.xhtml x.html x.bytestring x.random
+                      x.containers x.old_time x.old_locale x.directory x.unix];
+                        #src = fetchdarcs { url = "http://happs.org/repos/HAppS-HTTP"; md5 = "e1bb17eb30a39d30b8c34dffbf80edc2"; };
+                        src = sourceByName "happs_server";
+                        };
+            # using darcs with minimal patch applied to support $GHC_PACKAGE_PATH
+           cabal_darcs =
+            { name=cabal_darcs_name; p_deps = with ghc.core_libs; [base rts directory process pretty containers filepath];
+                      src = sourceByName "cabal";
+              pass = { dummy = 2; };
             };
-      #hsp_xml_darcs = { name="hsp-xml-darcs"; src=sourceByName "hsp_xml"; p_deps=[x.base x.haskell98 x.hsp_darcs x.hsx x.mtl x.harp x.haxml_darcs];
-      #      pass = { inherit (x) hsx; postUnpack=''PATH=$PATH:$hsx/usr/local/bin''; };
-      #  };
-      hspCgi_darcs = { name="hsp-cgi-darcs"; src=sourceByName "hspCgi"; p_deps=[x.base x.hsp_darcs x.network x.containers x.harp]; 
-            pass = { inherit (x) hsx; postUnpack=''PATH=$PATH:$hsx/usr/local/bin''; };
-        };
-      hjscript_darcs = { name="hjscript-darcs"; src=sourceByName "hjscript"; p_deps=[x.base x.hjavascript_darcs x.mtl x.hsx]; };
-      hjquery_darcs = { name="hjquery-darcs"; src=sourceByName "hjquery"; p_deps=[x.base x.hjscript_darcs ]; };
-      hjavascript_darcs = { name="darcs"; src=sourceByName "hjavascript"; p_deps=[x.base x.pretty]; };
-
-       #happs_plugins_darcs = { name="HAppS-plugins-darcs"; p_deps=[ x.base x.mtl x.hslogger x.happs_util_darcs x.happs_data_darcs x.happs_state_darcs x.containers ];
-                   #src = bleedingEdgeRepos.sourceByName "happs_plugins";
-                   #};
-        # there is no .cabal yet 
-        #happs_smtp_darcs = { name="HAppS-smtp-darcs"; p_deps=[];
-                    #src = fetchdarcs { url = "http://happs.org/repos/HAppS-smtp"; md5 = "5316917e271ea1ed8ad261080bcb47db"; };
-                    #};
-
-        happs_ixset_darcs = { name="HAppS-IxSet-darcs"; p_deps=[ x.base x.mtl
-                          x.hslogger x.happs_util_darcs x.happs_state_darcs x.happs_data_darcs
-                          x.template_haskell x.syb_with_class_darcs x.containers ];
-                    src = sourceByName "happs_ixset";
-                    #src = fetchdarcs { url = "http://happs.org/repos/HAppS-IxSet"; 
-                                       #md5 = "fa6b24517f09aa16e972f087430967fd"; 
-                                       #tag = "0.9.2";
-                                        # no tag
-                                       #md5 = "fa6b24517f09aa16e972f087430967fd"; 
-                                     #};
-                    };
-        happs_server_darcs = { name="HAppS-Server-darcs"; p_deps=[x.haxml x.parsec3 x.mtl
-                x.network x.regex_compat x.hslogger x.happs_data_darcs
-                  x.happs_util_darcs x.happs_state_darcs x.happs_ixset_darcs x.http_darcs
-                  x.template_haskell x.xhtml x.html x.bytestring x.random
-                  x.containers x.old_time x.old_locale x.directory x.unix];
-                    #src = fetchdarcs { url = "http://happs.org/repos/HAppS-HTTP"; md5 = "e1bb17eb30a39d30b8c34dffbf80edc2"; };
-                    src = sourceByName "happs_server";
-                    };
-        # using darcs with minimal patch applied to support $GHC_PACKAGE_PATH
-        cabal_darcs = 
-        { name=cabal_darcs_name; p_deps = with ghc.core_libs; [base rts directory process pretty containers filepath];
-                  src = sourceByName "cabal";
-          pass = { dummy = 2; };
-        };
       } // (getConfig [ "ghc68CustomLibs" ] ( args: x : {} ) ) args x;
-      #srcs_only = let x = pkgs; in map (y : y.src ) [ x.happs_util_darcs x.happs_data_darcs x.syb_with_class_darcs x.http_darcs 
-      #          x.happs_server_darcs x.happs_ixset_darcs x.happs_plugins_darcs x.happs_server_darcs ];
       toDerivation = attrs : with attrs;
       # result is { mtl = <deriv>;
         addHasktagsTaggingInfo (ghcCabalDerivation {
@@ -463,9 +440,9 @@ path is /nix/store/ikrbg8w0xxnbnggbvld5af2ib1bdpcfn-hexpat-0.2.tar.gz
             useLocalPkgDB = attrs ? useLocalPkgDB;
             propagatedBuildInputs = p_deps ++ (lib.optional (attrs.name != cabal_darcs_name) derivations.cabal_darcs );
             srcDir = if attrs ? srcDir then attrs.srcDir else ".";
-            # add cabal, take deps either from this list or from ghc.core_libs 
+            # add cabal, take deps either from this list or from ghc.core_libs
             pass = if attrs ? pass then attrs.pass else {};
         });
-      derivations = with lib; builtins.listToAttrs (lib.concatLists ( lib.mapRecordFlatten 
+      derivations = with lib; builtins.listToAttrs (lib.concatLists ( lib.mapRecordFlatten
                 ( n : attrs : let d = (toDerivation attrs); in [ (nv n d) (nv attrs.name d) ] ) pkgs ) );
     }.derivations
diff --git a/pkgs/misc/ghc68extraLibs/hsp-darcs-patch b/pkgs/misc/ghc68extraLibs/hsp-darcs.patch
index 488d6ef2436a..488d6ef2436a 100644
--- a/pkgs/misc/ghc68extraLibs/hsp-darcs-patch
+++ b/pkgs/misc/ghc68extraLibs/hsp-darcs.patch
diff --git a/pkgs/misc/ghc68extraLibs/plugins-darcs-patches b/pkgs/misc/ghc68extraLibs/plugins-darcs.patch
index 8265012537b9..8265012537b9 100644
--- a/pkgs/misc/ghc68extraLibs/plugins-darcs-patches
+++ b/pkgs/misc/ghc68extraLibs/plugins-darcs.patch
diff --git a/pkgs/tools/package-management/nixRepositoryManager/default.nix b/pkgs/tools/package-management/nixRepositoryManager/default.nix
index 9ac25e39bf19..12f28c9bdecb 100644
--- a/pkgs/tools/package-management/nixRepositoryManager/default.nix
+++ b/pkgs/tools/package-management/nixRepositoryManager/default.nix
@@ -14,10 +14,8 @@ args: with args; with lib;
 let 
   toConfigLine = name : set : 
     "[(\"name\",\"${name}\")," + ( concatStringsSep "," (map (a: "(\"${a}\",\"${__getAttr a set}\")" ) (__attrNames set)))+"]";
-  nixPublishDir = getConfig [ "bleedingEdgeRepos" "bleedingEdgeFetchInfo"] "/tmp/bleeding-edge-fetch-info";
   config = writeText "nix-repository-manager_config"
         (bleedingEdgeRepos.managedRepoDir+"\n" +
-         nixPublishDir+"\n" +
         concatStringsSep "\n" (mapRecordFlatten toConfigLine (bleedingEdgeRepos.repos)));
 
 in
@@ -46,4 +44,5 @@ args.stdenv.mkDerivation {
       homepage = http://mawercer.de/repos/nix-repository-manager;
       license = "GPL";
   };
+  dummy=1;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48a486d01ef5..1f81a4205b7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7276,7 +7276,7 @@ let pkgs = rec {
   };
 
   nixRepositoryManager = import ../tools/package-management/nixRepositoryManager {
-    inherit fetchurl stdenv bleedingEdgeRepos lib writeText getConfig;
+    inherit fetchurl stdenv bleedingEdgeRepos lib writeText;
     ghc = ghcsAndLibs.ghc68.ghc;
     fetchdarcs = fetchdarcs2;
   };