Unverified Commit da68f358 authored by Fabian Möller's avatar Fabian Möller
Browse files

treewide: Remove usage of pkgs.{system,hostPlatform} aliases 

These aliases should not be used inside nixpkgs and are only there for backward
compatibility.
parent dc13d8a3

nixos/modules/system/boot/binfmt.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

nixos/modules/virtualisation/lxc-image-metadata.nix

+2 −2
Original line number Diff line number Diff line
@@ -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}";

            };

nixos/modules/virtualisation/qemu-vm.nix

+1 −1
Original line number Diff line number Diff line
@@ -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:

nixos/tests/stub-ld.nix

+2 −2
Original line number Diff line number Diff line
@@ -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')"}