diff options
author | Tim Steinbach <tim@nequissimus.com> | 2018-06-04 14:12:03 -0400 |
---|---|---|
committer | Tim Steinbach <tim@nequissimus.com> | 2018-06-04 14:12:03 -0400 |
commit | 39444569e0c6e96bceea74840762202e0e968f32 (patch) | |
tree | c1237eefa1b331a75e1e912a04e250689af5c6e7 | |
parent | 5c4a404b0d0e5125070dde5c1787210149157e83 (diff) | |
download | nixlib-39444569e0c6e96bceea74840762202e0e968f32.tar nixlib-39444569e0c6e96bceea74840762202e0e968f32.tar.gz nixlib-39444569e0c6e96bceea74840762202e0e968f32.tar.bz2 nixlib-39444569e0c6e96bceea74840762202e0e968f32.tar.lz nixlib-39444569e0c6e96bceea74840762202e0e968f32.tar.xz nixlib-39444569e0c6e96bceea74840762202e0e968f32.tar.zst nixlib-39444569e0c6e96bceea74840762202e0e968f32.zip |
linux: Add 4.17
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.17.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
2 files changed, 31 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix new file mode 100644 index 000000000000..b360e98f0c09 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "4.17"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "04yd7hnsdyaq4xmrgg7509qjf09k1dy6k1p8qqfrdspajvc1valz"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cf0e2e9e384..f79e38a41d08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13526,6 +13526,17 @@ with pkgs; ]; }; + linux_4_17 = callPackage ../os-specific/linux/kernel/linux-4.17.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # 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 + kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16! + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -13711,7 +13722,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_16; + linuxPackages_latest = linuxPackages_4_17; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -13722,6 +13733,7 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_16); + linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. |