From 0016f79f876d7227be0cffa88e66d8df727037f0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 01/26] linuxPackages.systemtap: add version and pname

---
 pkgs/development/tools/profiling/systemtap/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index 20a9d6d5d862..b768c92da1f8 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -30,7 +30,7 @@ runCommand "systemtap-${systemtap-unwrapped.version}"
     stapBuild = systemtap-unwrapped;
     nativeBuildInputs = [ makeWrapper ];
     passthru.tests = { inherit (nixosTests.systemtap) linux_default linux_latest; };
-    inherit (systemtap-unwrapped) meta;
+    inherit (systemtap-unwrapped) meta version pname;
   }
   (
     ''

From 929f520b79932673b1b6d9114c10d58938b03818 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 02/26] linuxPackages.ajantv2: add pname and version

---
 pkgs/os-specific/linux/ajantv2/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/ajantv2/default.nix b/pkgs/os-specific/linux/ajantv2/default.nix
index d9e664b1c3d0..ffaa13efbce5 100644
--- a/pkgs/os-specific/linux/ajantv2/default.nix
+++ b/pkgs/os-specific/linux/ajantv2/default.nix
@@ -4,8 +4,10 @@
   kernelModuleMakeFlags,
   libajantv2,
 }:
-stdenv.mkDerivation {
-  name = "ajantv2-module-${libajantv2.version}-${kernel.version}";
+stdenv.mkDerivation (finalAttrs: {
+  name = "${finalAttrs.version}-${finalAttrs.version}-${kernel.version}";
+  pname = "ajantv2-module";
+  version = libajantv2.version;
 
   inherit (libajantv2) src;
   sourceRoot = "${libajantv2.src.name}/driver/linux";
@@ -46,4 +48,4 @@ stdenv.mkDerivation {
     # FTB for hardened 5.10/5.15 kernels
     broken = kernel.kernelOlder "6" && kernel.isHardened;
   };
-}
+})

From ae79b56f40f4d75e8988f962af1820e444cb3cf4 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 03/26] linuxPackages.asus-ec-sensors: add pname

---
 pkgs/os-specific/linux/asus-ec-sensors/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/asus-ec-sensors/default.nix b/pkgs/os-specific/linux/asus-ec-sensors/default.nix
index 08f3e367f8cc..65aad572b638 100644
--- a/pkgs/os-specific/linux/asus-ec-sensors/default.nix
+++ b/pkgs/os-specific/linux/asus-ec-sensors/default.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "asus-ec-sensors-${version}-${kernel.version}";
+  name = "${pname}-${version}-${kernel.version}";
+  pname = "asus-ec-sensors";
   version = "0.1.0-unstable-2025-12-11";
 
   src = fetchFromGitHub {

From d7c5da760e59e574ef39eb8585f911426a8ed457 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 04/26] linuxPackages.bbswitch: add pname and version

---
 pkgs/os-specific/linux/bbswitch/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index 7b0a04c1e52b..6d55fe64d23b 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -8,15 +8,10 @@
   runtimeShell,
 }:
 
-let
-  baseName = "bbswitch";
+stdenv.mkDerivation (finalAttrs: {
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
+  pname = "bbswitch";
   version = "unstable-2021-11-29";
-  name = "${baseName}-${version}-${kernel.version}";
-
-in
-
-stdenv.mkDerivation {
-  inherit name;
 
   src = fetchFromGitHub {
     owner = "Bumblebee-Project";
@@ -72,4 +67,4 @@ stdenv.mkDerivation {
     maintainers = [ ];
     license = lib.licenses.gpl2Plus;
   };
-}
+})

From 882ffd7ebcf1d6fdd1bfa90f0a83ae9f1dc11628 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 05/26] linuxPackages.broadcom_sta: add pname and version

---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 54b0c8de54a9..c2d8b0cfacb6 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -65,8 +65,10 @@ let
     "wl-kmod-035_kernel_6.17_adaptation_fix_functions_prototypes.patch"
   ];
 in
