diff options
author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-01-11 18:16:17 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-01-19 10:35:49 +0200 |
commit | 4fd0a3a43d6a4be050e786706e258707049d76d9 (patch) | |
tree | 6ecefb3b3d053a68eb35eec543375869a566aab4 /nixos/release-combined.nix | |
parent | eb57d6d08997a41b59fe97b5815baf60d92e063a (diff) | |
download | nixlib-4fd0a3a43d6a4be050e786706e258707049d76d9.tar nixlib-4fd0a3a43d6a4be050e786706e258707049d76d9.tar.gz nixlib-4fd0a3a43d6a4be050e786706e258707049d76d9.tar.bz2 nixlib-4fd0a3a43d6a4be050e786706e258707049d76d9.tar.lz nixlib-4fd0a3a43d6a4be050e786706e258707049d76d9.tar.xz nixlib-4fd0a3a43d6a4be050e786706e258707049d76d9.tar.zst nixlib-4fd0a3a43d6a4be050e786706e258707049d76d9.zip |
nixos/release.nix: More refactoring for multi-arch
Currently, even if you pass supportedSystems = [ "aarch64-linux" ] you end up with e.g. `nixos.tests.docker` which actually silently runs on x86_64-linux. Using the new callTestOnTheseSystems fixes that. As a side-effect, this also causes a rename of `nixos.tests.docker` -> `nixos.tests.docker.x86_64-linux`, which is IMHO a good thing since it's makes them consistent with the rest of the tests.
Diffstat (limited to 'nixos/release-combined.nix')
-rw-r--r-- | nixos/release-combined.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 34a413f1ac3e..6583b13b844e 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -80,7 +80,7 @@ in rec { (all nixos.tests.boot.uefiUsb) (all nixos.tests.boot-stage1) (all nixos.tests.hibernate) - nixos.tests.docker + nixos.tests.docker.x86_64-linux (all nixos.tests.ecryptfs) (all nixos.tests.env) (all nixos.tests.ipv6) |