maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'seccomp' of https://github.com/aszlig/nix

Browse source
This commit is contained in:
Eelco Dolstra 2016-12-15 12:04:45 +01:00
commit 9f3f2e21ed
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
6 changed files with 139 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
release.nix
View file

@ -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"