-stdenv.mkDerivation {
-  name = "broadcom-sta-${version}-${release}-${kernel.version}";
+stdenv.mkDerivation (finalAttrs: {
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${release}-${kernel.version}";
+  pname = "broadcom-sta";
+  inherit version;
 
   src = fetchurl {
     url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}";
@@ -123,4 +125,4 @@ stdenv.mkDerivation {
       )
     ];
   };
-}
+})

From 6af75ec62910be7da9965577b5c622dbdd78d34e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 06/26] linuxPackages.ena: add pname

---
 pkgs/os-specific/linux/ena/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index 6957307b89b0..be0718d9b5dd 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -8,16 +8,16 @@
 }:
 let
   rev-prefix = "ena_linux_";
-  version = "2.16.0";
 in
-stdenv.mkDerivation {
-  inherit version;
-  name = "ena-${version}-${kernel.version}";
+stdenv.mkDerivation (finalAttrs: {
+  version = "2.16.0";
+  pname = "ena";
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "amzn-drivers";
-    rev = "${rev-prefix}${version}";
+    rev = "${rev-prefix}${finalAttrs.version}";
     hash = "sha256-7gPo3wPMpKPOkmZJzzpt0GdCdX/1N/Xqty1Hg+fQQlU=";
   };
 
@@ -59,4 +59,4 @@ stdenv.mkDerivation {
     ];
     platforms = lib.platforms.linux;
   };
-}
+})

From a2f5e39457970f82190214cb45477009d2433c0b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 07/26] linuxPackages.facetimehd: add pname

---
 pkgs/os-specific/linux/facetimehd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
index ccb2f71e0210..20293d82745c 100644
--- a/pkgs/os-specific/linux/facetimehd/default.nix
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "facetimehd-${version}-${kernel.version}";
+  name = "${pname}-${version}-${kernel.version}";
+  pname = "facetimehd";
   version = "0.6.13";
 
   # Note: When updating this revision:

From d6b334f5ffadacff940f510d76a5e55312c002be Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 08/26] linuxPackages.isgx: add pname

---
 pkgs/os-specific/linux/isgx/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/isgx/default.nix b/pkgs/os-specific/linux/isgx/default.nix
index 332e682bee2b..df9b51f9e65c 100644
--- a/pkgs/os-specific/linux/isgx/default.nix
+++ b/pkgs/os-specific/linux/isgx/default.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "isgx-${version}-${kernel.version}";
+  name = "${pname}-${version}-${kernel.version}";
+  pname = "isgx";
   version = "2.14";
 
   src = fetchFromGitHub {

From 2147e64687dfe1d319ab5b37cab42170e3b0ef3a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 09/26] linuxPackages.it87: add pname

---
 pkgs/os-specific/linux/it87/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/it87/default.nix b/pkgs/os-specific/linux/it87/default.nix
index 005399e7200f..43c923e53506 100644
--- a/pkgs/os-specific/linux/it87/default.nix
+++ b/pkgs/os-specific/linux/it87/default.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "it87-${version}-${kernel.version}";
+  name = "${pname}-${version}-${kernel.version}";
+  pname = "it87";
   version = "unstable-2024-06-09";
 
   # Original is no longer maintained.

From 7854a0e7231e6a031b8de1c2cb0681b662f5b4e0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 10/26] linuxPackages.ixgbevf: add pname

---
 pkgs/os-specific/linux/ixgbevf/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix
index 6a299d97dea5..91d90d22fed1 100644
--- a/pkgs/os-specific/linux/ixgbevf/default.nix
+++ b/pkgs/os-specific/linux/ixgbevf/default.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ixgbevf-${version}-${kernel.version}";
+  name = "${pname}-${version}-${kernel.version}";
+  pname = "ixgbevf";
   version = "4.6.1";
 
   src = fetchurl {

From 51fb91b5c457db64ec425876045e6a9d579fe70a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 11/26] linuxPackages.jool: add pname and version

---
 pkgs/os-specific/linux/jool/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix
index b9694444867a..bd705872a474 100644
--- a/pkgs/os-specific/linux/jool/default.nix
+++ b/pkgs/os-specific/linux/jool/default.nix
@@ -12,8 +12,10 @@ let
   sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
 in
 
