Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0e614d029230
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 21b7f59ae129
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 4, 2018

  1. linux: 4.14.78 -> 4.14.79 

    (cherry picked from commit bd636c897724c4c26171a8486c153c37c2a38eac)
    @NeQuissimus
    NeQuissimus committed Nov 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    21b7f59 View commit details
Showing with 2 additions and 7 deletions.
  1. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  2. +0 −5 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.78";
version = "4.14.79";

# 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 = "0v2cwykgd2hxlqja4yl4pq45nhd5x8917ixqq7hj1r3ry304vnpl";
sha256 = "0flkkgfjzs6z7hkr15lga8jvxgwn6wi885yf5wyr0zxjrqg0f6an";
};
} // (args.argsOverride or {}))
5 changes: 0 additions & 5 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -13326,11 +13326,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/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
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu