From 069604730babf554045a3f2ab6a9b8f7d6246751 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 May 2012 19:10:57 +0000
Subject: [PATCH] * Work around some problems in tarball checks.  Nix wants to
 open the   DB even in read-only mode.  Should probably fix that.  Also, "or"
 no   longer works like this because it's a keyword now.

svn path=/nixpkgs/trunk/; revision=34079
---
 pkgs/lib/tests.nix               | 4 +++-
 pkgs/top-level/make-tarball.nix  | 3 +++
 pkgs/top-level/release-small.nix | 1 -
 pkgs/top-level/release.nix       | 1 -
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/lib/tests.nix b/pkgs/lib/tests.nix
index 9aa04f62360..646de7c0e49 100644
--- a/pkgs/lib/tests.nix
+++ b/pkgs/lib/tests.nix
@@ -12,11 +12,13 @@ runTests {
     expr = const 2 3;
     expected = 2;
   };
-  
+
+  /*
   testOr = {
     expr = or true false;
     expected = true;
   };
+  */
   
   testAnd = {
     expr = and true false;
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 9f97b49ebb0..da83c6139c9 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -41,6 +41,9 @@ releaseTools.makeSourceTarball {
   doCheck = true;
 
   checkPhase = ''
+    export NIX_DB_DIR=$TMPDIR
+    nix-store --init
+  
     # Run the regression tests in `lib'.
     res="$(nix-instantiate --eval-only --strict pkgs/lib/tests.nix)"
     if test "$res" != "[ ]"; then
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index ba9f4def75f..59777fe99be 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -133,7 +133,6 @@ with (import ./release-lib.nix);
   nfsUtils = linux;
   nix = all;
   nixUnstable = all;
-  nixSqlite = all;
   nss_ldap = linux;
   nssmdns = linux;
   ntfs3g = linux;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3eda6a98d92..aff1dd9ce9c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -210,7 +210,6 @@ with (import ./release-lib.nix);
   nfsUtils = linux;
   nix = all;
   nixUnstable = all;
-  nixSqlite = all;
   nmap = linux;
   nss_ldap = linux;
   nssmdns = linux;