summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/manual-config.nix
diff options
context:
space:
mode:
authorAtemu <atemu.main@gmail.com>2021-11-07 12:07:14 +0100
committerAlyssa Ross <hi@alyssa.is>2021-11-22 02:11:16 +0000
commit8d0f1c1725a1b2ab34f401cf1b7fda1fc5bf60e6 (patch)
treeb27eadd78a0bb1feefc3312a0b6b36a0d6c0f60a /pkgs/os-specific/linux/kernel/manual-config.nix
parent712db36fa2c30e0fda89d997753708df69ddbdbe (diff)
downloadnixpkgs-8d0f1c1725a1b2ab34f401cf1b7fda1fc5bf60e6.tar
nixpkgs-8d0f1c1725a1b2ab34f401cf1b7fda1fc5bf60e6.tar.gz
nixpkgs-8d0f1c1725a1b2ab34f401cf1b7fda1fc5bf60e6.tar.bz2
nixpkgs-8d0f1c1725a1b2ab34f401cf1b7fda1fc5bf60e6.tar.lz
nixpkgs-8d0f1c1725a1b2ab34f401cf1b7fda1fc5bf60e6.tar.xz
nixpkgs-8d0f1c1725a1b2ab34f401cf1b7fda1fc5bf60e6.tar.zst
nixpkgs-8d0f1c1725a1b2ab34f401cf1b7fda1fc5bf60e6.zip
kernel: compare version against the base version
This makes it so that 5.10.1 > 5.10-rc5
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 51ab51fb83c..4f12337c893 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -97,13 +97,14 @@ let
         (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) &&
         (lib.versionOlder version "4.14");
     in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {
-      passthru = {
+      passthru = rec {
         inherit version modDirVersion config kernelPatches configfile
           moduleBuildDependencies stdenv;
         inherit isZen isHardened isLibre;
         isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
-        kernelOlder = lib.versionOlder version;
-        kernelAtLeast = lib.versionAtLeast version;
+        baseVersion = lib.head (lib.splitString "-rc" version);
+        kernelOlder = lib.versionOlder baseVersion;
+        kernelAtLeast = lib.versionAtLeast baseVersion;
       };
 
       inherit src;