summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2021-01-25 13:06:12 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2021-01-25 13:06:12 -0500
commit63b02e55dbf929366543d0cd7ebdf5b68e18d794 (patch)
tree6bc2aa5bece7c9c07f55d6a1d3f674ff8a480c7a /nixos/modules/system
parent67fabbc7c3371ecfa4c32d9160976a5f129b4ede (diff)
downloadnixpkgs-63b02e55dbf929366543d0cd7ebdf5b68e18d794.tar
nixpkgs-63b02e55dbf929366543d0cd7ebdf5b68e18d794.tar.gz
nixpkgs-63b02e55dbf929366543d0cd7ebdf5b68e18d794.tar.bz2
nixpkgs-63b02e55dbf929366543d0cd7ebdf5b68e18d794.tar.lz
nixpkgs-63b02e55dbf929366543d0cd7ebdf5b68e18d794.tar.xz
nixpkgs-63b02e55dbf929366543d0cd7ebdf5b68e18d794.tar.zst
nixpkgs-63b02e55dbf929366543d0cd7ebdf5b68e18d794.zip
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.
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/loader/generations-dir/generations-dir.nix5
-rw-r--r--nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix4
2 files changed, 2 insertions, 7 deletions
diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index fee567a510b..1437ab38770 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -12,9 +12,6 @@ let
     inherit (config.boot.loader.generationsDir) copyKernels;
   };
 
-  # Temporary check, for nixos to cope both with nixpkgs stdenv-updates and trunk
-  inherit (pkgs.stdenv.hostPlatform) platform;
-
 in
 
 {
@@ -59,7 +56,7 @@ in
 
     system.build.installBootLoader = generationsDirBuilder;
     system.boot.loader.id = "generationsDir";
-    system.boot.loader.kernelFile = linux-kernel.target;
+    system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
 
   };
 }
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 061f2967350..1023361f0b1 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -5,8 +5,6 @@ with lib;
 let
   cfg = config.boot.loader.raspberryPi;
 
-  inherit (pkgs.stdenv.hostPlatform) platform;
-
   builderUboot = import ./uboot-builder.nix { inherit pkgs configTxt; inherit (cfg) version; };
   builderGeneric = import ./raspberrypi-builder.nix { inherit pkgs configTxt; };
 
@@ -102,6 +100,6 @@ in
 
     system.build.installBootLoader = builder;
     system.boot.loader.id = "raspberrypi";
-    system.boot.loader.kernelFile = linux-kernel.target;
+    system.boot.loader.kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
   };
 }