From c536a3fa2fd42f46c0cb15e17a74f060a4a8f63c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 4 Sep 2016 18:32:08 +0300 Subject: [PATCH] linuxPackages_testing: Don't recurseIntoAttrs The -rc kernels are quite likely to break out-of-tree modules and thus cause unnecessary Hydra failures. (Note that linux_testing already has `hydraPlatforms = [];` but that does not prevent the package from being built since it has reverse dependencies. Arguably that could be considered undesirable and thus fixing that could be considered the proper fix, but this should do for now.) --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80ebc852a5fe..dfd94e1fb29b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11408,7 +11408,10 @@ in linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6); linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7); # Don't forget to update linuxPackages_latest! - linuxPackages_testing = recurseIntoAttrs (self.linuxPackagesFor self.linux_testing linuxPackages_testing); + + # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. + linuxPackages_testing = self.linuxPackagesFor self.linux_testing linuxPackages_testing; + linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (self.linuxPackagesFor (self.linuxManualConfig {inherit version src configfile; allowImportFromDerivation=true;})