From 454dc9ae45e8377496dce3b3c970fc44831dc9de Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Mon, 9 Nov 2020 15:18:32 +0100 Subject: [PATCH] linux_5_9: remove Linux 5.9.x is in upstream now, thus remove. We continue pointing linuxPackages_latest to linux_5_9, though, since this still points to linux_5_8 upstream. --- default.nix | 8 -------- pkgs/linux/linux-5.9.nix | 18 ------------------ 2 files changed, 26 deletions(-) delete mode 100644 pkgs/linux/linux-5.9.nix diff --git a/default.nix b/default.nix index 2bec233..ec6ecee 100644 --- a/default.nix +++ b/default.nix @@ -10,14 +10,6 @@ with self; rec { janus-gateway = callPackage ./pkgs/janus-gateway { }; - linux_5_9 = callPackage ./pkgs/linux/linux-5.9.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export_kernel_fpu_functions."5.3" - ]; - }; - linuxPackages_5_9 = recurseIntoAttrs (linuxPackagesFor linux_5_9); linuxPackages_latest = linuxPackages_5_9; nextcloud-spreed-signaling = callPackage ./pkgs/nextcloud-spreed-signaling { }; diff --git a/pkgs/linux/linux-5.9.nix b/pkgs/linux/linux-5.9.nix deleted file mode 100644 index 59f18ba..0000000 --- a/pkgs/linux/linux-5.9.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.9.6"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0w2kcng09nzk09dwkx4azdfgnwzbd2mz8lyl4j69bwx837z85hbc"; - }; -} // (args.argsOverride or {}))