git.iko.soy/typeable/nixpkgs
on master help sign in
nixos treewide: Fix references to linux-kernel.target

Thanks @ajs124 in https://github.com/NixOS/nixpkgs/pull/110544#discussion_r563828722 for catching this. According to: git grep 'inherit.*Platform.*platform' git grep ' linux-kernel' We now don't have any remaining problems of this sort, thankfully.

commit63b02e55dbf929366543d0cd7ebdf5b68e18d794 authorJohn Ericson <John.Ericson@Obsidian.Systems> dateMon 25 Jan 2021, 13:06 (6 years ago) parent67fabbc
2 files changed+2−7
nixos/modules/system/boot/loader/generations-dir/generations-dir.nix+1−4 nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix+1−3
nixos/modules/system/boot/loader/generations-dir/generations-dir.nix+1−4
@@ -12,9 +12,6 @@ let
1212 inherit (config.boot.loader.generationsDir) copyKernels;
1313 };
1414
15− # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
16− inherit (pkgs.stdenv.hostPlatform) platform;
17−
1815in
1916
2017{
@@ -59,7 +56,7 @@ in
5956
6057 system.build.installBootLoader = generationsDirBuilder;
6158 system.boot.loader.id = "generationsDir";
62− system.boot.loader.kernelFile = linux-kernel.target;
59+ system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
6360
6461 };
6562}
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix+1−3
@@ -5,8 +5,6 @@ with lib;
55let
66 cfg = config.boot.loader.raspberryPi;
77
8− inherit (pkgs.stdenv.hostPlatform) platform;
9−
108 builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
119 builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
1210
@@ -102,6 +100,6 @@ in
102100
103101 system.build.installBootLoader = builder;
104102 system.boot.loader.id = "raspberrypi";
105− system.boot.loader.kernelFile = linux-kernel.target;
103+ system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
106104 };
107105}