aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-02-07 14:12:15 +0100
committerEelco Dolstra <edolstra@gmail.com>2018-02-07 14:12:15 +0100
commit0f3dae10643c1da8d0230879eeee74233ccd67b9 (patch)
tree53e6787e25d68b4be4fa274fdccad757e840ed00
parentabe6be578b501e265a3c4a0c33995c4848f28f56 (diff)
parente4ece83b1aad1bbbdc7cd39d9d0829f85330e505 (diff)
Merge branch 'fix-aarch64-test' of https://github.com/grahamc/nix
-rw-r--r--release.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/release.nix b/release.nix
index bdac283cf..d9c4f1efb 100644
--- a/release.nix
+++ b/release.nix
@@ -224,11 +224,13 @@ let
nix = build.x86_64-linux; system = "x86_64-linux";
});
- tests.setuid = pkgs.lib.genAttrs (pkgs.lib.filter (pkgs.lib.hasSuffix "-linux") systems) (system:
- import ./tests/setuid.nix rec {
- inherit nixpkgs;
- nix = build.${system}; inherit system;
- });
+ tests.setuid = pkgs.lib.genAttrs
+ (pkgs.lib.filter (system: system == "x86_64-linux" || system == "i686-linux") systems)
+ (system:
+ import ./tests/setuid.nix rec {
+ inherit nixpkgs;
+ nix = build.${system}; inherit system;
+ });
tests.binaryTarball =
with import nixpkgs { system = "x86_64-linux"; };