mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 11:45:45 +03:00
Revert "nixos/tests/userborn: fix setting hostPlatform"
This commit is contained in:
parent
082fd30a6b
commit
6c94b746ee
4 changed files with 12 additions and 12 deletions
|
@ -20,7 +20,7 @@ in
|
||||||
meta.maintainers = with lib.maintainers; [ nikstur ];
|
meta.maintainers = with lib.maintainers; [ nikstur ];
|
||||||
|
|
||||||
nodes.machine =
|
nodes.machine =
|
||||||
{ pkgs, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
imports = [ common ];
|
imports = [ common ];
|
||||||
|
|
||||||
|
@ -36,8 +36,8 @@ in
|
||||||
specialisation.new-generation = {
|
specialisation.new-generation = {
|
||||||
inheritParentConfig = false;
|
inheritParentConfig = false;
|
||||||
configuration = {
|
configuration = {
|
||||||
nixpkgs.hostPlatform = {
|
nixpkgs = {
|
||||||
inherit (pkgs.stdenv.hostPlatform) system;
|
inherit (config.nixpkgs) hostPlatform;
|
||||||
};
|
};
|
||||||
imports = [ common ];
|
imports = [ common ];
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ in
|
||||||
meta.maintainers = with lib.maintainers; [ nikstur ];
|
meta.maintainers = with lib.maintainers; [ nikstur ];
|
||||||
|
|
||||||
nodes.machine =
|
nodes.machine =
|
||||||
{ pkgs, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
imports = [ common ];
|
imports = [ common ];
|
||||||
|
|
||||||
|
@ -32,8 +32,8 @@ in
|
||||||
specialisation.new-generation = {
|
specialisation.new-generation = {
|
||||||
inheritParentConfig = false;
|
inheritParentConfig = false;
|
||||||
configuration = {
|
configuration = {
|
||||||
nixpkgs.hostPlatform = {
|
nixpkgs = {
|
||||||
inherit (pkgs.stdenv.hostPlatform) system;
|
inherit (config.nixpkgs) hostPlatform;
|
||||||
};
|
};
|
||||||
imports = [ common ];
|
imports = [ common ];
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ in
|
||||||
meta.maintainers = with lib.maintainers; [ nikstur ];
|
meta.maintainers = with lib.maintainers; [ nikstur ];
|
||||||
|
|
||||||
nodes.machine =
|
nodes.machine =
|
||||||
{ pkgs, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
imports = [ common ];
|
imports = [ common ];
|
||||||
|
|
||||||
|
@ -36,8 +36,8 @@ in
|
||||||
specialisation.new-generation = {
|
specialisation.new-generation = {
|
||||||
inheritParentConfig = false;
|
inheritParentConfig = false;
|
||||||
configuration = {
|
configuration = {
|
||||||
nixpkgs.hostPlatform = {
|
nixpkgs = {
|
||||||
inherit (pkgs.stdenv.hostPlatform) system;
|
inherit (config.nixpkgs) hostPlatform;
|
||||||
};
|
};
|
||||||
imports = [ common ];
|
imports = [ common ];
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ in
|
||||||
meta.maintainers = with lib.maintainers; [ nikstur ];
|
meta.maintainers = with lib.maintainers; [ nikstur ];
|
||||||
|
|
||||||
nodes.machine =
|
nodes.machine =
|
||||||
{ pkgs, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
imports = [ common ];
|
imports = [ common ];
|
||||||
|
|
||||||
|
@ -33,8 +33,8 @@ in
|
||||||
specialisation.new-generation = {
|
specialisation.new-generation = {
|
||||||
inheritParentConfig = false;
|
inheritParentConfig = false;
|
||||||
configuration = {
|
configuration = {
|
||||||
nixpkgs.hostPlatform = {
|
nixpkgs = {
|
||||||
inherit (pkgs.stdenv.hostPlatform) system;
|
inherit (config.nixpkgs) hostPlatform;
|
||||||
};
|
};
|
||||||
imports = [ common ];
|
imports = [ common ];
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue