From cdd6211abba5bc20248fd16da8f1da6af2fcdee0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 20 Mar 2023 11:07:02 +0000 Subject: [PATCH] linux_testing_bcachefs: fix meta kernel.override overrides the invocation of buildLinux, not the function in the file that defines the specific kernel version, so we need to pass the arguments that buildLinux expects. --- .../linux/kernel/linux-testing-bcachefs.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 115d8ad93149..39cb461c87e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -12,14 +12,12 @@ # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility (kernel.override ( args // { - argsOverride = { - version = "${kernel.version}-bcachefs-unstable-${commitDate}"; + version = "${kernel.version}-bcachefs-unstable-${commitDate}"; - extraMeta = { - branch = "master"; - maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ]; - }; - } // argsOverride; + extraMeta = { + branch = "master"; + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ]; + }; kernelPatches = [ { name = "bcachefs-${currentCommit}";