linuxPackages: use pname and version instead of name (#365953)

2026-09-28 02:40:50 +00:00 · 2026-01-14 21:34:59 +00:00
parent 8726c99b7d 9f803160eb
commit bfda2aebb2
26 changed files with 81 additions and 62 deletions
--- 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;
  }
  (
    ''
--- 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;
  };
-}
+})
--- 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 {
--- 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;
  };
-}
+})
--- 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 {
      )
    ];
  };
-}
+})
--- 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;
  };
-}
+})
--- 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:
--- 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 {
--- 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.
--- 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 {
--- 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 ];
  };
-}
+})
--- 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 {
--- 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";
  };
-}
+})
--- 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;

--- 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.
--- 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";

--- 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 {
--- 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 {
--- 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";
--- 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 {
--- 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";
--- 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";
  };
-}
+})
--- 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.
    '';
  };
-}
+})
--- 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 {
--- 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;

--- 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;
-}
+})