about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2020-01-29 01:31:44 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2020-01-29 03:00:29 +0100
commitff54d08dc84474c0cac37116e33619dfa11747b0 (patch)
tree8636cb2fa1ee078ba14da04a3c4d34272a41a58c /pkgs
parent8336d65b961c30811ac4e76fb66eddb82eabcd3f (diff)
downloadnixlib-ff54d08dc84474c0cac37116e33619dfa11747b0.tar
nixlib-ff54d08dc84474c0cac37116e33619dfa11747b0.tar.gz
nixlib-ff54d08dc84474c0cac37116e33619dfa11747b0.tar.bz2
nixlib-ff54d08dc84474c0cac37116e33619dfa11747b0.tar.lz
nixlib-ff54d08dc84474c0cac37116e33619dfa11747b0.tar.xz
nixlib-ff54d08dc84474c0cac37116e33619dfa11747b0.tar.zst
nixlib-ff54d08dc84474c0cac37116e33619dfa11747b0.zip
linux_5_5: init at 5.5
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-5.5.nix18
-rw-r--r--pkgs/top-level/all-packages.nix11
2 files changed, 28 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
new file mode 100644
index 000000000000..7347cf1fa668
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+
+with stdenv.lib;
+
+buildLinux (args // rec {
+  version = "5.5";
+
+  # 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 = "0c131fi6s7vgvka1c0597vnvcmwn1pp968rci5kq64iwj3pd9yx6";
+  };
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94a0019b09e8..7a4279f5e321 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16461,6 +16461,14 @@ in
     ];
   };
 
+  linux_5_5 = callPackage ../os-specific/linux/kernel/linux-5.5.nix {
+    kernelPatches = [
+      kernelPatches.bridge_stp_helper
+      kernelPatches.request_key_helper
+      kernelPatches.export_kernel_fpu_functions."5.3"
+    ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -16666,7 +16674,7 @@ in
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_5_4;
+  linuxPackages_latest = linuxPackages_5_5;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -16680,6 +16688,7 @@ in
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
   linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
   linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
+  linuxPackages_5_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_5);
 
   # When adding to this list:
   # - Update linuxPackages_latest to the latest version