Merge pull request #184508 from alyssais/xmm7360-pci

linuxPackages.xmm7360-pci: respect allowAliases
This commit is contained in:
Florian Klink 2022-08-01 22:28:44 +07:00 committed by GitHub
commit d393d6ce22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -483,8 +483,6 @@ in {
x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };
xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";
xone = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/xone { } else null; xone = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/xone { } else null;
xpadneo = callPackage ../os-specific/linux/xpadneo { }; xpadneo = callPackage ../os-specific/linux/xpadneo { };
@ -507,6 +505,7 @@ in {
} // lib.optionalAttrs config.allowAliases { } // lib.optionalAttrs config.allowAliases {
ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18";
}); });
hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides); hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides);