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: 0f21a3e0f282
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c29362632311
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 13, 2018

  1. linux: 4.9.136 -> 4.9.137 

    (cherry picked from commit 7395bd34f76e22abc4e4c79847fd978a713da932)
    @NeQuissimus
    NeQuissimus committed Nov 13, 2018
    Copy the full SHA
    a2256b5 View commit details

  2. linux: 4.14.80 -> 4.14.81 

    (cherry picked from commit 338d38e57b68e12a2f015e9eabe561accefcad4f)
    @NeQuissimus
    NeQuissimus committed Nov 13, 2018
    Copy the full SHA
    918e0e6 View commit details

  3. linux: 4.18.18 -> 4.18.19 

    (cherry picked from commit aac632ce90b86d8734e2d0c5955a8f77259ff619)
    @NeQuissimus
    NeQuissimus committed Nov 13, 2018
    Copy the full SHA
    c293626 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  2. +2 −2 pkgs/os-specific/linux/kernel/linux-4.18.nix
  3. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.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.80";
version = "4.14.81";

# 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 = "1lnp7qnlbj8mrc6iwnffpq3dbms3l40qxwdbqmd4g9my3k0ppp4x";
sha256 = "1pjvwyhag2i8i5kns8836ifpk93ssvp35m4rfxhz0kl4ag8dydjb";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.18.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.18.18";
version = "4.18.19";

# 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 = "0g83i1ai0z0gpjw1rm8a8wdipjjxhfdvp798nrl14l5d2pw63crl";
sha256 = "1g9iasj17i6z5494azsbr4pji7qj27f1fasrx36fbxy4rp1w8rkw";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.136";
version = "4.9.137";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1j1f4v3m0gggarz0r33pk907gf8dy633s9x5k3ww3khkvzi335fk";
sha256 = "1295x8a8k8bdanrpsalnaaq00mk3fl91sr14061lrgwlj0m53ckd";
};
} // (args.argsOverride or {}))