Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b7871c3f2da1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e34a53c4ea84
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 25, 2021

  1. nixos treewide: Fix references to linux-kernel.target 

    Thanks @ajs124 in
#110544 (comment) 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.
    @Ericson2314
    Ericson2314 committed Jan 25, 2021
    1
    Copy the full SHA
    63b02e5 View commit details

  2. Merge pull request #110803 from Ericson2314/fix-nixos-misc-linux-config 

    nixos treewide: Fix references to linux-kernel.target
    @Ericson2314
    Ericson2314 authored Jan 25, 2021
    1
    Copy the full SHA
    e34a53c View commit details
Showing with 2 additions and 7 deletions.
  1. +1 −4 nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
  2. +1 −3 nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
5 changes: 1 addition & 4 deletions nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
View file
Original file line number Diff line number Diff line change
@@ -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;

};
}
4 changes: 1 addition & 3 deletions nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}