mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

Merge pull request #312169 from B4dM4n/remove-alias-usage

Browse source 
treewide: Remove usage of pkgs.{system,hostPlatform} aliases
This commit is contained in:
Weijia Wang 2024-05-16 15:25:10 +02:00 committed by GitHub
parent 97445937fd da68f358bc
commit b6f403758f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/binfmt.nix
View file

@ -280,7 +280,7 @@ in {
};
config = {
boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.system; {
boot.binfmt.registrations = builtins.listToAttrs (map (system: assert system != pkgs.stdenv.hostPlatform.system; {
name = system;
value = { config, ... }: let
interpreter = getEmulator system;

4
nixos/modules/virtualisation/lxc-image-metadata.nix
View file

@ -87,10 +87,10 @@ in {
contents = [
{
source = toYAML "metadata.yaml" {
architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.system)) 0;
architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.stdenv.hostPlatform.system)) 0;
creation_date = 1;
properties = {
description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.system}";
description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.stdenv.hostPlatform.system}";
os = "${config.system.nixos.distroId}";
release = "${config.system.nixos.codeName}";
};

2
nixos/modules/virtualisation/qemu-vm.nix
View file

@ -912,7 +912,7 @@ in
"ppc64-linux" = "tpm-spapr";
"armv7-linux" = "tpm-tis-device";
"aarch64-linux" = "tpm-tis-device";
}.${pkgs.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU"));
}.${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU"));
defaultText = ''
Based on the guest platform Linux system:

4
nixos/tests/stub-ld.nix
View file

@ -45,10 +45,10 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
with subtest("Try FHS executable"):
machine.copy_from_host('${test-exec.${pkgs.system}}','test-exec')
machine.copy_from_host('${test-exec.${pkgs.stdenv.hostPlatform.system}}','test-exec')
machine.succeed('if test-exec/${exec-name} 2>outfile; then false; else [ $? -eq 127 ];fi')
machine.succeed('grep -qi nixos outfile')
${if32 "machine.copy_from_host('${test-exec.${pkgs32.system}}','test-exec32')"}
${if32 "machine.copy_from_host('${test-exec.${pkgs32.stdenv.hostPlatform.system}}','test-exec32')"}
${if32 "machine.succeed('if test-exec32/${exec-name} 2>outfile32; then false; else [ $? -eq 127 ];fi')"}
${if32 "machine.succeed('grep -qi nixos outfile32')"}