From b46ebdd6070714a9b7f2082f9c5f41a79819ce31 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 20 Oct 2026 15:22:08 -0400 Subject: [PATCH 1/3] linuxPackages: Add DEPMOD=true to kernelModuleMakeFlags --- nixos/tests/kernel-module-verification.nix | 1 - pkgs/os-specific/linux/amneziawg/default.nix | 1 - pkgs/os-specific/linux/netatop/fix-makefile-install.patch | 2 +- pkgs/os-specific/linux/virtio_vmmci/default.nix | 1 - pkgs/os-specific/linux/vmm_clock/default.nix | 1 - pkgs/top-level/linux-kernels.nix | 1 + 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/tests/kernel-module-verification.nix b/nixos/tests/kernel-module-verification.nix index d7c37e694cf7..89ee916dc499 100644 --- a/nixos/tests/kernel-module-verification.nix +++ b/nixos/tests/kernel-module-verification.nix @@ -24,7 +24,6 @@ let "M=$(PWD)" "INSTALL_MOD_PATH=${placeholder "out"}" - "DEPMOD=true" ] ++ kernelModuleMakeFlags; diff --git a/pkgs/os-specific/linux/amneziawg/default.nix b/pkgs/os-specific/linux/amneziawg/default.nix index fb7c55b4ac31..0e1da0c4d875 100644 --- a/pkgs/os-specific/linux/amneziawg/default.nix +++ b/pkgs/os-specific/linux/amneziawg/default.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; installFlags = [ - "DEPMOD=true" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/netatop/fix-makefile-install.patch b/pkgs/os-specific/linux/netatop/fix-makefile-install.patch index 90f23daf2954..eb2c22e754b9 100644 --- a/pkgs/os-specific/linux/netatop/fix-makefile-install.patch +++ b/pkgs/os-specific/linux/netatop/fix-makefile-install.patch @@ -8,7 +8,7 @@ diff --color -ruN netatop-3.2.2.orig/Makefile netatop-3.2.2/Makefile - cd /usr/src; dkms add -m netatop -v $(CURVERS) - dkms build -m netatop -v $(CURVERS) - dkms install -m netatop -v $(CURVERS) -+ $(MAKE) -C $(KERNDIR) M=$(THISDIR) modules_install INSTALL_MOD_PATH=$(out) INSTALL_MOD_DIR=extra DEPMOD=true ++ $(MAKE) -C $(KERNDIR) M=$(THISDIR) modules_install INSTALL_MOD_PATH=$(out) INSTALL_MOD_DIR=extra # - install netatopd -t /usr/sbin - install -m 0644 netatop.service -t /lib/systemd/system diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index 5d635e95892f..55f3babc49f3 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation (finalAttrs: { ''; makeFlags = kernelModuleMakeFlags ++ [ - "DEPMOD=echo" "INSTALL_MOD_PATH=$(out)" "KERNELRELEASE=${kernel.modDirVersion}" "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix index eacf4352a762..57ec2249d033 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { ''; makeFlags = kernelModuleMakeFlags ++ [ - "DEPMOD=echo" "INSTALL_MOD_PATH=$(out)" "KERNELRELEASE=${kernel.modDirVersion}" "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3e448016d2a6..f2e3f3a2c812 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -239,6 +239,7 @@ in inherit (kernel) kernelOlder kernelAtLeast; kernelModuleMakeFlags = self.kernel.commonMakeFlags ++ [ "KBUILD_OUTPUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "DEPMOD=true" ]; # Obsolete aliases (these packages do not depend on the kernel). inherit (pkgs) odp-dpdk pktgen; # added 2018-05 From ff3b622b9b36e5c69b18e69434a55c4d3edd2a8e Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 20 Oct 2026 15:22:08 -0400 Subject: [PATCH 2/3] linuxPackages: Add INSTALL_MOD_STRIP=1 to kernelModuleMakeFlags --- pkgs/os-specific/linux/nvidia-x11/kernel-modules.nix | 1 - pkgs/top-level/linux-kernels.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/kernel-modules.nix b/pkgs/os-specific/linux/nvidia-x11/kernel-modules.nix index 1ba5815aa381..9e6998017f87 100644 --- a/pkgs/os-specific/linux/nvidia-x11/kernel-modules.nix +++ b/pkgs/os-specific/linux/nvidia-x11/kernel-modules.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation { ]; buildTargets = [ "modules" ]; - installFlags = [ "INSTALL_MOD_STRIP=1" ]; installTargets = [ "modules_install" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index f2e3f3a2c812..a91b74e41b09 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -240,6 +240,7 @@ in kernelModuleMakeFlags = self.kernel.commonMakeFlags ++ [ "KBUILD_OUTPUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "DEPMOD=true" + "INSTALL_MOD_STRIP=1" ]; # Obsolete aliases (these packages do not depend on the kernel). inherit (pkgs) odp-dpdk pktgen; # added 2018-05 From 4c2edecc43ffdb7b8d1ae80a2872e436fdd34b67 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 21 Oct 2026 21:09:26 -0400 Subject: [PATCH 3/3] aggregateModules: Restrict pathsToLink It's not *entirely* clear if `depmod.d` is actually something we want here, but it has always been possible for module packages to add files to this, and conceptually it makes at least *some* sense, so let's leave it. --- pkgs/os-specific/linux/kmod/aggregator.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix index ad7d3b330b7d..c32e4177e581 100644 --- a/pkgs/os-specific/linux/kmod/aggregator.nix +++ b/pkgs/os-specific/linux/kmod/aggregator.nix @@ -11,6 +11,11 @@ buildEnv { paths = modules; + pathsToLink = [ + "/lib/modules" + "/etc/depmod.d" + ]; + postBuild = '' source ${stdenvNoCC}/setup