From 7560f8eea5fb2092e1c93ca0e5f1f8c421e06830 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Feb 2023 23:45:59 +0000 Subject: [PATCH] linuxPackages.exfat-nofuse: set to null when unsupported This is the same thing every other obsolete kernel module does, and it's better than an assertion because an assertion prevents testing evaluation of all the modules for a particular kernel. --- pkgs/os-specific/linux/exfat/default.nix | 5 ----- pkgs/top-level/linux-kernels.nix | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index ee6f448112d8..3d2445df4980 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -1,11 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, kernel }: stdenv.mkDerivation rec { - # linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27 - # Assertion moved here due to some tests unintenionally triggering it, - # e.g. nixosTests.kernel-latest; it's unclear how/why so far. - assertion = assert lib.versionOlder kernel.version "5.8"; null; - name = "exfat-nofuse-${version}-${kernel.version}"; version = "2020-04-15"; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a00dd9f0acb9..fa83d6c925fc 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -327,7 +327,7 @@ in { dpdk = pkgs.dpdk.override { inherit kernel; }; - exfat-nofuse = callPackage ../os-specific/linux/exfat { }; + exfat-nofuse = if lib.versionOlder kernel.version "5.8" then callPackage ../os-specific/linux/exfat { } else null; evdi = callPackage ../os-specific/linux/evdi { };