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: c40fdcd26c26
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: b9d98c06ebcb
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on May 30, 2018

  1. linux: 4.4.134 -> 4.4.135 

    (cherry picked from commit e055b76)
    @NeQuissimus
    NeQuissimus committed May 30, 2018
    Copy the full SHA
    9085461 View commit details

  2. linux: 4.9.104 -> 4.9.105 

    (cherry picked from commit 943d2fc)
    @NeQuissimus
    NeQuissimus committed May 30, 2018
    Copy the full SHA
    730b616 View commit details

  3. linux: 4.14.46 -> 4.14.47 

    (cherry picked from commit 4afe59c)
    @NeQuissimus
    NeQuissimus committed May 30, 2018
    Copy the full SHA
    b9d98c0 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.4.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,13 +3,13 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.46";
version = "4.14.47";

# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0cpnfsxf2ici3yfn1bxix6219fri2s3ld19hpf00z9im8x91px4h";
sha256 = "06c8kl9f0s5qmqh9l16y1q7r44ld56kd0a00722c3aivddm3nav7";
};
} // (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.134";
version = "4.4.135";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "14gvkpdm3wbdfifnkrlk8b3i2isb439prqrzzlvjh88h582x4y20";
sha256 = "1p41fz1jhcrzcmvhbl8di1660bv0w2wpcmi4hfgksdjfh84b1k03";
};
} // (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.104";
version = "4.9.105";
extraMeta.branch = "4.9";

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