From 7def5339687ab801e11c8e1395b533ba270e3748 Mon Sep 17 00:00:00 2001
From: mexisme <wildjim+dev@kiwinet.org>
Date: Wed, 31 Jan 2024 12:00:03 +1300
Subject: [PATCH] Drop the deprecated "linuxPackage1" function, rename
 "linuxPackage2" to "linuxPackage"

---
 .../common/kernel/linux-6.6.x/default.nix     |  4 ++--
 .../surface/common/kernel/linux-package.nix   | 20 ++-----------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/microsoft/surface/common/kernel/linux-6.6.x/default.nix b/microsoft/surface/common/kernel/linux-6.6.x/default.nix
index 0aa0222..6663138 100644
--- a/microsoft/surface/common/kernel/linux-6.6.x/default.nix
+++ b/microsoft/surface/common/kernel/linux-6.6.x/default.nix
@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkOption types;
 
-  inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage2 surfacePatches;
+  inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage surfacePatches;
 
   cfg = config.microsoft-surface;
 
@@ -12,7 +12,7 @@ let
     inherit version;
     patchFn = ./patches.nix;
   };
-  kernelPackages = linuxPackage2 {
+  kernelPackages = linuxPackage {
     inherit version kernelPatches;
     sha256 = "sha256-iLiefdQerU46seQRyLuNWSV1rPgVzx3zwNxX4uiCwLw=";
     ignoreConfigErrors=true;
diff --git a/microsoft/surface/common/kernel/linux-package.nix b/microsoft/surface/common/kernel/linux-package.nix
index 8d92553..2672e36 100644
--- a/microsoft/surface/common/kernel/linux-package.nix
+++ b/microsoft/surface/common/kernel/linux-package.nix
@@ -9,20 +9,7 @@ let
   inherit (lib) recurseIntoAttrs versions;
   repos = pkgs.callPackage ../repos.nix {};
 
-  # Version 1 of the linuxPackage function:
-  # (DEPRECATED)
-  linuxPackage1 =
-    { version,
-      modDirVersion ? version,
-      ...
-    } @ args:
-    let
-      buildLinux' = buildLinux (args // { inherit modDirVersion; });
-      linuxPackagesFor' = linuxPackagesFor buildLinux';
-    in recurseIntoAttrs linuxPackagesFor';
-
-  # Version 1 of the linuxPackage function, with hopefully simplified arguments:
-  linuxPackage2 =
+  linuxPackage =
     { url ? "mirror://kernel/linux/kernel/v${versions.major version}.x/linux-${version}.tar.xz",
       sha256 ? null,
       src ? (fetchurl { inherit url sha256; }),
@@ -50,8 +37,5 @@ let
     };
 
 in {
-  inherit linuxPackage1 linuxPackage2 repos surfacePatches;
-
-  # Default version:
-  linuxPackage = linuxPackage2;
+  inherit linuxPackage repos surfacePatches;
 }