* Add a Nix expression for the Nix SQLite branch (temporarily).

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

pkgs/tools/package-management/nix/sqlite.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, aterm, perl, curl, bzip2, sqlite, openssl ? null
+, storeDir ? "/nix/store"
+, stateDir ? "/nix/var"
+}:
+
+stdenv.mkDerivation rec {
+  name = "nix-0.15pre20364";
+  
+  src = fetchurl {
+    url = "http://hydra.nixos.org/build/310441/download/4/${name}.tar.bz2";
+    sha256 = "a3ef50d9ec084f13a948156a7e19c60d993f6c196e6fabebd35fc08b92dfd21a";
+  };
+
+  buildInputs = [perl curl openssl];
+
+  configureFlags = ''
+    --with-store-dir=${storeDir} --localstatedir=${stateDir}
+    --with-aterm=${aterm} --with-bzip2=${bzip2} --with-sqlite=${sqlite}
+    --disable-init-state
+  '';
+
+  doCheck = true;
+
+  passthru = { inherit aterm; };
+
+  meta = {
+    description = "The Nix Deployment System";
+    homepage = http://nixos.org/;
+    license = "LGPL";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -8993,6 +8993,13 @@ let
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
 
+  # The SQLite branch.
+  nixSqlite = makeOverridable (import ../tools/package-management/nix/sqlite.nix) {
+    inherit fetchurl stdenv perl curl bzip2 openssl aterm sqlite;
+    storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
+    stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
+  };
+
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {
       inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake