From 986a0c5d9a1b29c75b4e9f8d0ab4d60d1f28df31 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Wed, 3 Feb 2021 19:05:30 -0500
Subject: [PATCH] linuxPackagesFor: fix overriding kernel attribute

The "kernel" argument to linuxPackagesFor was taking precedence over the
"self.kernel" attribute brought into scope by the "with self;" statement. This
prevented the makeExtensible machinery from working correctly when "kernel"
was overridden.
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0fe077feed0..3d1616cd471 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19105,10 +19105,10 @@ in
      for a specific kernel.  This function can then be called for
      whatever kernel you're using. */
 
-  linuxPackagesFor = kernel: lib.makeExtensible (self: with self; {
+  linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; {
     callPackage = newScope self;
 
-    inherit kernel;
+    kernel = kernel_;
     inherit (kernel) stdenv; # in particular, use the same compiler by default
 
     # to help determine module compatibility