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

Commits on Aug 18, 2018

  1. linux: 4.4.148 -> 4.4.149 

    (cherry picked from commit 928bc3f)
    @kalbasit @NeQuissimus
    kalbasit authored and NeQuissimus committed Aug 18, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    lforst Luca Forstner
    SSH Key Fingerprint: ljpBJ7bYHpwPGV7Y7sJZM+cMS44wfy1fkQqwY/900Nw
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bb4e3dc View commit details

  2. linux: 4.9.120 -> 4.9.121 

    (cherry picked from commit 80448a4)
    @kalbasit @NeQuissimus
    kalbasit authored and NeQuissimus committed Aug 18, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    lforst Luca Forstner
    SSH Key Fingerprint: ljpBJ7bYHpwPGV7Y7sJZM+cMS44wfy1fkQqwY/900Nw
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c629f4c View commit details

  3. linux: 4.14.63 -> 4.14.64 

    (cherry picked from commit bad288c)
    @kalbasit @NeQuissimus
    kalbasit authored and NeQuissimus committed Aug 18, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    lforst Luca Forstner
    SSH Key Fingerprint: ljpBJ7bYHpwPGV7Y7sJZM+cMS44wfy1fkQqwY/900Nw
    Verified
    Learn about vigilant mode
    Copy the full SHA
    01a10ec View commit details

  4. linux: 4.17.15 -> 4.17.16 

    (cherry picked from commit 2366de6)
    @kalbasit @NeQuissimus
    kalbasit authored and NeQuissimus committed Aug 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6ce5555 View commit details
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.63";
version = "4.14.64";

# 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 = "1ly6pjvlfrlrclfnl98ghwal25z58lppnj6gj7x1m1mswzq54bnd";
sha256 = "0mhdxc46hwlbv0gb2iw7hsc0gyr39yaqdxn1rvj12ifhxcyilhb9";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.17.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.17.15";
version = "4.17.16";

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

buildLinux (args // rec {
version = "4.4.148";
version = "4.4.149";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "10yrqizwkawbs332rl3fmr3cpwcl2j0mik4md7isg5xlkc00zc8r";
sha256 = "0v0w3f9jyhr34vcjivfwdxiz7gpl51532d7492ppzivmx1shqqf2";
};
} // (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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.120";
version = "4.9.121";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "14gx6gqahz74vaw8jd0wkxn0w05i7cyfgi24ld2q3p2yhq3gannp";
sha256 = "0q8naw5jqpwa2ylwkbw88yz6zcnkr5jma91rr2xnll02mg8ri35s";
};
} // (args.argsOverride or {}))