diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-03-20 11:07:02 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-03-20 12:28:48 +0000 |
| commit | cdd6211abba5bc20248fd16da8f1da6af2fcdee0 (patch) | |
| tree | 015e54d16480f5a2d57c73f8a973b2f43a9153f7 | |
| parent | linux_4_14_hardened: mark broken (diff) | |
| download | nixpkgs-cdd6211abba5bc20248fd16da8f1da6af2fcdee0.tar.gz | |
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.
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 12 |
1 files 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}"; |