diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-12-19T10·52+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-12-19T10·52+0100 |
| commit | 3a4bd320c2c4043a4b1f73406030e9afc0677b59 (patch) | |
| tree | 8901d77af1d0231783274f02e340101329df02a9 /release.nix | |
| parent | 11f0680f69ffd12ac036040a2395f31b11fabd1f (diff) | |
Revert "Merge branch 'seccomp' of https://github.com/aszlig/nix"
This reverts commit 9f3f2e21edb17dbcd674539dff96efb6cceca10c, reversing changes made to 47f587700d646f5b03a42f2fa57c28875a31efbe.
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/release.nix b/release.nix index 7c5e6125b09f..d825dd583768 100644 --- a/release.nix +++ b/release.nix @@ -25,7 +25,7 @@ let buildInputs = [ curl bison flex perl libxml2 libxslt bzip2 xz - pkgconfig sqlite libsodium libseccomp boehmgc + pkgconfig sqlite libsodium boehmgc docbook5 docbook5_xsl autoconf-archive ] ++ lib.optional (!lib.inNixShell) git; @@ -74,7 +74,6 @@ 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"]; @@ -197,10 +196,6 @@ 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" |