diff options
author | Daniel Hill <daniel@gluo.nz> | 2023-10-03 20:28:40 +1300 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2023-10-03 22:00:26 +0100 |
commit | 1048867fe06f9473a51a7d33e95aaf5b0fefc0cc (patch) | |
tree | 2aa8c9e00f366777e7e4f3ae0890ff14ee406e5d /pkgs/os-specific/linux/kernel | |
parent | d6bf8b47ece5ed435cc0e66725fc7afe0ee1550b (diff) | |
download | nixpkgs-1048867fe06f9473a51a7d33e95aaf5b0fefc0cc.tar nixpkgs-1048867fe06f9473a51a7d33e95aaf5b0fefc0cc.tar.gz nixpkgs-1048867fe06f9473a51a7d33e95aaf5b0fefc0cc.tar.bz2 nixpkgs-1048867fe06f9473a51a7d33e95aaf5b0fefc0cc.tar.lz nixpkgs-1048867fe06f9473a51a7d33e95aaf5b0fefc0cc.tar.xz nixpkgs-1048867fe06f9473a51a7d33e95aaf5b0fefc0cc.tar.zst nixpkgs-1048867fe06f9473a51a7d33e95aaf5b0fefc0cc.zip |
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.
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 21 |
1 files changed, 14 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 e0fb6c7c4e0..9709e698bfd 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -10,18 +10,25 @@ , argsOverride ? {} , ... } @ args: - +let localversion = "-bcachefs-unstable-${version.date}"; +in # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility (kernel.override ( args // { - version = "${kernel.version}-bcachefs-unstable-${version.date}"; - extraMeta = { - branch = "master"; - broken = stdenv.isAarch64; - maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius YellowOnion ]; - }; + argsOverride = { + version = "${kernel.version}${localversion}"; + modDirVersion = "${kernel.version}${localversion}"; + + extraMeta = { + homepage = "https://bcachefs.org/"; + branch = "master"; + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius YellowOnion ]; + }; + } // argsOverride; structuredExtraConfig = with lib.kernel; { + # we need this for uname + LOCALVERSION = freeform localversion; BCACHEFS_FS = module; BCACHEFS_QUOTA = option yes; BCACHEFS_POSIX_ACL = option yes; |