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: 735ab7a70051
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: 0ba800c4b4b8
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Feb 15, 2019

  1. linux: 4.9.156 -> 4.9.158 

    (cherry picked from commit 50f518c)
    @NeQuissimus
    NeQuissimus committed Feb 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f0ce0f3 View commit details

  2. linux: 4.14.99 -> 4.14.101 

    (cherry picked from commit 7954ec0)
    @NeQuissimus
    NeQuissimus committed Feb 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6e90746 View commit details

  3. linux: 4.19.21 -> 4.19.23 

    (cherry picked from commit 8c14948)
    @NeQuissimus
    NeQuissimus committed Feb 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6da8b83 View commit details

  4. linux: Remove truncation patch from 4.19

    @NeQuissimus
    NeQuissimus committed Feb 15, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0ba800c 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.99";
version = "4.14.101";

# 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 = "02pbi5jck6fp7y5lihn077i0j3hssxcrbsfbxlyp62xjsnp8rycg";
sha256 = "16mnrn2lb6xhcmpqx8brk2w4g6igfb1cwkqkpvlnc7003g2zfbql";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.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.19.21";
version = "4.19.23";

# 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 = "1hdvk1lz9gi8b6gahqqb1r5zzndfw86qzsg1fji0shgy4vkys26v";
sha256 = "02hkiz5vlx2qhyi1hxar9d1cr2gfnrpjdrjjkh83yzxci9kjb6rd";
};
} // (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.156";
version = "4.9.158";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "05m82x2zg0nkc6ayk6akgpfhz31zp6dhhlklcfmi419p8fxbkcay";
sha256 = "1vvm2gw5cddy40amxxr1hcw0bis2zldzyicvjhy11wg6j3snk2lc";
};
} // (args.argsOverride or {}))
3 changes: 0 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -14094,7 +14094,6 @@ with pkgs;
[ kernelPatches.bridge_stp_helper
kernelPatches.cpu-cgroup-v2."4.9"
kernelPatches.modinst_arg_list_too_long
kernelPatches.interpreter-trunc
];
};

@@ -14105,7 +14104,6 @@ with pkgs;
# when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
kernelPatches.interpreter-trunc
];
};

@@ -14126,7 +14124,6 @@ with pkgs;
# when adding a new linux version
# kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
kernelPatches.interpreter-trunc
];
};