summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-28 18:01:16 +0000
committerGitHub <noreply@github.com>2021-07-28 18:01:16 +0000
commit6fcda9f1ec27db14412a2103281b4b14f806066a (patch)
tree10d6f3aa9b4fc34ca27e907a5a7d199e6fca15b2 /pkgs/os-specific/linux
parenta1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243 (diff)
parent4ecfa58c97863796f407b823049bcf1bd1866aac (diff)
downloadnixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar
nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar.gz
nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar.bz2
nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar.lz
nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar.xz
nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar.zst
nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-5.13.nix5
-rwxr-xr-xpkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh1
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix
index dd97944de78..bece15821a8 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.13.5";
+  version = "5.13.6";
 
   # 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,9 +13,8 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0lqh7krxxnbrvr3w1kag92z9r4n9436fr6answjkjfbvw0z7q74m";
+    sha256 = "0xjjl8dmilp425b1cp977v26qxlg1147gh54kni949pzxwh1fb56";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];
 } // (args.argsOverride or { }))
-
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index 69e0dee1d20..6d082cb100e 100755
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -4,6 +4,7 @@ if [ -x "@runtimeShell@" ]; then export SHELL="@runtimeShell@"; fi;
 
 set -e
 set -o pipefail
+shopt -s inherit_errexit
 
 export PATH=@path@:$PATH