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: 38bb03adbaf5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 767b91702f95
Choose a head ref
  • 13 commits
  • 5 files changed
  • 2 contributors

Commits on Apr 21, 2020

  1. linux: 4.19.116 -> 4.19.117

    @kraem
    kraem committed Apr 21, 2020
    Copy the full SHA
    e074301 View commit details

  2. linux: 5.4.33 -> 5.4.34

    @kraem
    kraem committed Apr 21, 2020
    Copy the full SHA
    18c2b5a View commit details

  3. linux: 5.5.18 -> 5.5.19

    @kraem
    kraem committed Apr 21, 2020
    Copy the full SHA
    1e23dcb View commit details

  4. linux: 5.6.5 -> 5.6.6

    @kraem
    kraem committed Apr 21, 2020
    Copy the full SHA
    c9cf25b View commit details

  5. linux/hardened-patches/5.4.33: remove

    @kraem
    kraem committed Apr 21, 2020
    Copy the full SHA
    15807c5 View commit details

  6. linux/hardened-patches/5.6.5: remove

    @kraem
    kraem committed Apr 21, 2020
    Copy the full SHA
    9ed70f4 View commit details

  7. linux/hardened-patches/5.5.18: remove

    @kraem
    kraem committed Apr 21, 2020
    Copy the full SHA
    8f2e9fc View commit details

  8. linux/hardened-patches/4.19.116: remove

    @kraem
    kraem committed Apr 21, 2020
    Copy the full SHA
    efafc50 View commit details

Commits on Apr 22, 2020

  1. linux/hardened-patches/5.6.6: init at 5.6.6.a

    @kraem
    kraem committed Apr 22, 2020
    Copy the full SHA
    c8b5e37 View commit details

  2. linux/hardened-patches/5.5.19: init at 5.5.19.a

    @kraem
    kraem committed Apr 22, 2020
    Copy the full SHA
    3c81b3d View commit details

  3. linux/hardened-patches/5.4.34: init at 5.4.34.a

    @kraem
    kraem committed Apr 22, 2020
    Copy the full SHA
    99f30a5 View commit details

  4. linux/hardened-patches/4.19.117: init at 4.19.117.a

    @kraem
    kraem committed Apr 22, 2020
    Copy the full SHA
    fca903c View commit details

  5. Merge pull request #85715 from kraem/kraem/linux-5.6.6 

    linux: version bumps
    @NeQuissimus
    NeQuissimus authored Apr 22, 2020
    Copy the full SHA
    767b917 View commit details
24 changes: 12 additions & 12 deletions pkgs/os-specific/linux/kernel/hardened-patches.json
View file
Original file line number Diff line number Diff line change
@@ -4,24 +4,24 @@
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch",
"version_suffix": "a"
},
"4.19.116": {
"sha256": "00y4i905gzs9w9kckrn1frh2vw32fsndz03g2psl1gk17snc3q7c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.116.a/linux-hardened-4.19.116.a.patch",
"4.19.117": {
"sha256": "0c8dvh49nzypxwvsls10i896smvpdrk40x8ybljb3qk3r8j7niaw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch",
"version_suffix": "a"
},
"5.4.33": {
"sha256": "1hjfvhyvz5kyvx25809brhsvfv9mjv9q1mw6ydb71gfwhw6q8d8b",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.33.a/linux-hardened-5.4.33.a.patch",
"5.4.34": {
"sha256": "1xwpqr9nzpjg837b3wnzb8fmrl2g9rz8gz5yb55vnnllbzbz36v6",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch",
"version_suffix": "a"
},
"5.5.18": {
"sha256": "0v7vla784sf1fk6d8qa5x8hkyhjb1jkw4lxxcgvvlqbmxl8md8ld",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.18.a/linux-hardened-5.5.18.a.patch",
"5.5.19": {
"sha256": "1ya5nsfhr3nwz6qiz4pdhvm6k9mx1kr0prhdvhx3p40f1vk281sc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch",
"version_suffix": "a"
},
"5.6.5": {
"sha256": "19cdpygm5zx3szxl456lfjg5sffqcmn18470wv7prm8rf6liqdj3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.5.a/linux-hardened-5.6.5.a.patch",
"5.6.6": {
"sha256": "0jiqh0frxirjbccgfdk007fca6r6n36n0pkqq4jszkckn59ayl7r",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch",
"version_suffix": "a"
}
}
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.18";
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 = "01iiiq4dsyyc5y6b52wax9as6dzhdi172vd1423sc1yp4rrk8178";
sha256 = "1sqiw9d25sqqzdh04dd722i7ff6kchj869jp4l8zalpvf51k6j0l";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.6.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.6.5";
version = "5.6.6";

# 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 = "1rjjkcmzsj9azggh960qnk2x44ns475b8nbd4nxazrz1rgdx76zp";
sha256 = "1m3blvkma08v5y11jh0vhf4sr7jbcylkh15bssb5dgp40p8cx134";
};
} // (args.argsOverride or {}))