bcachefs: fix version not showing correctly

buildLinux doesn't provide argsOverride by default.

Prior to 663caaa, a default kernel was replaced with a direct invocation
to buildLinux, this broke the use of argsOverride, in 663caaa, the use
of argsOverride was removed, and then later the invocation of buildLinux
was replaced with vanilla linux kernel that required argsOverride
which then rebroke things again.

Recommend either: put argsOverride inside buildLinux, or replace it with
something less confusing to maintainers.

authored by Daniel Hill and committed by Jörg Thalheim 1048867f d6bf8b47

+14 -7
+14 -7
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
··· 10 , argsOverride ? {} 11 , ... 12 } @ args: 13 - 14 # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility 15 (kernel.override ( args // { 16 - version = "${kernel.version}-bcachefs-unstable-${version.date}"; 17 18 - extraMeta = { 19 - branch = "master"; 20 - broken = stdenv.isAarch64; 21 - maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius YellowOnion ]; 22 - }; 23 24 structuredExtraConfig = with lib.kernel; { 25 BCACHEFS_FS = module; 26 BCACHEFS_QUOTA = option yes; 27 BCACHEFS_POSIX_ACL = option yes;
··· 10 , argsOverride ? {} 11 , ... 12 } @ args: 13 + let localversion = "-bcachefs-unstable-${version.date}"; 14 + in 15 # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility 16 (kernel.override ( args // { 17 + 18 + argsOverride = { 19 + version = "${kernel.version}${localversion}"; 20 + modDirVersion = "${kernel.version}${localversion}"; 21 22 + extraMeta = { 23 + homepage = "https://bcachefs.org/"; 24 + branch = "master"; 25 + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius YellowOnion ]; 26 + }; 27 + } // argsOverride; 28 29 structuredExtraConfig = with lib.kernel; { 30 + # we need this for uname 31 + LOCALVERSION = freeform localversion; 32 BCACHEFS_FS = module; 33 BCACHEFS_QUOTA = option yes; 34 BCACHEFS_POSIX_ACL = option yes;