diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-24 10:10:06 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-24 10:10:06 +0200 |
| commit | d5782486111f3ed319b53d13240fb2b51088146e (patch) | |
| tree | 61c68b85977b28ebe3e9877a425b5c1bd7f3a05d /pkgs/os-specific/linux | |
| parent | 5aad832327db1521608bf4bee7f5d14626858fa4 (diff) | |
| parent | c778596f56c687318543e5b13af2864fdf79408d (diff) | |
| download | nixlib-d5782486111f3ed319b53d13240fb2b51088146e.tar nixlib-d5782486111f3ed319b53d13240fb2b51088146e.tar.gz nixlib-d5782486111f3ed319b53d13240fb2b51088146e.tar.bz2 nixlib-d5782486111f3ed319b53d13240fb2b51088146e.tar.lz nixlib-d5782486111f3ed319b53d13240fb2b51088146e.tar.xz nixlib-d5782486111f3ed319b53d13240fb2b51088146e.tar.zst nixlib-d5782486111f3ed319b53d13240fb2b51088146e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/hardened/patches.json | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/microcode/intel.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/powerstat/default.nix | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index dd3d08a50e81..fa3718c4ad78 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -14,11 +14,6 @@ "sha256": "1i066nk101banphs9gbcbvmyrhcvf83xf449rs6vxanb0yhwvqvn", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.42.a/linux-hardened-5.4.42.a.patch" }, - "5.5": { - "name": "linux-hardened-5.5.19.a.patch", - "sha256": "1ya5nsfhr3nwz6qiz4pdhvm6k9mx1kr0prhdvhx3p40f1vk281sc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" - }, "5.6": { "name": "linux-hardened-5.6.14.a.patch", "sha256": "1hnlhlssa2gwmww6j17768gn2fbw2f3v8c0cs423lg14r7plkv44", diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index b57c97c99e53..c0201fb01fd4 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20200508"; + version = "20200520"; src = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index f5b54769f003..dd3b24dd19a2 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.22"; + version = "0.02.23"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0r355b9syqa2nhfy8ksvxyy5d58v0isf983842js091s6liy0x7g"; + sha256 = "1yj8ja0hw92wscazxh9vr3qdz24wpw2fgd3w7w088srfzg2aqf3a"; }; installFlags = [ "DESTDIR=${placeholder "out"}" ]; |