diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2018-09-20 09:51:32 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2018-09-20 09:52:48 -0400 |
| commit | 7d30b3d10c8dbc9d024525a84742fca6d44f24bf (patch) | |
| tree | c9d24a555fe5ead5b9f56e449662be283b55a24e | |
| parent | 28fee11e1c42b93cd5e4aac303bddc9da1bb0fe6 (diff) | |
| download | nixlib-7d30b3d10c8dbc9d024525a84742fca6d44f24bf.tar nixlib-7d30b3d10c8dbc9d024525a84742fca6d44f24bf.tar.gz nixlib-7d30b3d10c8dbc9d024525a84742fca6d44f24bf.tar.bz2 nixlib-7d30b3d10c8dbc9d024525a84742fca6d44f24bf.tar.lz nixlib-7d30b3d10c8dbc9d024525a84742fca6d44f24bf.tar.xz nixlib-7d30b3d10c8dbc9d024525a84742fca6d44f24bf.tar.zst nixlib-7d30b3d10c8dbc9d024525a84742fca6d44f24bf.zip | |
linux: 4.18.8 -> 4.18.9
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 91232ab0bbee..48fc823ee084 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.8"; + version = "4.18.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 = "152lz1yim77kpighdcyy1csxs0xf8m2zkwwcz847fqdbd6ninmgi"; + sha256 = "0yli3qr9rygqk5zc4w70xb49b8jbgd09cdz4ji5a00krwm8m76ac"; }; } // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23537a11e54f..4b02c8d9cb21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14085,18 +14085,6 @@ with pkgs; # when adding a new linux version # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - - # https://github.com/NixOS/nixpkgs/issues/45165 - # TODO: remove this patch once it is merged upstream and released. - (rec { - name = "hid-core-fix-grouping-by-application"; - patch = fetchpatch { - name = name + ".patch"; - # https://patchwork.kernel.org/patch/10587369/ - url = https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/patch/?id=0d6c3011409135ea84e2a231b013a22017ff999a; - sha256 = "0bdrv0aqjh0rdjlaaaqpdgrnd9452fa4ggaa1nq2kmik3q00cq4m"; - }; - }) ]; }; |