From 6c94b746eea1229ce22816cef7531fbd15637355 Mon Sep 17 00:00:00 2001 From: nikstur Date: Thu, 6 Feb 2025 11:33:34 +0100 Subject: [PATCH] Revert "nixos/tests/userborn: fix setting hostPlatform" --- nixos/tests/userborn-immutable-etc.nix | 6 +++--- nixos/tests/userborn-immutable-users.nix | 6 +++--- nixos/tests/userborn-mutable-etc.nix | 6 +++--- nixos/tests/userborn-mutable-users.nix | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/tests/userborn-immutable-etc.nix b/nixos/tests/userborn-immutable-etc.nix index 68c521b19148..e95fba23063b 100644 --- a/nixos/tests/userborn-immutable-etc.nix +++ b/nixos/tests/userborn-immutable-etc.nix @@ -20,7 +20,7 @@ in meta.maintainers = with lib.maintainers; [ nikstur ]; nodes.machine = - { pkgs, ... }: + { config, ... }: { imports = [ common ]; @@ -36,8 +36,8 @@ in specialisation.new-generation = { inheritParentConfig = false; configuration = { - nixpkgs.hostPlatform = { - inherit (pkgs.stdenv.hostPlatform) system; + nixpkgs = { + inherit (config.nixpkgs) hostPlatform; }; imports = [ common ]; diff --git a/nixos/tests/userborn-immutable-users.nix b/nixos/tests/userborn-immutable-users.nix index c7a8176a00c1..887d2d312eb7 100644 --- a/nixos/tests/userborn-immutable-users.nix +++ b/nixos/tests/userborn-immutable-users.nix @@ -16,7 +16,7 @@ in meta.maintainers = with lib.maintainers; [ nikstur ]; nodes.machine = - { pkgs, ... }: + { config, ... }: { imports = [ common ]; @@ -32,8 +32,8 @@ in specialisation.new-generation = { inheritParentConfig = false; configuration = { - nixpkgs.hostPlatform = { - inherit (pkgs.stdenv.hostPlatform) system; + nixpkgs = { + inherit (config.nixpkgs) hostPlatform; }; imports = [ common ]; diff --git a/nixos/tests/userborn-mutable-etc.nix b/nixos/tests/userborn-mutable-etc.nix index 0f82c003f94c..6199b84ce71d 100644 --- a/nixos/tests/userborn-mutable-etc.nix +++ b/nixos/tests/userborn-mutable-etc.nix @@ -20,7 +20,7 @@ in meta.maintainers = with lib.maintainers; [ nikstur ]; nodes.machine = - { pkgs, ... }: + { config, ... }: { imports = [ common ]; @@ -36,8 +36,8 @@ in specialisation.new-generation = { inheritParentConfig = false; configuration = { - nixpkgs.hostPlatform = { - inherit (pkgs.stdenv.hostPlatform) system; + nixpkgs = { + inherit (config.nixpkgs) hostPlatform; }; imports = [ common ]; diff --git a/nixos/tests/userborn-mutable-users.nix b/nixos/tests/userborn-mutable-users.nix index fd256425556c..e2b9c3df4953 100644 --- a/nixos/tests/userborn-mutable-users.nix +++ b/nixos/tests/userborn-mutable-users.nix @@ -16,7 +16,7 @@ in meta.maintainers = with lib.maintainers; [ nikstur ]; nodes.machine = - { pkgs, ... }: + { config, ... }: { imports = [ common ]; @@ -33,8 +33,8 @@ in specialisation.new-generation = { inheritParentConfig = false; configuration = { - nixpkgs.hostPlatform = { - inherit (pkgs.stdenv.hostPlatform) system; + nixpkgs = { + inherit (config.nixpkgs) hostPlatform; }; imports = [ common ];