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

Commits on Jun 9, 2019

  1. linux: 4.14.123 -> 4.14.124

    @NeQuissimus
    NeQuissimus committed Jun 9, 2019
    Copy the full SHA
    fdd34cb View commit details

  2. linux: 4.19.48 -> 4.19.49

    @NeQuissimus
    NeQuissimus committed Jun 9, 2019
    Copy the full SHA
    6634075 View commit details

  3. linux: 5.1.7 -> 5.1.8

    @NeQuissimus
    NeQuissimus committed Jun 9, 2019
    Copy the full SHA
    35a27d3 View commit details

  4. linux: 5.2-rc3 -> 5.2-rc4

    @NeQuissimus
    NeQuissimus committed Jun 9, 2019
    Copy the full SHA
    9a7e890 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.123";
version = "4.14.124";

# 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 = "11avfbkd0bsv3ynr4sxgm2q9980c5mglz67fpk4qlf6ydfsqrx95";
sha256 = "1fdwbj26pcnl23n6yw55j5yif6fkka7kvkdh31c8wczc3rw5h3bx";
};
} // (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.48";
version = "4.19.49";

# 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 = "1ylkd30hg2skfxl12g45lqm48b732faf41d68513i3nc217xpl01";
sha256 = "1kdv72w9x72z126dycdqm4i5hvmy0njaywb2a6jvq39wjyrj1ncj";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.1.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.1.7";
version = "5.1.8";

# 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 = "19pkmnvpjacrssyyjhjlz8cqi8fsn3y293yyvc5bv6dpy96x0ih2";
sha256 = "1v56hzzb147mdnhajkgcjwjrmd7qyayky7bprjb3maz2qvy4y5nh";
};
} // (args.argsOverride or {}))
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-testing.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:

buildLinux (args // rec {
version = "5.2-rc3";
modDirVersion = "5.2.0-rc3";
version = "5.2-rc4";
modDirVersion = "5.2.0-rc4";
extraMeta.branch = "5.2";

src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1hray0c7lgnsvvgfwff82d2ng03rn3dlljm04sk1w8nlwyphfmj8";
sha256 = "0j5vvmbndmjyal3sd98a9lr0x6lxarbz46rgp197f6sf628gxahq";
};

# Should the testing kernels ever be built on Hydra?