summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2019-09-16 09:18:32 -0400
committerTim Steinbach <tim@nequissimus.com>2019-09-16 14:00:02 -0400
commit921071da08d673f34b3dcfcd6129cb2c95f54a3b (patch)
tree763674b0b5b9194f91602574c17f54646f8ace0e /pkgs/os-specific/linux
parentef13578aacf966f482c48deb7a67cafd5e084b55 (diff)
downloadnixpkgs-921071da08d673f34b3dcfcd6129cb2c95f54a3b.tar
nixpkgs-921071da08d673f34b3dcfcd6129cb2c95f54a3b.tar.gz
nixpkgs-921071da08d673f34b3dcfcd6129cb2c95f54a3b.tar.bz2
nixpkgs-921071da08d673f34b3dcfcd6129cb2c95f54a3b.tar.lz
nixpkgs-921071da08d673f34b3dcfcd6129cb2c95f54a3b.tar.xz
nixpkgs-921071da08d673f34b3dcfcd6129cb2c95f54a3b.tar.zst
nixpkgs-921071da08d673f34b3dcfcd6129cb2c95f54a3b.zip
linux: Add 5.3, linux-libre: 16791 -> 16794
Update linuxPackages_latest to 5.3
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-5.3.nix18
-rw-r--r--pkgs/os-specific/linux/kernel/linux-libre.nix2
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix
new file mode 100644
index 00000000000..e9cb412d8db
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+
+with stdenv.lib;
+
+buildLinux (args // rec {
+  version = "5.3";
+
+  # 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/v5.x/linux-${version}.tar.xz";
+    sha256 = "1ck70ns130nqf6xy02bwm67y00yh46lhjzdajq7zzx1wa6bw7wvq";
+  };
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index ddaceb877f8..d29a2382c2a 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -4,7 +4,7 @@
 
     # Update this if linux_latest-libre fails to build.
     # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/ | grep -Eo 'Revision [0-9]+'
-    rev = "16791";
+    rev = "16794";
     sha256 = "1lpaka4hs7yrpnrzfybd6radjylwvw2p4aly68pypykqs2srvm7j";
   }
 , ...