From 740841137767041abd8d0eadba9770a65f8abb8f Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 27 Jul 2022 09:37:00 +0200 Subject: [PATCH 01/12] tutanota-desktop: 3.95.4 -> 3.98.15 https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-3.98.15 (cherry picked from commit 28cc677b26155960acc85c1a5240f36e4f8ce1f5) --- .../networking/mailreaders/tutanota-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 92a8563633c2..3873740ef6a4 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.95.4"; + version = "3.98.15"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "0kkkp0nw4fby4663w7g0k2y1sg89pm336slzii1s3n70h8cak3dx"; + sha256 = "sha256-yuSFDLQ7ckuZYuXREbW0VvMapzO2VhVIH1Ccr1uQHmo="; }; nativeBuildInputs = [ From 066281f6401c08d69c98b14692ee2175d84d8e40 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 18 Jul 2022 22:44:26 +0200 Subject: [PATCH 02/12] qemu: fix CVE-2022-35414 (cherry picked from commit b2d221795b355b6646c046077f3a58aedb1efa82) --- pkgs/applications/virtualization/qemu/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a481b50f3e16..5dc429cb241d 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -115,6 +115,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/raboof/qemu/-/commit/3fb5e8fe4434130b1167a995b2a01c077cca2cd5.patch"; sha256 = "sha256-evzrN3i4ntc/AFG0C0rezQpQbWcnx74nXO+5DLErX8o="; }) + (fetchpatch { + name = "CVE-2022-35414.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/418ade7849ce7641c0f7333718caf5091a02fd4c.patch"; + sha256 = "sha256-zQHDXedIXZBnabv4+3TA4z5mY1+KZiPmqUbhaSkGLgA="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; From c5ac8bcf44b10ccdf06d57534d7c62898492f659 Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 28 Jul 2022 23:40:06 -0700 Subject: [PATCH 03/12] librewolf: 102.0-2 -> 103.0-3 (cherry picked from commit 4042f5e34bcc44d85c401d4dd997930fa9b6fbff) --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index d83a90b0466f..44f09e3d2cb9 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "102.0-2", + "packageVersion": "103.0-3", "source": { - "rev": "102.0-2", - "sha256": "1gr17sk9ans6f2w3y6zr2cy5pz84br2b0kfi9pqz58yjz94q7jm2" + "rev": "103.0-3", + "sha256": "1d8qh0s5zjh10cyyawpvr7ywygg1ibh1r0rx0vnqv1qakj3y4jcq" }, "firefox": { - "version": "102.0", - "sha512": "c7dd6d8d74c46573b16d097a5e5d230669e5778cd680b3b6f30510e989d21543138ced3bb013998b76614aa380b28efd8542450c591d8b724e03bd163d012057" + "version": "103.0", + "sha512": "016c2f276fb94e5174626f7d8b1a821b2de0f5a07f8a10f00a7ea4d4285591b0c23dd3ef45306579de79b3dfa99ccc527224c33f3319f61cf088b1f4bd097f9e" } } From 8b37a0da388f50b0b1100727f6bccfeeda238da9 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 16 Jul 2022 22:54:31 -0600 Subject: [PATCH 04/12] signal-desktop: 5.50.0 -> 5.52.0 (cherry picked from commit e91ae12d88f4820778defcf7fa94ac2b1dd81b12) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2c3f2c1532ce..666beca160d1 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.50.0"; # Please backport all updates to the stable channel. + version = "5.52.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-3/a0+FTRSI7MdI/4mAhKl/KEBoEM1rqTUUWTpNFJTSA="; + sha256 = "sha256-KFldVpKICRX2n/ccvqxpt1Dz6QwH2g+wqXRHAXI/iyY="; }; nativeBuildInputs = [ From 86b53cbfaebb16f5a48424810efe6ed32fbb5069 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 29 Jul 2022 19:21:26 +0300 Subject: [PATCH 05/12] nextcloud-client: 3.5.2 -> 3.5.3 (cherry picked from commit acd0c51b1cc6c2fa68037dec815c6f6a436ff779) --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 94519ad761e4..090c17718eea 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.5.2"; + version = "3.5.3"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-lNsAdYErd3m1bNhvSDVJ5Rfqt8lutNJ1+2DCmntL6pM="; + sha256 = "sha256-J6ukQ29DpCgmX9MF+evWXAy3usl0xB/xv4inBPS8nQI="; }; patches = [ From f69257a580ee8ac0955ea63591904288155e1312 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Jul 2022 19:09:01 +0200 Subject: [PATCH 06/12] linux: 4.14.289 -> 4.14.290 (cherry picked from commit be408ef5bb8be9a35478f838e1f80fa1b0c29c1f) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 6de2a35fd473..018ec0e8a927 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.289"; + version = "4.14.290"; # 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 = "1v24mv49skgijcbafgai0glrzwiv2j1hndkz7v6ygc18jxh5fqg6"; + sha256 = "0zyxb99a7fa2l85vnzmvg2nry99clj20d4j38piqm921iqxak2j4"; }; } // (args.argsOverride or {})) From 840ae19c843e44083f774fc404a9396c9e3559ad Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Jul 2022 19:09:22 +0200 Subject: [PATCH 07/12] linux: 4.19.253 -> 4.19.254 (cherry picked from commit 310ce04485de3f7de15892bb4554c0b708b05835) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c9f0431244df..afa8423d578b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.253"; + version = "4.19.254"; # 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 = "1jc2j0wskgr1bdzpz6sn2bvafpviiin6mwr93yykcczzfjijr8yz"; + sha256 = "1rd40wmdaymbly2zvf60mjqsflkd4n1y232qz0ixn1rfl28yz62i"; }; } // (args.argsOverride or {})) From 925a608db9751998226ebd817a7bbec417effcc5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Jul 2022 19:09:39 +0200 Subject: [PATCH 08/12] linux: 4.9.324 -> 4.9.325 (cherry picked from commit 32da3390ab08cc60233c1c30e27eb67ea254777e) --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index c8e16830f4e5..3fb588d3cb93 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.324"; + version = "4.9.325"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0g51vfp0g3py82l3q66p7nvl03h6l1nlny18gangji75a3c39yh4"; + sha256 = "04msx0x0d8v93zjr3jj0qqkgg7m4hb7rj6hk5vzrzasmgbjmb3dl"; }; } // (args.argsOverride or {})) From e126a0f720acd44526fde77b56740f4e7ee65890 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Jul 2022 19:09:57 +0200 Subject: [PATCH 09/12] linux: 5.10.132 -> 5.10.134 (cherry picked from commit 40b001eee21f6460a04550225f725311defb0ef0) --- 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 93b11cc78902..a3a9d64f1f34 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.132"; + version = "5.10.134"; # 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 = "0aps3kglzw480ps9agw1k3zn8ipibwkrx13kzijfl7g0xqqsj1bx"; + sha256 = "0s9j4zzck9880kvyb18i2ng6dc16p0dwsi95mkwdhg83vyn16dgc"; }; } // (args.argsOverride or {})) From c8cee1200a21b33cf0b5aaad668d23d24b01559d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Jul 2022 19:10:13 +0200 Subject: [PATCH 10/12] linux: 5.15.56 -> 5.15.58 (cherry picked from commit 8beec3e69a275d934f57b401cec4ed3481570c15) --- 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 3f371d62e23a..dd22ce735cef 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.56"; + version = "5.15.58"; # 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 = "08w2kgc0v0ld7nxbary7d9fr2vxrsmqby7l4fhf7njgi6wsbp9p9"; + sha256 = "1a2gzjfymfafvk8cvibr1zdfydzxg0c5j772c9hqwcabkibxjnyp"; }; } // (args.argsOverride or { })) From 0165ea659d2240703688b7a48a3ff65e43d39492 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Jul 2022 19:10:31 +0200 Subject: [PATCH 11/12] linux: 5.18.13 -> 5.18.15 (cherry picked from commit 37f0f42f707c0a3e9499857d5ed667512633da67) --- pkgs/os-specific/linux/kernel/linux-5.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.18.nix b/pkgs/os-specific/linux/kernel/linux-5.18.nix index f8844461d79a..b3641d70b4e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.18.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.18.13"; + version = "5.18.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/v5.x/linux-${version}.tar.xz"; - sha256 = "1nkb4wl2v2pflqnfgmas1pmkr8wm14lm1c8py9sa5k1gwvzil3j3"; + sha256 = "0g5yvhq7rmkzvfl4w50l7bg56a20insvg4s4nvgnk2iqvkmlz039"; }; } // (args.argsOverride or { })) From dc1cb127650c162311a97bc4ba72b663fbd6ea90 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Jul 2022 19:10:46 +0200 Subject: [PATCH 12/12] linux: 5.4.207 -> 5.4.208 (cherry picked from commit d060a1191bfe4d9e8a4cc4bd49c80284bf71c294) --- 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 bcd502f79150..af11e96930db 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.207"; + version = "5.4.208"; # 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 = "1wwpd26qhv6i00p0yxjisns6qiz9bfrxvn1xb4ylwr8ls7zyx78v"; + sha256 = "0i0fxv04r6g5ha84chih5cqsy59cv67pjxp8zfrdk1qapwddyvgh"; }; } // (args.argsOverride or {}))