summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/linux-5.12.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-19 00:02:18 +0000
committerGitHub <noreply@github.com>2021-07-19 00:02:18 +0000
commitdde34afc632005a61b65b95f269dbc8b828c2f05 (patch)
tree44460faaa77e88a8b4da97a9ff694145be425851 /pkgs/os-specific/linux/kernel/linux-5.12.nix
parentd0f62aae75499e2584b4ffff1585605352e26e8f (diff)
parentdc802b2e196f95ce42daa7591e475bba34047331 (diff)
downloadnixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar
nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar.gz
nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar.bz2
nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar.lz
nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar.xz
nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar.zst
nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-5.12.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-5.12.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix
index 3a482d92a44..82218dc1cef 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.12.15";
+  version = "5.12.17";
 
   # 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;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1nlgwcxfhxzf5wak8c0gamn4k8vpdllzqlpqqn5fa08cdjcymz27";
+    sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];