added 2 repos and renamed ghc_68_extra to ghc68extraLibs

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

5 files changed, 8 insertions, 5 deletions

diff --git a/pkgs/development/misc/bleeding-edge-repos/default.nix b/pkgs/development/misc/bleeding-edge-repos/default.nix
index 9b0aa1c23566..5f827736a9ba 100644
--- a/pkgs/development/misc/bleeding-edge-repos/default.nix
+++ b/pkgs/development/misc/bleeding-edge-repos/default.nix
@@ -45,6 +45,9 @@ args:
       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-HTTP; groups="happs"; };
+      takusen = { type="darcs"; url=http://darcs.haskell.org/takusen/; };
+      cabal = { type="darcs"; url=http://darcs.haskell.org/cabal; };
+
 
       # git repositories 
       hypertable =  { type="git"; url="git://scm.hypertable.org/pub/repos/hypertable.git"; groups=""; };
diff --git a/pkgs/misc/ghc68_extra_libs/default.nix b/pkgs/misc/ghc68extraLibs/default.nix
index 0f2da28de4ec..0f2da28de4ec 100644
--- a/pkgs/misc/ghc68_extra_libs/default.nix
+++ b/pkgs/misc/ghc68extraLibs/default.nix
diff --git a/pkgs/misc/ghc68_extra_libs/hdbc_postgresql_patch b/pkgs/misc/ghc68extraLibs/hdbc_postgresql_patch
index 75df73ae94b5..75df73ae94b5 100644
--- a/pkgs/misc/ghc68_extra_libs/hdbc_postgresql_patch
+++ b/pkgs/misc/ghc68extraLibs/hdbc_postgresql_patch
diff --git a/pkgs/misc/ghc68_extra_libs/takusen_setup_patch b/pkgs/misc/ghc68extraLibs/takusen_setup_patch
index baa318de5568..baa318de5568 100644
--- a/pkgs/misc/ghc68_extra_libs/takusen_setup_patch
+++ b/pkgs/misc/ghc68extraLibs/takusen_setup_patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d490661bdee..0722a2228dcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -159,7 +159,7 @@ rec {
     ";
   };
   # example usage
-  #testSourceWithTags = sourceWithTagsDerivation (ghc68_extra_libs ghcsAndLibs.ghc68).happs_server_darcs.passthru.sourceWithTags;
+  #testSourceWithTags = sourceWithTagsDerivation (ghc68extraLibs ghcsAndLibs.ghc68).happs_server_darcs.passthru.sourceWithTags;
 
   addCTaggingInfo = deriv :
     deriv // { 
@@ -1169,7 +1169,7 @@ rec {
   flapjax = import ../development/compilers/flapjax {
     inherit fetchurl stdenv;
     ghc = ghcsAndLibs.ghc68.ghc;
-    libs = with (ghc68_extra_libs ghcsAndLibs.ghc68 // ghcsAndLibs.ghc68.core_libs); [ mtl parsec random ];
+    libs = with (ghc68extraLibs ghcsAndLibs.ghc68 // ghcsAndLibs.ghc68.core_libs); [ mtl parsec random ];
   };
 
   g77 = import ../build-support/gcc-wrapper {
@@ -1348,7 +1348,7 @@ rec {
   };
 
   # this may change in the future 
-  ghc68_extra_libs = (import ../misc/ghc68_extra_libs ) {
+  ghc68extraLibs = (import ../misc/ghc68extraLibs ) {
     # lib like stuff
     inherit bleedingEdgeRepos fetchurl lib addHasktagsTaggingInfo ghcCabalDerivation pkgconfig unzip;
     # used (non haskell) libraries (ffi etc)
@@ -1374,8 +1374,8 @@ rec {
         # (map ( a : __getAttr a ghcsAndLibs.ghc68.core_libs ) [ "cabal" "mtl" "base"  ]
 
         # some extra libs
-           ++  (lib.flattenAttrs (ghc68_extra_libs ghcsAndLibs.ghc68) );
-        # ++ map ( a : __getAttr a (ghc68_extra_libs ghcsAndLibs.ghc68 ) ) [ "mtl" "parsec" ... ]
+           ++  (lib.flattenAttrs (ghc68extraLibs ghcsAndLibs.ghc68) );
+        # ++ map ( a : __getAttr a (ghc68extraLibs ghcsAndLibs.ghc68 ) ) [ "mtl" "parsec" ... ]
       inherit ghc;
   };