-stdenv.mkDerivation {
-  name = "jool-${sourceAttrs.version}-${kernel.version}";
+stdenv.mkDerivation (finalAttrs: {
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
+  pname = "jool";
+  inherit (sourceAttrs) version;
 
   src = sourceAttrs.src;
 
@@ -49,4 +51,4 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fpletz ];
   };
-}
+})

From 669e4866cc9c27ea23a09efa2610172d6dbfb96d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 12/26] linuxPackages.liquidtux: add pname

---
 pkgs/os-specific/linux/liquidtux/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/liquidtux/default.nix b/pkgs/os-specific/linux/liquidtux/default.nix
index 5b29487d4112..e604c8acd775 100644
--- a/pkgs/os-specific/linux/liquidtux/default.nix
+++ b/pkgs/os-specific/linux/liquidtux/default.nix
@@ -7,7 +7,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "liquidtux-${version}-${kernel.version}";
+  name = "${pname}-${version}-${kernel.version}";
+  pname = "liquidtux";
   version = "0.1.0-unstable-2025-01-16";
 
   src = fetchFromGitHub {

From ffe4a06d89cf202de7594b41817962473d8711dd Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 13/26] linuxPackages.ndiswrapper: add pname

---
 pkgs/os-specific/linux/ndiswrapper/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index 270dfa993024..fd8438acf2c3 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -7,12 +7,11 @@
   kmod,
   elfutils,
 }:
-let
+
+stdenv.mkDerivation (finalAttrs: {
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
+  pname = "ndiswrapper";
   version = "1.63";
-in
-stdenv.mkDerivation {
-  name = "ndiswrapper-${version}-${kernel.version}";
-  inherit version;
 
   hardeningDisable = [ "pic" ];
 
@@ -38,7 +37,7 @@ stdenv.mkDerivation {
   '';
 
   src = fetchurl {
-    url = "mirror://sourceforge/ndiswrapper/files/stable/ndiswrapper-${version}.tar.gz";
+    url = "mirror://sourceforge/ndiswrapper/files/stable/ndiswrapper-${finalAttrs.version}.tar.gz";
     sha256 = "1v6b66jhisl110jfl00hm43lmnrav32vs39d85gcbxrjqnmcx08g";
   };
 
@@ -57,4 +56,4 @@ stdenv.mkDerivation {
     ];
     broken = lib.versionAtLeast kernel.version "5.8";
   };
-}
+})

From 7965a3cb0233cbf301e948902bf8e6e13baff0e3 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 14/26] linuxPackages.nvidia_x11: add pname

---
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index ecc245e5a81d..7c6469672a34 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -143,7 +143,8 @@ let
 in
 
 stdenv.mkDerivation (finalAttrs: {
-  name = "nvidia-${if useFabricmanager then "dc" else "x11"}-${version}${nameSuffix}";
+  name = "${finalAttrs.pname}-${finalAttrs.version}${nameSuffix}";
+  pname = "nvidia-${if useFabricmanager then "dc" else "x11"}";
 
   builder = ./builder.sh;
 

From 21d33e77771235eca72a59bfe81e84c3f68f3295 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 15/26] linuxPackages.nvidiabl: add pname

---
 pkgs/os-specific/linux/nvidiabl/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix
index c9921629191c..c031bf82cf08 100644
--- a/pkgs/os-specific/linux/nvidiabl/default.nix
+++ b/pkgs/os-specific/linux/nvidiabl/default.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nvidiabl-${version}-${kernel.version}";
+  name = "${pname}-${version}-${kernel.version}";
+  pname = "nvidiabl";
   version = "2020-10-01";
 
   # We use a fork which adds support for newer kernels -- upstream has been abandoned.

From e12d7f984b22dc374badbe5036597cbdb30df921 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 16/26] linuxPackages.r8168: add pname

---
 pkgs/os-specific/linux/r8168/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix
