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

Commits on Mar 24, 2019

  1. linux: 4.19.30 -> 4.19.31 

    (cherry picked from commit 0e25209)
    @NeQuissimus
    NeQuissimus committed Mar 24, 2019
    Copy the full SHA
    d3a3aff View commit details

  2. linux: 5.0.3 -> 5.0.4 

    (cherry picked from commit b10ec48)
    @NeQuissimus
    NeQuissimus committed Mar 24, 2019
    Copy the full SHA
    7437bb0 View commit details

  3. linux: Remove 4.20 

    Upstream has EOL'd 4.20

(cherry picked from commit e5fd7ba)
    @NeQuissimus
    NeQuissimus committed Mar 24, 2019
    Copy the full SHA
    1e3a0e0 View commit details
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.30";
version = "4.19.31";

# 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 = "1hkhxbdxck1hc9hbja5afshmd4afngi4haff57vammrkxfc0jkpy";
sha256 = "02r822zhs1xcjy6jpf9fv0h4br47drd3xssxapr2b45y8anr1aks";
};
} // (args.argsOverride or {}))
18 changes: 0 additions & 18 deletions pkgs/os-specific/linux/kernel/linux-4.20.nix
View file

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.0.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.0.3";
version = "5.0.4";

# 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/v5.x/linux-${version}.tar.xz";
sha256 = "12gzpz53kgznk5xg2cgbhfrgxflbx5zsnbpwki8zsjvq59wk7ma0";
sha256 = "0s7appc167gxamy08ky2n9y49avgqmscmq555m2jfvj9bjh3m1cg";
};
} // (args.argsOverride or {}))
8 changes: 0 additions & 8 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -14647,13 +14647,6 @@ in
];
};

linux_4_20 = callPackage ../os-specific/linux/kernel/linux-4.20.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
];
};

linux_5_0 = callPackage ../os-specific/linux/kernel/linux-5.0.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
@@ -14852,7 +14845,6 @@ in
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
linuxPackages_4_20 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_20);
linuxPackages_5_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_0);
# When adding to this list:
# - Update linuxPackages_latest to the latest version