diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-12-15T11·04+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-12-15T11·04+0100 |
| commit | 9f3f2e21edb17dbcd674539dff96efb6cceca10c (patch) | |
| tree | 8d687ca67b4729a91e32792bec3d8f35cda07ab8 /release.nix | |
| parent | 47f587700d646f5b03a42f2fa57c28875a31efbe (diff) | |
| parent | 4e1a2cd537b5b910937499c544043ddac291843e (diff) | |
Merge branch 'seccomp' of https://github.com/aszlig/nix
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/release.nix b/release.nix index d825dd583768..7c5e6125b09f 100644 --- a/release.nix +++ b/release.nix @@ -25,7 +25,7 @@ let buildInputs = [ curl bison flex perl libxml2 libxslt bzip2 xz - pkgconfig sqlite libsodium boehmgc + pkgconfig sqlite libsodium libseccomp boehmgc docbook5 docbook5_xsl autoconf-archive ] ++ lib.optional (!lib.inNixShell) git; @@ -74,6 +74,7 @@ let buildInputs = [ curl perl bzip2 xz openssl pkgconfig sqlite boehmgc ] ++ lib.optional stdenv.isLinux libsodium + ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional stdenv.isLinux (aws-sdk-cpp.override { apis = ["s3"]; @@ -196,6 +197,10 @@ let nix = build.x86_64-linux; system = "x86_64-linux"; }); + tests.sandbox = (import ./tests/sandbox.nix rec { + nix = build.x86_64-linux; system = "x86_64-linux"; + }); + tests.binaryTarball = with import <nixpkgs> { system = "x86_64-linux"; }; vmTools.runInLinuxImage (runCommand "nix-binary-tarball-test" |