index 703a33868906..7c82b1cbb28c 100644
--- a/pkgs/os-specific/linux/r8168/default.nix
+++ b/pkgs/os-specific/linux/r8168/default.nix
@@ -11,7 +11,8 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "r8168-${kernel.version}-${version}";
+  name = "${pname}-${version}-${kernel.version}";
+  pname = "r8168";
   # on update please verify that the source matches the realtek version
   version = "8.055.00";
 

From 6e0d9cff65550711f29c44dc9d9ddc49035d8416 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 17/26] linuxPackages.rtl8189es: add pname

---
 pkgs/os-specific/linux/rtl8189es/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix
index a6a2345f2c06..19ce8e60a490 100644
--- a/pkgs/os-specific/linux/rtl8189es/default.nix
+++ b/pkgs/os-specific/linux/rtl8189es/default.nix
@@ -9,7 +9,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rtl8189es-${kernel.version}-${version}";
+  name = "${pname}-${version}-${kernel.version}";
+  pname = "rtl8189es";
   version = "2025-09-26";
 
   src = fetchFromGitHub {

From acd223ce236824d501a2c574dbb8dbb17a042640 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 18/26] linuxPackages.rtl8189fs: add pname

---
 pkgs/os-specific/linux/rtl8189fs/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/rtl8189fs/default.nix b/pkgs/os-specific/linux/rtl8189fs/default.nix
index 8c36baaeca9c..76ab17ac0365 100644
--- a/pkgs/os-specific/linux/rtl8189fs/default.nix
+++ b/pkgs/os-specific/linux/rtl8189fs/default.nix
@@ -7,7 +7,8 @@
 
 # rtl8189fs is a branch of the rtl8189es driver
 rtl8189es.overrideAttrs (drv: rec {
-  name = "rtl8189fs-${kernel.version}-${version}";
+  name = "${pname}-${version}-${kernel.version}";
+  pname = "rtl8189fs";
   version = "2025-09-26";
 
   src = fetchFromGitHub {

From 41475715c1d01b3e22db45df0c71cec4461148ef Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 19/26] linuxPackages.sheep-net: add pname

---
 pkgs/os-specific/linux/sheep-net/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/sheep-net/default.nix b/pkgs/os-specific/linux/sheep-net/default.nix
index 115e73b1eb35..61083960b102 100644
--- a/pkgs/os-specific/linux/sheep-net/default.nix
+++ b/pkgs/os-specific/linux/sheep-net/default.nix
@@ -6,7 +6,8 @@
   lib,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  name = "sheep_net";
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
+  pname = "sheep_net";
   version = basiliskii.version;
   src = basiliskii.src;
   sourceRoot = "${finalAttrs.src.name}/BasiliskII/src/Unix/Linux/NetDriver";

From 1642df1ce0947a4d8b87f94cacb7dbddf9b604d9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 20/26] linuxPackages.shufflecake: add pname

---
 pkgs/os-specific/linux/shufflecake/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix
index c087b0c55382..be3f42e09e5b 100644
--- a/pkgs/os-specific/linux/shufflecake/default.nix
+++ b/pkgs/os-specific/linux/shufflecake/default.nix
@@ -8,7 +8,8 @@
   lvm2,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  name = "shufflecake";
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
+  pname = "shufflecake";
   version = "0.5.5";
 
   src = fetchFromGitea {

From 15849548a0787ad092393e9e9c46ce04eeb8d328 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 21/26] linuxPackages.system76: add pname and version

---
 pkgs/os-specific/linux/system76/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix
index 191167473ce7..aaf33eb2eff4 100644
--- a/pkgs/os-specific/linux/system76/default.nix
+++ b/pkgs/os-specific/linux/system76/default.nix
@@ -6,18 +6,19 @@
   kernelModuleMakeFlags,
 }:
 let
-  version = "1.0.17";
   hash = "sha256-9/t+Mvfnq0KkPbe1mnrVy4mzNaK7vAgLuhUnOeEvBfI=";
 in
-stdenv.mkDerivation {
-  name = "system76-module-${version}-${kernel.version}";
+stdenv.mkDerivation (finalAttrs: {
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
+  pname = "system76-module";
+  version = "1.0.17";
 
   passthru.moduleName = "system76";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-dkms";
-    rev = version;
+    rev = finalAttrs.version;
     inherit hash;
   };
 
@@ -51,4 +52,4 @@ stdenv.mkDerivation {
       some of the hotkeys and allows for custom fan control.
     '';
   };
-}
+})

