summary refs log tree commit diff
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2018-07-22 22:42:54 -0400
committerTim Steinbach <tim@nequissimus.com>2018-07-22 22:42:54 -0400
commitf89e07dd248b43747e0c2206c978b34d446a1222 (patch)
treeb9791f344328667eb285c9567266bdef62db2120
parentbbf1770e406cf9ac1985f69ddfd053f3673754bf (diff)
downloadnixlib-f89e07dd248b43747e0c2206c978b34d446a1222.tar
nixlib-f89e07dd248b43747e0c2206c978b34d446a1222.tar.gz
nixlib-f89e07dd248b43747e0c2206c978b34d446a1222.tar.bz2
nixlib-f89e07dd248b43747e0c2206c978b34d446a1222.tar.lz
nixlib-f89e07dd248b43747e0c2206c978b34d446a1222.tar.xz
nixlib-f89e07dd248b43747e0c2206c978b34d446a1222.tar.zst
nixlib-f89e07dd248b43747e0c2206c978b34d446a1222.zip
linux: 4.17.8 -> 4.17.9
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.17.nix4
-rw-r--r--pkgs/top-level/all-packages.nix5
2 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix
index bf9dfc7b9724..9de96398e3e6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.17.8";
+  version = "4.17.9";
 
   # 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;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0hkqypjgvr8lyskwk8z3dac8pyi4wappnk25508vs3fy08365h0k";
+    sha256 = "1frsg1qli4922w172mx96n0l7yzhiw6kirzzw4svsq3qsfnxq57x";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f73feb213271..22ed4c08ada0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13782,11 +13782,6 @@ with pkgs;
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
         kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16!
-        # https://github.com/NixOS/nixpkgs/issues/42755
-        # Remove these xen-netfront patches once they're included in
-        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
-        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
-        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };