public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Work around some problems in tarball checks. Nix wants to open the

Browse Source 
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
This commit is contained in:
Eelco Dolstra 2012-05-13 19:10:57 +00:00
parent 500c46b56b
commit 069604730b
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/lib/tests.nix
View File

@ -12,11 +12,13 @@ runTests {
expr = const 2 3; expr = const 2 3;
expected = 2; expected = 2;
}; };
/*
testOr = { testOr = {
expr = or true false; expr = or true false;
expected = true; expected = true;
}; };
*/
testAnd = { testAnd = {
expr = and true false; expr = and true false;

3
pkgs/top-level/make-tarball.nix
View File

@ -41,6 +41,9 @@ releaseTools.makeSourceTarball {
doCheck = true; doCheck = true;
checkPhase = '' checkPhase = ''
export NIX_DB_DIR=$TMPDIR
nix-store --init
# Run the regression tests in `lib'. # Run the regression tests in `lib'.
res="$(nix-instantiate --eval-only --strict pkgs/lib/tests.nix)" res="$(nix-instantiate --eval-only --strict pkgs/lib/tests.nix)"
if test "$res" != "[ ]"; then if test "$res" != "[ ]"; then

1
pkgs/top-level/release-small.nix
View File

@ -133,7 +133,6 @@ with (import ./release-lib.nix);
nfsUtils = linux; nfsUtils = linux;
nix = all; nix = all;
nixUnstable = all; nixUnstable = all;
nixSqlite = all;
nss_ldap = linux; nss_ldap = linux;
nssmdns = linux; nssmdns = linux;
ntfs3g = linux; ntfs3g = linux;

1
pkgs/top-level/release.nix
View File

@ -210,7 +210,6 @@ with (import ./release-lib.nix);
nfsUtils = linux; nfsUtils = linux;
nix = all; nix = all;
nixUnstable = all; nixUnstable = all;
nixSqlite = all;
nmap = linux; nmap = linux;
nss_ldap = linux; nss_ldap = linux;
nssmdns = linux; nssmdns = linux;