summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2019-04-27 07:55:07 -0400
committerTim Steinbach <tim@nequissimus.com>2019-04-27 08:27:05 -0400
commit70d8e4aa35dc9e6c32ba72e0999eeb40d952fc06 (patch)
tree5e184f471c036731867cc6b1fc5643efc864e14f
parentFix kernel oops on boot due to bug in i2c driver. (diff)
downloadnixpkgs-70d8e4aa35dc9e6c32ba72e0999eeb40d952fc06.tar.gz
linux: 4.14.113 -> 4.14.114
(cherry picked from commit ae7baea76f2b905b96250c979122971105025d01)
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.14.nix4
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 6eb9dc77a2bc..e6c345995d69 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.113";
+ version = "4.14.114";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
@@ -12,6 +12,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1hnsmlpfbcy52dax7g194ksr9179kpigj1y5k44jkwmagziz4kdj";
+ sha256 = "05cyq4id1l3z8hhfs7ril9qc92pfx9h9pgvwl18q1lf8mg7ispmp";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d09a49abd1ae..51b6bf0e8cd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14108,7 +14108,6 @@ with pkgs;
# when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
- kernelPatches.i2c-oops
];
};