Skip to content

nixos/tests/userborn: fix setting hostPlatform #378940

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

Merged
wolfgangwalther merged 1 commit into from
Feb 3, 2025
Merged

nixos/tests/userborn: fix setting hostPlatform #378940

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions nixos/tests/userborn-immutable-etc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ in
meta.maintainers = with lib.maintainers; [ nikstur ];

nodes.machine =
{ config, ... }:
{ pkgs, ... }:
{
imports = [ common ];

Expand All @@ -36,8 +36,8 @@ in
specialisation.new-generation = {
inheritParentConfig = false;
configuration = {
nixpkgs = {
inherit (config.nixpkgs) hostPlatform;
nixpkgs.hostPlatform = {
inherit (pkgs.stdenv.hostPlatform) system;
Comment on lines +39 to +40
Copy link
Member

@roberth roberth Feb 3, 2025

Choose a reason for hiding this comment

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

Why would non-system attributes have to be dropped?
This change should not be required of anyone.

Copy link
Contributor Author

@nikstur nikstur Feb 4, 2025

Choose a reason for hiding this comment

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

Just to be clear: I have no stakes (or particular interest) in the original PR and was just looking for a quick fix for my tests. I have no objections to reverting the original PR and this one.

};
imports = [ common ];

Expand Down
6 changes: 3 additions & 3 deletions nixos/tests/userborn-immutable-users.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ in
meta.maintainers = with lib.maintainers; [ nikstur ];

nodes.machine =
{ config, ... }:
{ pkgs, ... }:
{
imports = [ common ];

Expand All @@ -32,8 +32,8 @@ in
specialisation.new-generation = {
inheritParentConfig = false;
configuration = {
nixpkgs = {
inherit (config.nixpkgs) hostPlatform;
nixpkgs.hostPlatform = {
inherit (pkgs.stdenv.hostPlatform) system;
};
imports = [ common ];

Expand Down
6 changes: 3 additions & 3 deletions nixos/tests/userborn-mutable-etc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ in
meta.maintainers = with lib.maintainers; [ nikstur ];

nodes.machine =
{ config, ... }:
{ pkgs, ... }:
{
imports = [ common ];

Expand All @@ -36,8 +36,8 @@ in
specialisation.new-generation = {
inheritParentConfig = false;
configuration = {
nixpkgs = {
inherit (config.nixpkgs) hostPlatform;
nixpkgs.hostPlatform = {
inherit (pkgs.stdenv.hostPlatform) system;
};
imports = [ common ];

Expand Down
6 changes: 3 additions & 3 deletions nixos/tests/userborn-mutable-users.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ in
meta.maintainers = with lib.maintainers; [ nikstur ];

nodes.machine =
{ config, ... }:
{ pkgs, ... }:
{
imports = [ common ];

Expand All @@ -33,8 +33,8 @@ in
specialisation.new-generation = {
inheritParentConfig = false;
configuration = {
nixpkgs = {
inherit (config.nixpkgs) hostPlatform;
nixpkgs.hostPlatform = {
inherit (pkgs.stdenv.hostPlatform) system;
};
imports = [ common ];

Expand Down