From da4f38543c1da80aadf151d71f5a68558bdc4919 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 22/26] linuxPackages.system76-acpi: add pname

---
 pkgs/os-specific/linux/system76-acpi/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix
index 40c8fb09165a..181695a948ed 100644
--- a/pkgs/os-specific/linux/system76-acpi/default.nix
+++ b/pkgs/os-specific/linux/system76-acpi/default.nix
@@ -5,7 +5,8 @@
   kernel,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  name = "system76-acpi-module-${finalAttrs.version}-${kernel.version}";
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
+  pname = "system76-acpi-module";
   version = "1.0.2";
 
   passthru.moduleName = "system76_acpi";

From 7c28d97d287e7aa50d3ac6bf7a2b9f238e456fd9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 23/26] linuxPackages.system76-io: add pname and version

---
 pkgs/os-specific/linux/system76-io/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix
index 06c37a1475f2..c3c6bd0c7dce 100644
--- a/pkgs/os-specific/linux/system76-io/default.nix
+++ b/pkgs/os-specific/linux/system76-io/default.nix
@@ -6,18 +6,19 @@
   kernelModuleMakeFlags,
 }:
 let
-  version = "1.0.4";
   hash = "sha256-VE6sCehjXlRuOVcK4EN2H+FhaVaBi/jrAYx4TZjbreA=";
 in
-stdenv.mkDerivation {
-  name = "system76-io-module-${version}-${kernel.version}";
+stdenv.mkDerivation (finalAttrs: {
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
+  pname = "system76-io-module";
+  version = "1.0.4";
 
   passthru.moduleName = "system76_io";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "system76-io-dkms";
-    rev = version;
+    rev = finalAttrs.version;
     inherit hash;
   };
 
@@ -48,4 +49,4 @@ stdenv.mkDerivation {
     description = "DKMS module for controlling System76 Io board";
     homepage = "https://github.com/pop-os/system76-io-dkms";
   };
-}
+})

From a23908e6311006219d1042371540d3a64f40c620 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 24/26] linuxPackages.tp_smapi: add pname

---
 pkgs/os-specific/linux/tp_smapi/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index be403267f9aa..799c252a684f 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  name = "tp_smapi-${finalAttrs.version}-${kernel.version}";
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
+  pname = "tp_smapi";
   version = "0.45";
 
   src = fetchFromGitHub {

From 1d46e19fcf43b2ed98c90bf5fbdfbca0c21ebeeb Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 25/26] linuxPackages.usbip: add pname and version

---
 pkgs/os-specific/linux/usbip/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix
index 4f03d9377fde..9e5e4f6bfc91 100644
--- a/pkgs/os-specific/linux/usbip/default.nix
+++ b/pkgs/os-specific/linux/usbip/default.nix
@@ -11,7 +11,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "usbip-${kernel.name}";
+  pname = "usbip-${kernel.pname}";
+  version = kernel.version;
 
   src = kernel.src;
 

From 9f803160ebca08fde250d1f3fc2df1409f9cf579 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 13 Jan 2026 21:05:13 +0100
Subject: [PATCH 26/26] linuxPackages.virtio_vmmci: add pname

---
 pkgs/os-specific/linux/virtio_vmmci/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix
index a14808e85403..5d635e95892f 100644
--- a/pkgs/os-specific/linux/virtio_vmmci/default.nix
+++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix
@@ -6,14 +6,15 @@
   kernelModuleMakeFlags,
 }:
 
-stdenv.mkDerivation rec {
-  name = "virtio_vmmci";
+stdenv.mkDerivation (finalAttrs: {
+  name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}";
+  pname = "virtio_vmmci";
   version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "voutilad";
     repo = "virtio_vmmci";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-h8yu4+vTgpAD+sKa1KnVD+qubiIlkYtG2nmQnXOi/sk=";
   };
 
@@ -43,4 +44,4 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-}
+})