From 792c0160c61576e349b2b4f59e201695b5dc17c6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 18 Jul 2021 12:19:31 +0200 Subject: [PATCH 1/9] nixStable: 2.3.12 -> 2.3.14 Changes: https://github.com/NixOS/nix/compare/2.3.12...2.3.14 Since this is a bugfix release that wasn't pushed to `nixpkgs`, I decided to take care of it. As it's usually done in `upload-release.pl`[1], I updated the fallback-paths accordingly and used eval `1687468`[2] for this with Nix 2.3.14. Also added a fallback-path for `aarch64-darwin` as Nix 2.3.14 seems to support this now[3]. [1] https://github.com/NixOS/nix/blob/2.3-maintenance/maintainers/upload-release.pl [2] https://hydra.nixos.org/eval/1687468 [3] https://github.com/NixOS/nix/commit/14262b86cc5825deae095c14553d623af498124c (cherry picked from commit e66237af154f63998eaf45233763b2e535b78b95) --- nixos/modules/installer/tools/nix-fallback-paths.nix | 9 +++++---- pkgs/tools/package-management/nix/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 801e28cec44..e3576074a5b 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,7 @@ { - x86_64-linux = "/nix/store/d1ppfhjhdwcsb4npfzyifv5z8i00fzsk-nix-2.3.11"; - i686-linux = "/nix/store/c6ikndcrzwpfn2sb5b9xb1f17p9b8iga-nix-2.3.11"; - aarch64-linux = "/nix/store/fb0lfrn0m8s197d264jzd64vhz9c8zbx-nix-2.3.11"; - x86_64-darwin = "/nix/store/qvb86ffv08q3r66qbd6nqifz425lyyhf-nix-2.3.11"; + x86_64-linux = "/nix/store/qsgz2hhn6mzlzp53a7pwf9z2pq3l5z6h-nix-2.3.14"; + i686-linux = "/nix/store/1yw40bj04lykisw2jilq06lir3k9ga4a-nix-2.3.14"; + aarch64-linux = "/nix/store/32yzwmynmjxfrkb6y6l55liaqdrgkj4a-nix-2.3.14"; + x86_64-darwin = "/nix/store/06j0vi2d13w4l0p3jsigq7lk4x6gkycj-nix-2.3.14"; + aarch64-darwin = "/nix/store/77wi7vpbrghw5rgws25w30bwb8yggnk9-nix-2.3.14"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 598d43bb840..2658d4f44a8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -199,10 +199,10 @@ in rec { nixStable = callPackage common (rec { pname = "nix"; - version = "2.3.12"; + version = "2.3.14"; src = fetchurl { url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ITp9ScRhB5syNh5NAI0kjX9o400syTR/Oo/5Ap+a+10="; + sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; }; inherit storeDir stateDir confDir boehmgc; From b52c349b4805dbda500fc9542066bcba44b94fd0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 19 Jul 2021 08:13:41 +0200 Subject: [PATCH 2/9] strace: 5.12 -> 5.13 ChangeLog: https://github.com/strace/strace/releases/tag/v5.13 (cherry picked from commit 3ed08b05552b41cb7ea3b6ab4a45bca9ae5621be) --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 756f1b947ed..85848e80cf3 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { pname = "strace"; - version = "5.12"; + version = "5.13"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KRce350lL4nJiKTDQN/exmL0WMuMY9hUMdZLq1kR58Q="; + sha256 = "sha256-Wsw0iIudUQrWrJFdSo3wj1HPGukg6iRkn2pLuYTQtlY="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From f1a0f33c5f85cb8bc5ea20ce77e5846698b84917 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 19 Jul 2021 20:43:38 +0000 Subject: [PATCH 3/9] linux: 5.10.50 -> 5.10.51 (cherry picked from commit a5ee0aede3e3ffacc1bf8f3fb3a9970523cce79e) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 988de97e03b..23e4099438b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.50"; + version = "5.10.51"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0dmlpy9k7am99495bxcm46i4y6g34d1fzdkzz3wgzb4mgmx35nlb"; + sha256 = "1qkssvqk29svn10ws3lrnzfbmlvzrixkf7r7lslc7k3lqa9yiflm"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 720802452a5b7a4fff1328cea05ca2c06a33bfde Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 19 Jul 2021 20:43:44 +0000 Subject: [PATCH 4/9] linux: 5.12.17 -> 5.12.18 (cherry picked from commit 72d6452921296dda48c531f465c5e37fa91c7c3f) --- pkgs/os-specific/linux/kernel/linux-5.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 82218dc1cef..fe180d95563 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.17"; + version = "5.12.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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j"; + sha256 = "12sjscf53z6fc1jah3i2578r3a0i7rkw2jmqi0w328a22i0paakg"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; From 612d04e1d619bbc37beebf4c32fca50d2ccd34dc Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 19 Jul 2021 20:43:51 +0000 Subject: [PATCH 5/9] linux: 5.13.2 -> 5.13.3 (cherry picked from commit 72bcb1ace3cfe336d18342d6540733d8e69083a5) --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index da90ee69de8..4bb0f5deef1 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.2"; + version = "5.13.3"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0dx9khk7fh003xyb3xix0kc0rmjncg7ric5p830zhadnrw4hv563"; + sha256 = "1ir80wn019kslv6ysiqxdvarrjlr8b3skk1s43cwki3x2cjnxskq"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From 09c21c10fcf88ee6d5d3398bf7e7a815967c186b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 19 Jul 2021 20:43:58 +0000 Subject: [PATCH 6/9] linux: 5.4.132 -> 5.4.133 (cherry picked from commit 1e8af69febc3205e403209caa7f0c711d92c2463) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 003f1e96e4f..318d0887fb9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.132"; + version = "5.4.133"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1vq0dmrn7gl2vprm08l8by5ja3xjgggrcd38vqg7b7jpnfzssrl4"; + sha256 = "0c08jp5k5h4c2s4pbpyvnvzczr79jh833wy9jv15nkvqp3xnd8w9"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From 0d3b5af09e5381a07bad95b91bcb6383b00cc89a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 19 Jul 2021 20:44:24 +0000 Subject: [PATCH 7/9] linux/hardened/patches/5.10: 5.10.50-hardened1 -> 5.10.51-hardened1 (cherry picked from commit 8e75e31ae4f6b98cf68d68bdb1ce9ecd6d24a807) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index eac71ee36aa..142de8f6fb9 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.50-hardened1.patch", - "sha256": "0z57cdvyaarl5p0b6sj93pag34wvf128s30ymkc4m50a60kp7cr8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.50-hardened1/linux-hardened-5.10.50-hardened1.patch" + "name": "linux-hardened-5.10.51-hardened1.patch", + "sha256": "0s9q7vlhnsd484kzg9mnqc7zab09ch3i3w654wvhkxk9zy4kgzhr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.51-hardened1/linux-hardened-5.10.51-hardened1.patch" }, "5.12": { "extra": "-hardened1", From 94ff9e7b2d8daf4408aa3992e20c215375503e91 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 19 Jul 2021 20:44:25 +0000 Subject: [PATCH 8/9] linux/hardened/patches/5.12: 5.12.17-hardened1 -> 5.12.18-hardened1 (cherry picked from commit 9e10f08e102e10a2a70401dbe1a5707099f61954) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 142de8f6fb9..263d63e4b9c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.17-hardened1.patch", - "sha256": "09vh04a1sa80shm0z5if31j5r8s4syrqv4i22q5pnnfnlzhbqk59", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.17-hardened1/linux-hardened-5.12.17-hardened1.patch" + "name": "linux-hardened-5.12.18-hardened1.patch", + "sha256": "0mlff4ylnx1pvswamhsms9366jw618ic8w42rnzrwqhasfnwkqjb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.18-hardened1/linux-hardened-5.12.18-hardened1.patch" }, "5.4": { "extra": "-hardened1", From ba6476e9927587aa421cd98b6bf1a397c6a42e09 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 19 Jul 2021 20:44:26 +0000 Subject: [PATCH 9/9] linux/hardened/patches/5.4: 5.4.132-hardened1 -> 5.4.133-hardened1 (cherry picked from commit e87737ca6026c81e81514e447f2a82c7ca56c8a2) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 263d63e4b9c..5ff1221e3bd 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.132-hardened1.patch", - "sha256": "0a4n8ss16qqbrbxajlad4j7nc10ipdnl70yz6ppryyw94i5lf5pb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.132-hardened1/linux-hardened-5.4.132-hardened1.patch" + "name": "linux-hardened-5.4.133-hardened1.patch", + "sha256": "0nnsyl2fxv7nnj7c47nnr753yh5x3wbny7ml8x23f5zdvjz43yfj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.133-hardened1/linux-hardened-5.4.133-hardened1.patch" } }