Skip to content

nixosTests: use hostPlatform.system instead of builtins.currentSystem #50028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ekleog wants to merge 1 commit into from
Closed

nixosTests: use hostPlatform.system instead of builtins.currentSystem #50028

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* to merges. Please use the full-text search of your editor. ;)
* Hint: ### starts category names.
*/
{ lib, noSysDirs, config}:
{ lib, noSysDirs, config }:
self: pkgs:

with pkgs;
Expand Down Expand Up @@ -75,8 +75,7 @@ with pkgs;

nixosTests =
let
# TODO(Ericson2314,ekleog): Check this will work correctly with cross-
system = builtins.currentSystem;
system = hostPlatform.system;
Copy link
Member

@matthewbauer matthewbauer Nov 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be stdenv.hostPlatform.system.

rawTests = (import ../../nixos/release.nix {
nixpkgs = pkgs;
}).tests;
Expand Down