From 74857c9dceb5114bc1dc78d67451c2209b38773e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 4 Dec 2017 09:59:11 +0800 Subject: [PATCH] Revert "linux_4_13: Remove, no longer supported." This reverts commit b39ab30ba7aebb9b148d6edab20c5927982e5ba5. There are some show stopper issues in the 4.14 kernel that are still not resolved. https://github.com/NixOS/nixpkgs/issues/31640 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.13.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix new file mode 100644 index 000000000000..72ae02bbecde --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -0,0 +1,11 @@ +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.13.16"; + extraMeta.branch = "4.13"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "0cf7prqzl1ajbgl98w0symdyn0k5wl5xaf1l5ldgy6l083yg69dh"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd429f8645da..f549e571abe5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12576,6 +12576,22 @@ with pkgs; ]; }; + linux_4_13 = callPackage ../os-specific/linux/kernel/linux-4.13.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12787,6 +12803,7 @@ with pkgs; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); + linuxPackages_4_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_13); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); # Don't forget to update linuxPackages_latest!