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

Commits on Apr 22, 2020

  1. linux: 4.19.116 -> 4.19.117 

    (cherry picked from commit e074301)
    @kraem
    kraem committed Apr 22, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 965CB0F7020C50BE
    Learn about vigilant mode
    Copy the full SHA
    ebc0cc8 View commit details

  2. linux: 5.4.33 -> 5.4.34 

    (cherry picked from commit 18c2b5a)
    @kraem
    kraem committed Apr 22, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 965CB0F7020C50BE
    Learn about vigilant mode
    Copy the full SHA
    d4cde17 View commit details

  3. linux: 5.5.17 -> 5.5.19 

    (cherry picked from commit 1e23dcb)

original commit bumped version
linux: 5.5.18 -> 5.5.19
    @kraem
    kraem committed Apr 22, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 965CB0F7020C50BE
    Learn about vigilant mode
    Copy the full SHA
    4f8f71a View commit details

  4. Merge pull request #85806 from kraem/kraem/linux-bumps-20.03 

    [20.03] linux: version bumps
    @NeQuissimus
    NeQuissimus authored Apr 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6ab0695 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  2. +2 −2 pkgs/os-specific/linux/kernel/linux-5.4.nix
  3. +2 −2 pkgs/os-specific/linux/kernel/linux-5.5.nix
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.116";
version = "4.19.117";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${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 = "0r3vdc3npl1bn06w9v6wsq7d5mm7bnhm9wsz36pb9ar3xhimvrlf";
sha256 = "12xc1pwhwq4vp67hmn7hdynl4ik76cni79356hpzf1lbiqlrya6n";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.33";
version = "5.4.34";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0q9q48ij6vppfcrdf7fr24pvpwsd13pxjkdni6rnjq9a60hrcmxm";
sha256 = "1ljcsrw9jknw2d9hb0yfr1pwy85l8z4rqycgd0kad9mb9lrw2glh";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.5.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.5.17";
version = "5.5.19";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "06aqhlysa7zdj6c69hyii3hfqlfa9751ivga38rbqw1lr2gbbnj0";
sha256 = "1sqiw9d25sqqzdh04dd722i7ff6kchj869jp4l8zalpvf51k6j0l";
};
} // (args.argsOverride or {}))