From 85c60318a4962b43813b2b29deebafcd921195d4 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 18 Oct 2022 14:58:55 +0200 Subject: [PATCH 01/11] wire-desktop: linux 3.27.2944 -> 3.29.2997 (cherry picked from commit 46142236d9f80d7328fa50ee31f9535701a0c225) --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4d7a2218e7df..a5e702d99000 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -24,12 +24,12 @@ let version = { x86_64-darwin = "3.27.4357"; - x86_64-linux = "3.27.2944"; + x86_64-linux = "3.29.2997"; }.${system} or throwSystem; sha256 = { x86_64-darwin = "0xihg9fzsbwib2fmb1yqx9015i9q4k0ph8lna4mzgicmrjkw54g8"; - x86_64-linux = "1wqnrmp8q84izvqv25fgks5pv6la3vahm5dsn7bc6zxqb0xz2xvy"; + x86_64-linux = "0f5kkp93za4yr6ywdgph8zr6ivrbxq2gbskl8jysxawk1pz92pqf"; }.${system} or throwSystem; meta = with lib; { From 7226f5956f4ea57c060b64d8bd84ebcd4387c157 Mon Sep 17 00:00:00 2001 From: toonn Date: Tue, 18 Oct 2022 15:01:55 +0200 Subject: [PATCH 02/11] wire-desktop: mac 3.27.2944 -> 3.29.4477 (cherry picked from commit aa3e6347fc46c5498019823f7df189438ff05638) --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index a5e702d99000..93c6a7a4dcb6 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -23,12 +23,12 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.27.4357"; + x86_64-darwin = "3.29.4477"; x86_64-linux = "3.29.2997"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "0xihg9fzsbwib2fmb1yqx9015i9q4k0ph8lna4mzgicmrjkw54g8"; + x86_64-darwin = "19snbd53hjfcqgnz24r85a34fr120b1wps4pv4vymnkxjld2wifc"; x86_64-linux = "0f5kkp93za4yr6ywdgph8zr6ivrbxq2gbskl8jysxawk1pz92pqf"; }.${system} or throwSystem; From e3edd9afcbc56b5c74310f1ff0a49e902ac5bbf7 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 20 Dec 2022 13:56:38 -0700 Subject: [PATCH 03/11] matrix-synapse: 1.73.0 -> 1.74.0 Signed-off-by: Sumner Evans (cherry picked from commit c5e381b6c231a518b3f95dfb55c66afee9618842) --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index b7a7c85bfc2f..36a967220602 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,20 +11,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.73.0"; + version = "1.74.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-Er5a+0Qyvm5V1ObWjDQ8fs+r/XB+4aRItJMqaz1VSqk="; + hash = "sha256-UsYodjykcLOgClHegqH598kPoGAI1Z8bLzV5LLE6yLg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-yU72e8OBnUtNdUI/crX7v2KRYHHHOY4Ga9CI3PJwais="; + hash = "sha256-XOW9DRUhGIs8x5tQ9l2A85sNv736uMmfC72f8FX3g/I="; }; postPatch = '' From 8fa5798ab9449f8a0656b24bee92ecde7e392a46 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Dec 2022 08:13:54 +0100 Subject: [PATCH 04/11] linux: 5.10.159 -> 5.10.161 (cherry picked from commit 600ca141ded4e22313eda18b85b31927cc34d106) --- 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 5614aeb1cabf..72b62e6b2d89 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.159"; + version = "5.10.161"; # 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 = "19yfi5vknxnw0cb8274q3pb5zjs6ny04n16m8xjdfdmznrbvza8v"; + sha256 = "0ya04njrxr4d37zkxvivmn5f0bdvcb504pyp9ahwz8nqpk8gdaks"; }; } // (args.argsOverride or {})) From 8f926809fa2c97fbea955324c157189bc1e9651d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Dec 2022 08:14:10 +0100 Subject: [PATCH 05/11] linux: 5.15.83 -> 5.15.85 (cherry picked from commit a464cfcb3666a5cc2bcff8f3708eb93176d9c529) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index eaee2d605db9..996188fc66b6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.83"; + version = "5.15.85"; # 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; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1wvzfhzqq9dps508wmp2gblfz93ipppnjzqm0n8pi1acq11hhna0"; + sha256 = "024qhjh9mgfnanr1qd8002n6a4wpn98lajli12a0m3n9z8lsw2rc"; }; } // (args.argsOverride or { })) From be74df04bba345c73744ba9a1c7cd44ab9a3ff47 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Dec 2022 08:14:20 +0100 Subject: [PATCH 06/11] linux: 5.4.227 -> 5.4.228 (cherry picked from commit 734f672b6778744fbf860712d9bd0cade2b8e402) --- 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 b45ef4f3b502..1dd9521ad0d2 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.227"; + version = "5.4.228"; # 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 = "14q5gy48j78vwnqivrgpdhj778n2jq5l7yiw5na1rwqmfh1wbvsy"; + sha256 = "0935dq7zbpf0fkppl3q96a2gh1zrmq01h1nivzgmdhjlmhn3n9c0"; }; } // (args.argsOverride or {})) From 825a7bab04f5a7f94dcf55ce7469e56ff826243e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Dec 2022 08:14:32 +0100 Subject: [PATCH 07/11] linux: 6.0.13 -> 6.0.15 (cherry picked from commit f6f17ce513f6ecbb62c29111225d36cb23467d52) --- pkgs/os-specific/linux/kernel/linux-6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 2bd2a3f07c1d..6865bd9f6ed0 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.13"; + version = "6.0.15"; # 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/v6.x/linux-${version}.tar.xz"; - sha256 = "191dlxcmbx8vy6z2k04jq2kr6hwnaknsnsyycvqnjmvmdf6i3lq8"; + sha256 = "08389890gq4b9vkvrb22lzkr4blkn3a5ma074ns19gl89wyyp16l"; }; } // (args.argsOverride or { })) From 9b393d4bf033718ea50484f6122b7db1cd979b3a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Dec 2022 08:15:31 +0100 Subject: [PATCH 08/11] linux/hardened/patches/5.10: 5.10.159-hardened1 -> 5.10.161-hardened1 (cherry picked from commit d3e0241c4dde7e85072f9594ee1f8dc837282e8a) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5ac0c9dc683b..a37c9efad199 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.159-hardened1.patch", - "sha256": "0kjiijq9qd5zyy2gvsn8xv99jv5crfyqi69lchmsqk1gs4qhs7m9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.159-hardened1/linux-hardened-5.10.159-hardened1.patch" + "name": "linux-hardened-5.10.161-hardened1.patch", + "sha256": "0lkgixy3qn2lf2snp7zsxyp6fad0b6yvvg2hk6l1jp9z8293gsap", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.161-hardened1/linux-hardened-5.10.161-hardened1.patch" }, - "sha256": "19yfi5vknxnw0cb8274q3pb5zjs6ny04n16m8xjdfdmznrbvza8v", - "version": "5.10.159" + "sha256": "0ya04njrxr4d37zkxvivmn5f0bdvcb504pyp9ahwz8nqpk8gdaks", + "version": "5.10.161" }, "5.15": { "patch": { From 48b4d166445fe41b4ddcecfdb3bde289f2ff7484 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Dec 2022 08:15:43 +0100 Subject: [PATCH 09/11] linux/hardened/patches/5.15: 5.15.83-hardened1 -> 5.15.85-hardened1 (cherry picked from commit afc5e7cc9ad0868f9ff43618de7819a09a22ccfe) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a37c9efad199..bed578ea40e8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.83-hardened1.patch", - "sha256": "0cyd14xlmiy7bj5psjws2p1xdc7vzhv1hy77xca4mlwssb41zvdb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.83-hardened1/linux-hardened-5.15.83-hardened1.patch" + "name": "linux-hardened-5.15.85-hardened1.patch", + "sha256": "03zjcjyiklhxhq958hx1mlhhjcz0isdrij217q8ji78bz3y40m0q", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.85-hardened1/linux-hardened-5.15.85-hardened1.patch" }, - "sha256": "1wvzfhzqq9dps508wmp2gblfz93ipppnjzqm0n8pi1acq11hhna0", - "version": "5.15.83" + "sha256": "024qhjh9mgfnanr1qd8002n6a4wpn98lajli12a0m3n9z8lsw2rc", + "version": "5.15.85" }, "5.4": { "patch": { From c4fb1ab519f30d93be6b68f84f5d4dd3c0426db4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Dec 2022 08:15:55 +0100 Subject: [PATCH 10/11] linux/hardened/patches/5.4: 5.4.227-hardened1 -> 5.4.228-hardened1 (cherry picked from commit 7a3b8510894a6ed5f226df89efe984252a6f8b42) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bed578ea40e8..f67c9feef441 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.227-hardened1.patch", - "sha256": "1q5xxaz154iz65x6n4m1lfsly9p978zzrnp9xdh6sp1cw8g39fyn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.227-hardened1/linux-hardened-5.4.227-hardened1.patch" + "name": "linux-hardened-5.4.228-hardened1.patch", + "sha256": "0rf324pps25snfcbpfkyxmf6qzx7qjkz0qcnjwrb2lh5fbvx0vik", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.228-hardened1/linux-hardened-5.4.228-hardened1.patch" }, - "sha256": "14q5gy48j78vwnqivrgpdhj778n2jq5l7yiw5na1rwqmfh1wbvsy", - "version": "5.4.227" + "sha256": "0935dq7zbpf0fkppl3q96a2gh1zrmq01h1nivzgmdhjlmhn3n9c0", + "version": "5.4.228" }, "6.0": { "patch": { From e2911d022051066f6db6458b95a13f5e259f13b1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Dec 2022 08:16:08 +0100 Subject: [PATCH 11/11] linux/hardened/patches/6.0: 6.0.13-hardened1 -> 6.0.15-hardened1 (cherry picked from commit 1ecc5414ce18550f6bbd0b4b7945055f23803262) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f67c9feef441..ca8d5f90f660 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.0": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.0.13-hardened1.patch", - "sha256": "0v037rg3h8khjdr1hhkpqv2xb9g5vc7dklxf8zidaww27gb2g528", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.13-hardened1/linux-hardened-6.0.13-hardened1.patch" + "name": "linux-hardened-6.0.15-hardened1.patch", + "sha256": "0v7aqxa6ba2jkx1dd9axr9vsnn3pbq30vwfd0akc72zc8c5zll1r", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.15-hardened1/linux-hardened-6.0.15-hardened1.patch" }, - "sha256": "191dlxcmbx8vy6z2k04jq2kr6hwnaknsnsyycvqnjmvmdf6i3lq8", - "version": "6.0.13" + "sha256": "08389890gq4b9vkvrb22lzkr4blkn3a5ma074ns19gl89wyyp16l", + "version": "6.0.15" } }