From 6bcf40e1a8f3da97ba3b8959107962a3a4efb359 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 7 Dec 2021 06:20:59 +0200 Subject: [PATCH 1/2] kmod: switch the priority of module dirs make "/run/booted-system/kernel-modules" be searched first Fixes https://github.com/NixOS/nixpkgs/issues/146383 modprobe: ERROR: could not insert 'zram': Invalid argument (cherry picked from commit 453968c01aac3c426d51027dc20b27c9d92da07f) --- pkgs/os-specific/linux/kmod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 2cb263854ab8..d6cfe36cf0f8 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -4,7 +4,7 @@ }: let - systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ]; + systems = [ "/run/booted-system/kernel-modules" "/run/current-system/kernel-modules" "" ]; modulesDirs = lib.concatMapStringsSep ":" (x: "${x}/lib/modules") systems; in stdenv.mkDerivation rec { From e3624bed49c1a5c682863ab370d8b6c348c39826 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 8 Dec 2021 02:56:40 +0200 Subject: [PATCH 2/2] kmod: add myself(artturin) as a maintainer (cherry picked from commit 86ae2154c2942d00f087c4fc3bee30998822d526) --- pkgs/os-specific/linux/kmod/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index d6cfe36cf0f8..a1a1906ba9ce 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -52,5 +52,6 @@ in stdenv.mkDerivation rec { changelog = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/plain/NEWS?h=v${version}"; license = with licenses; [ lgpl21Plus gpl2Plus ]; # GPLv2+ for tools platforms = platforms.unix; + maintainers = with maintainers; [ artturin ]; }; }