Author: eelco
Date: Sun May 13 19:10:57 2012
New Revision: 34079
URL: https://nixos.org/websvn/nix/?rev=34079&sc=1
Log:
* 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.
Modified:
nixpkgs/trunk/pkgs/lib/tests.nix
nixpkgs/trunk/pkgs/top-level/make-tarball.nix
nixpkgs/trunk/pkgs/top-level/release-small.nix
nixpkgs/trunk/pkgs/top-level/release.nix
Modified: nixpkgs/trunk/pkgs/lib/tests.nix
==============================================================================
--- nixpkgs/trunk/pkgs/lib/tests.nix Sun May 13 00:47:58 2012 (r34078)
+++ nixpkgs/trunk/pkgs/lib/tests.nix Sun May 13 19:10:57 2012 (r34079)
@@ -12,11 +12,13 @@
expr = const 2 3;
expected = 2;
};
-
+
+ /*
testOr = {
expr = or true false;
expected = true;
};
+ */
testAnd = {
expr = and true false;
Modified: nixpkgs/trunk/pkgs/top-level/make-tarball.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/make-tarball.nix Sun May 13 00:47:58
2012 (r34078)
+++ nixpkgs/trunk/pkgs/top-level/make-tarball.nix Sun May 13 19:10:57
2012 (r34079)
@@ -41,6 +41,9 @@
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
Modified: nixpkgs/trunk/pkgs/top-level/release-small.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release-small.nix Sun May 13 00:47:58
2012 (r34078)
+++ nixpkgs/trunk/pkgs/top-level/release-small.nix Sun May 13 19:10:57
2012 (r34079)
@@ -133,7 +133,6 @@
nfsUtils = linux;
nix = all;
nixUnstable = all;
- nixSqlite = all;
nss_ldap = linux;
nssmdns = linux;
ntfs3g = linux;
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release.nix Sun May 13 00:47:58 2012
(r34078)
+++ nixpkgs/trunk/pkgs/top-level/release.nix Sun May 13 19:10:57 2012
(r34079)
@@ -210,7 +210,6 @@
nfsUtils = linux;
nix = all;
nixUnstable = all;
- nixSqlite = all;
nmap = linux;
nss_ldap = linux;
nssmdns = linux;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
