ghc68extralibraries: tidied up, no longer many small files, nicer indentation (at least same level now)

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

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