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

Commits on Apr 20, 2020

  1. linux: 5.6.4 -> 5.6.5

    @kraem @NeQuissimus
    kraem authored and NeQuissimus committed Apr 20, 2020
    Copy the full SHA
    4307923 View commit details

  2. linux: 5.5.17 -> 5.5.18

    @kraem @NeQuissimus
    kraem authored and NeQuissimus committed Apr 20, 2020
    Copy the full SHA
    8879086 View commit details

  3. linux/hardened-patches/5.6.4: remove

    @kraem @NeQuissimus
    kraem authored and NeQuissimus committed Apr 20, 2020
    Copy the full SHA
    eb41f81 View commit details

  4. linux/hardened-patches/5.5.17: remove

    @kraem @NeQuissimus
    kraem authored and NeQuissimus committed Apr 20, 2020
    Copy the full SHA
    e7a65e6 View commit details

  5. linux/hardened-patches/5.6.5: init at 5.6.5.a

    @kraem @NeQuissimus
    kraem authored and NeQuissimus committed Apr 20, 2020
    Copy the full SHA
    0fd9293 View commit details

  6. linux/hardened-patches/5.5.18: init at 5.5.18.a

    @kraem @NeQuissimus
    kraem authored and NeQuissimus committed Apr 20, 2020
    Copy the full SHA
    48d908b View commit details

  7. linux/hardened-patches/5.4.33: 5.4.33.NixOS-a -> 5.4.33.a

    @kraem @NeQuissimus
    kraem authored and NeQuissimus committed Apr 20, 2020
    Copy the full SHA
    45343be View commit details

  8. linux/hardened-patches/4.19.116: 4.19.116.NixOS-a -> 4.19.116.a

    @kraem @NeQuissimus
    kraem authored and NeQuissimus committed Apr 20, 2020
    Copy the full SHA
    523fe98 View commit details
Showing with 16 additions and 16 deletions.
  1. +12 −12 pkgs/os-specific/linux/kernel/hardened-patches.json
  2. +2 −2 pkgs/os-specific/linux/kernel/linux-5.5.nix
  3. +2 −2 pkgs/os-specific/linux/kernel/linux-5.6.nix
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
@@ -5,23 +5,23 @@
"version_suffix": "a"
},
"4.19.116": {
"sha256": "1f54g0xw708kxha07nsb979h5vwxjrkbwa5h04zny2kq702x1h13",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.115.a/linux-hardened-4.19.115.a.patch",
"version_suffix": "NixOS-a"
"sha256": "00y4i905gzs9w9kckrn1frh2vw32fsndz03g2psl1gk17snc3q7c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.116.a/linux-hardened-4.19.116.a.patch",
"version_suffix": "a"
},
"5.4.33": {
"sha256": "154iz7i9l0hihjrmfk6rjh7hhqwyhsdjr2c74m3dhadrlm5hwy89",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.32.a/linux-hardened-5.4.32.a.patch",
"version_suffix": "NixOS-a"
"sha256": "1hjfvhyvz5kyvx25809brhsvfv9mjv9q1mw6ydb71gfwhw6q8d8b",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.33.a/linux-hardened-5.4.33.a.patch",
"version_suffix": "a"
},
"5.5.17": {
"sha256": "1lms090kkk4vlvfssqsm7r3j88hlf8smrnpcgq24v9rq9pbr0fyw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.17.a/linux-hardened-5.5.17.a.patch",
"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",
"version_suffix": "a"
},
"5.6.4": {
"sha256": "05wkzh7927n71x4cl69mclc44grqpnx6i65hli470q1rg1qrk26n",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.4.a/linux-hardened-5.6.4.a.patch",
"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",
"version_suffix": "a"
}
}
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.18";

# 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 = "01iiiq4dsyyc5y6b52wax9as6dzhdi172vd1423sc1yp4rrk8178";
};
} // (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.4";
version = "5.6.5";

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