summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/top-level/all-packages.nix17
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 441df72f93a..956fcf74632 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1497,20 +1497,17 @@ let pkgs = rec {
   ghc = ghc68;
 
   ghc68 = import ../development/compilers/ghc-6.8 {
-    inherit fetchurl stdenv readline perl gmp ncurses;
-    m4 = gnum4;
+    inherit fetchurl stdenv readline perl gmp ncurses m4;
     ghc = ghcboot;
   };
 
   ghc661 = import ../development/compilers/ghc-6.6.1 {
-    inherit fetchurl stdenv readline perl58 gmp ncurses;
-    m4 = gnum4;
+    inherit fetchurl stdenv readline perl58 gmp ncurses m4;
     ghc = ghcboot;
   };
 
   ghc66 = import ../development/compilers/ghc-6.6 {
-    inherit fetchurl stdenv readline perl gmp ncurses;
-    m4 = gnum4;
+    inherit fetchurl stdenv readline perl gmp ncurses m4;
     ghc = ghcboot;
   };
 
@@ -6468,6 +6465,14 @@ let pkgs = rec {
     db4 = db45;
   };
 
+  # The really bleeding edge.
+  nixNoBDB = lowPrio (nixCustomFun
+    (fetchurl {
+      url = http://nixos.org/releases/nix-no-bdb/nix-0.12pre11675-jvhinhlm/nix-0.12pre11675.tar.bz2;
+      sha256 = "1c20dd159f0f7ffb7105745426b64097f833b265604e14ff77f94da2d145d44b";
+    })
+    "" [] "");
+
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {
       inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake