movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

make nix.settings.system-features default mergeable again (#383052)

Browse source
This commit is contained in:
Jörg Thalheim 2025-03-10 13:09:49 +01:00 • committed by GitHub
commit 611bfa1dd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
nixos/modules/config/nix.nix
View file

@ -45,6 +45,19 @@ let
isNixAtLeast = versionAtLeast (getVersion nixPackage); isNixAtLeast = versionAtLeast (getVersion nixPackage);
defaultSystemFeatures = [
"nixos-test"
"benchmark"
"big-parallel"
"kvm"
] ++ optionals (pkgs.stdenv.hostPlatform ? gcc.arch) (
# a builder can run code for `gcc.arch` and inferior architectures
[ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ]
++ map (x: "gccarch-${x}") (
systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [ ]
)
);
legacyConfMappings = { legacyConfMappings = {
useSandbox = "sandbox"; useSandbox = "sandbox";
buildCores = "cores"; buildCores = "cores";
@ -315,20 +328,9 @@ in
system-features = mkOption { system-features = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = # We expose system-featuers here and in config below.
[ # This allows users to access the default value via `options.nix.settings.system-features`
"nixos-test" default = defaultSystemFeatures;
"benchmark"
"big-parallel"
"kvm"
]
++ optionals (pkgs.stdenv.hostPlatform ? gcc.arch) (
# a builder can run code for `gcc.arch` and inferior architectures
[ "gccarch-${pkgs.stdenv.hostPlatform.gcc.arch}" ]
++ map (x: "gccarch-${x}") (
systems.architectures.inferiors.${pkgs.stdenv.hostPlatform.gcc.arch} or [ ]
)
);
defaultText = literalExpression ''[ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-<arch>" ]''; defaultText = literalExpression ''[ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-<arch>" ]'';
description = '' description = ''
The set of features supported by the machine. Derivations The set of features supported by the machine. Derivations
@ -385,6 +387,7 @@ in
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
trusted-users = [ "root" ]; trusted-users = [ "root" ];
substituters = mkAfter [ "https://cache.nixos.org/" ]; substituters = mkAfter [ "https://cache.nixos.org/" ];
system-features = defaultSystemFeatures;
}; };
}; };
} }