Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1d434c5c09b3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c4eddcf2407b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 4, 2018

  1. linux: 4.9.130 -> 4.9.131 

    (cherry picked from commit e6ff57b328e913ae656e038a819b12926eadd230)
    @NeQuissimus
    NeQuissimus committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rycee Robert Helgesson
    GPG key ID: 36BDAA14C2797E89
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    186f5b3 View commit details

  2. linux: 4.14.73 -> 4.14.74 

    (cherry picked from commit 575c118a6469cd2148ed3092de90f0d8d3aaec53)
    @NeQuissimus
    NeQuissimus committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rycee Robert Helgesson
    GPG key ID: 36BDAA14C2797E89
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c4eddcf View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  2. +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.73";
version = "4.14.74";

# 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 = "07p3w3p8izgk1d0dblvn9ckk4ay10f40pqbwpzvpsi6c3ha3i7lr";
sha256 = "0wjw05brv7l1qpi38drc2z01sa7kpk3kadw36gx9cbvvzn4r3rkh";
};
} // (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.130";
version = "4.9.131";
extraMeta.branch = "4.9";

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