From fe46f66bb218ae59fcd6062dae80fd20275aac16 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 11 Nov 2023 10:25:25 +0800 Subject: [PATCH 01/26] =?UTF-8?q?webkitgtk:=202.42.1=20=E2=86=92=202.42.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/WebKit/WebKit/compare/webkitgtk-2.42.1...webkitgtk-2.42.2 (cherry picked from commit d4fa59b6860317488176b2c0f4418126da69158a) --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 1db2f4ce6d8c..8192dded7e4c 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.42.1"; + version = "2.42.2"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-b0H6yZidPuUcCMSN4dQ5ze3ey8dX40thgJh9mbFtJJk="; + hash = "sha256-VyCqPoYn8bn2MlIYfU3w+CM65x1pexeW6/vlynUL0Rg="; }; patches = lib.optionals stdenv.isLinux [ From 916b68e847fe901955768e4a3bdbbc5ca34a8e80 Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 17 Nov 2023 03:29:32 +0100 Subject: [PATCH 02/26] chromium: 119.0.6045.123 -> 119.0.6045.159 https://chromereleases.googleblog.com/2023/11/stable-channel-update-for-desktop_14.html This update includes 4 security fixes. CVEs: CVE-2023-5997 CVE-2023-6112 (cherry picked from commit be18e0d37a7e1d4bd51ae33ba8481b72f65f897c) --- .../networking/browsers/chromium/upstream-info.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 5504bf381882..ef91323f61c9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -41,9 +41,9 @@ version = "2023-09-12"; }; }; - sha256 = "042apqqiaflfhnan4l5j1d50gv9kpz80pyhgm6yawrqq0fih87si"; - sha256bin64 = "08a1rsbd6npwqh4zp4y6n0lcjc14m5lzs4bcwdvb7zql5j85d01w"; - version = "119.0.6045.123"; + sha256 = "08x1bsshn4jn5d66isk249z8rcfgw8z4zc5p5zgpil25yggfc4zk"; + sha256bin64 = "1zllank3wl6d6csdqczbilgag5xziirb8lv3a7xr1717zdnbn2f4"; + version = "119.0.6045.159"; }; ungoogled-chromium = { deps = { From 86b6a026c6062a647f5dfd9266520d9ac04e15e2 Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 17 Nov 2023 03:29:59 +0100 Subject: [PATCH 03/26] ungoogled-chromium: 119.0.6045.123-1 -> 119.0.6045.159-1 https://chromereleases.googleblog.com/2023/11/stable-channel-update-for-desktop_14.html This update includes 4 security fixes. CVEs: CVE-2023-5997 CVE-2023-6112 (cherry picked from commit b105acfc31c89a3d54bef8b749dd7bf9fcef5bee) --- .../networking/browsers/chromium/upstream-info.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index ef91323f61c9..87f15e49daf0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -54,12 +54,12 @@ version = "2023-09-12"; }; ungoogled-patches = { - rev = "119.0.6045.123-1"; - sha256 = "0ca2kdr8cni2lyiq051vlzslcpnxgjfw45mn3qknzf4amlrxyip0"; + rev = "119.0.6045.159-1"; + sha256 = "1ixhch6zasw5hfn675xgxgb1dwv07a14j90pgpqgfsmngihjn1cj"; }; }; - sha256 = "042apqqiaflfhnan4l5j1d50gv9kpz80pyhgm6yawrqq0fih87si"; - sha256bin64 = "08a1rsbd6npwqh4zp4y6n0lcjc14m5lzs4bcwdvb7zql5j85d01w"; - version = "119.0.6045.123"; + sha256 = "08x1bsshn4jn5d66isk249z8rcfgw8z4zc5p5zgpil25yggfc4zk"; + sha256bin64 = "1zllank3wl6d6csdqczbilgag5xziirb8lv3a7xr1717zdnbn2f4"; + version = "119.0.6045.159"; }; } From 3ed5533ad00c60a50a0903acf804d6ac69b17a5e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 17 Nov 2023 22:24:53 +0100 Subject: [PATCH 04/26] python311Packages.python-ldap: 3.4.3 -> 3.4.4 https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-3.4.4 (cherry picked from commit 31a8e9236733e939eb9482fb57d1e4e2cb6a784d) --- .../python-modules/python-ldap/default.nix | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index db9565607a66..5bc9f3fecfcc 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -2,27 +2,41 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, pyasn1 -, pyasn1-modules -, pythonAtLeast , pythonOlder -, pytestCheckHook + +# build-system +, setuptools + +# native dependencies , openldap , cyrus_sasl + +# dependencies +, pyasn1 +, pyasn1-modules + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "python-ldap"; - version = "3.4.3"; + version = "3.4.4"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "python-ldap"; + repo = "python-ldap"; rev = "refs/tags/python-ldap-${version}"; - hash = "sha256-/ehvSs2qjuTPhaaOP0agPbWyyRugBpUlPq/Ny9t2C58="; + hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ openldap cyrus_sasl @@ -53,7 +67,9 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; meta = with lib; { + changelog = "https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-${version}"; description = "Python modules for implementing LDAP clients"; + downloadPage = "https://github.com/python-ldap/python-ldap"; homepage = "https://www.python-ldap.org/"; license = licenses.psfl; }; From 5a489e1a9c60a50a4a4f42a15ec6064469d41039 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 17 Nov 2023 13:39:35 +0100 Subject: [PATCH 05/26] mautrix-whatsapp: 0.10.3 -> 0.10.4 https://github.com/mautrix/whatsapp/releases/tag/v0.10.4 (cherry picked from commit 9c929ee921ebd656468fb5afb6d6e2d255669edb) --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 8d201624a642..566f7d1cabfa 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-lBseLxxk+3/eoJMdq4muOrA0TgEhwIReGtQO1OzqBFc="; + hash = "sha256-uouxOXvVbUNRHM83JearPhMTZQtMPEBfWvsVb7QJSO8="; }; buildInputs = [ olm ]; - vendorHash = "sha256-QUZ9x9BDlhoWLvdt8BTIKxHcsclT6arGICeJnOafs1g="; + vendorHash = "sha256-dgaI/gpngCcVRVK8SK6ac1hmc7/aYLJCnW2CCYRDXy0="; doCheck = false; From 5d528beb0564a2c5aa307299790f20cac7cb5606 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 19 Oct 2023 23:02:38 +0000 Subject: [PATCH 06/26] discord: 0.0.31 -> 0.0.32 (cherry picked from commit 3baf0cf343774347f0f463f6f74147b946b0445f) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 9c6cd8caf0dd..179c160d4a4a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.31"; + stable = "0.0.32"; ptb = "0.0.49"; canary = "0.0.170"; development = "0.0.234"; @@ -16,7 +16,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-toWwiMsEFsGaOYaPZziSmZtpzxGd9m+2MtxTrJwqFbw="; + hash = "sha256-XeGDKRKnvDyl0AWm9Vs/PDeIfAq/FL9AsjLt+dNg1HQ="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From 73560050e6bf97d994c7119b3fb01008119cd119 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 19 Oct 2023 23:03:07 +0000 Subject: [PATCH 07/26] discord-ptb: 0.0.49 -> 0.0.51 (cherry picked from commit a018ab4c775f32b8282f7dd6f48b1d4551337d31) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 179c160d4a4a..81ead77ca526 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.32"; - ptb = "0.0.49"; + ptb = "0.0.51"; canary = "0.0.170"; development = "0.0.234"; } else { @@ -20,7 +20,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-o8cDoBe6A0wBjVLjp4JXrv3QsG7TZ/Kj4+T5lj6WHdY="; + hash = "sha256-VlvGZ5qy61zse0mhvrROYwr0C94Zy1Kh4D4dp+sJTN0="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From 4d03e60822b466f12bebc1e8578016705e920ae5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 19 Oct 2023 23:06:37 +0000 Subject: [PATCH 08/26] discord-canary: 0.0.170 -> 0.0.171 (cherry picked from commit 0338ede46d52180b79b9b5fa1cbaf8251dc82fb0) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 81ead77ca526..8842b55ff6df 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.32"; ptb = "0.0.51"; - canary = "0.0.170"; + canary = "0.0.171"; development = "0.0.234"; } else { stable = "0.0.280"; @@ -24,7 +24,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-Lw+qLAAwyoDBKDPOBA9HR79gcnqwTshFq6GMpFS0tXA="; + hash = "sha256-NcmV+DPI5hfNdBUgoaOLsjG32QfjF+x7f01B6PR10Vc="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 19af779bdfa35a3805519fe79604b7e3dbd41303 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 19 Oct 2023 23:06:51 +0000 Subject: [PATCH 09/26] discord-development: 0.0.234 -> 0.0.1 looks like a downgrade but discord-development-0.0.1.tar.gz: gzip compressed data, last modified: Tue Oct 17 00:03:33 2023 (cherry picked from commit ecb7224d3f61ed82505fa1f8a7ba4a605e3f8e84) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 8842b55ff6df..fec7658539e3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let stable = "0.0.32"; ptb = "0.0.51"; canary = "0.0.171"; - development = "0.0.234"; + development = "0.0.1"; } else { stable = "0.0.280"; ptb = "0.0.80"; @@ -28,7 +28,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-R5UwgpXgb32mEohTzyRVXmumcgPl8UPan3UjmLFLxLo="; + hash = "sha256-ogLOZZ9pTXB01TqdnmdORIzZ8GbGzskUzbG4E68gZwY="; }; }; x86_64-darwin = { From 9dfa2c577a38d409f54c229a1f02011ac4956faf Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 19 Oct 2023 23:07:10 +0000 Subject: [PATCH 10/26] discord: 0.0.280 -> 0.0.281 (cherry picked from commit 2169810dd1dbc935547c43fbd532e0bc728de907) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index fec7658539e3..6cd316544281 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -6,7 +6,7 @@ let canary = "0.0.171"; development = "0.0.1"; } else { - stable = "0.0.280"; + stable = "0.0.281"; ptb = "0.0.80"; canary = "0.0.315"; development = "0.0.8797"; @@ -34,7 +34,7 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-SUbpzd8RIf+e+so/dXZh5OkjCvWRC+EyqgeIg4u32Hg="; + hash = "sha256-Qxh9K0u99xfsVPJyAD3bFeZPxBXg2EeDyM+rbF80EC8="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; From 4397caa94dbd3d2814a4d21509e353857c00b1bc Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 19 Oct 2023 23:07:25 +0000 Subject: [PATCH 11/26] discord-ptb: 0.0.80 -> 0.0.82 (cherry picked from commit 1685220ba4458df8edb3f9d16fff2c2feaa6be95) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 6cd316544281..f7d749e7acdf 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,7 +7,7 @@ let development = "0.0.1"; } else { stable = "0.0.281"; - ptb = "0.0.80"; + ptb = "0.0.82"; canary = "0.0.315"; development = "0.0.8797"; }; @@ -38,7 +38,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-IvrCjiZ5Oa616+U8C2ihg8THj7ePV2A8+82wUWqWoPY="; + hash = "sha256-U99FiR3IUL8saGtVrWblWqsCIJc0rK5ZMII9/BL5H7w="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; From 762a5d5ef995625b890a5a7365a72b5df5a3f6bc Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 19 Oct 2023 23:07:42 +0000 Subject: [PATCH 12/26] discord-canary: 0.0.315 -> 0.0.320 (cherry picked from commit 315a7b36caa56f11d0428f79ed686c494eb85531) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f7d749e7acdf..77ba9ba7a341 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -8,7 +8,7 @@ let } else { stable = "0.0.281"; ptb = "0.0.82"; - canary = "0.0.315"; + canary = "0.0.320"; development = "0.0.8797"; }; version = versions.${branch}; @@ -42,7 +42,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-m43SijSBxcAvYAlSFpQKIFILUm4AgSQ5F4XyQJyftts="; + hash = "sha256-7fPlb4x116HIXEJr1G7wVHriOQu6/2u69SpbU9qxHNw="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From 939e14cd959f639b6e6b2b01f83b091d02d25c1e Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 19 Oct 2023 23:08:01 +0000 Subject: [PATCH 13/26] discord-development: 0.0.8797 -> 0.0.2 discord-development-0.0.2.tar.gz: gzip compressed data, last modified: Tue Oct 17 00:03:33 2023 (cherry picked from commit 41b3f47a1b870e197a3843c707b731247e492f87) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 77ba9ba7a341..953f11896f5c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let stable = "0.0.281"; ptb = "0.0.82"; canary = "0.0.320"; - development = "0.0.8797"; + development = "0.0.2"; }; version = versions.${branch}; srcs = rec { @@ -46,7 +46,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-ra0El4Y7SqanY6ZBbHE1Y+pqel4OD7nXKKfg/vndULo="; + hash = "sha256-iMw61dXtThXvz2GnZiM4+tURMRfXhrN/ze1RTBL6zy8="; }; }; aarch64-darwin = x86_64-darwin; From ee19892bceeae72180e072e1325041327d8facb9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Nov 2023 21:57:20 +0000 Subject: [PATCH 14/26] discord-canary: 0.0.171 -> 0.0.173 (cherry picked from commit ccddeea081c179f90ee16224cb5f9fcce9d5ac0f) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 953f11896f5c..55652b7cf1b0 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.32"; ptb = "0.0.51"; - canary = "0.0.171"; + canary = "0.0.173"; development = "0.0.1"; } else { stable = "0.0.281"; @@ -24,7 +24,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-NcmV+DPI5hfNdBUgoaOLsjG32QfjF+x7f01B6PR10Vc="; + hash = "sha256-YFjGUAaZMy1JhtKhAqLbfYTKQSgS9TKWqR078cERNUI="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 67564f500ed0bea2c0148418fdcc9a5a462994ef Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Nov 2023 22:00:25 +0000 Subject: [PATCH 15/26] discord: 0.0.32 -> 0.0.33 (cherry picked from commit 938eaddcdfa7ef31770fd4b0bbbaf97607978dbe) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 55652b7cf1b0..9747218bdecc 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.32"; + stable = "0.0.33"; ptb = "0.0.51"; canary = "0.0.173"; development = "0.0.1"; @@ -16,7 +16,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-XeGDKRKnvDyl0AWm9Vs/PDeIfAq/FL9AsjLt+dNg1HQ="; + hash = "sha256-UVgufPNIS7fa3VDzjCWwgK3xxmqNivq461qWLgirClc="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From 8793e9284746d56f9e0ceca2ed1241ad149ce835 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Nov 2023 22:02:31 +0000 Subject: [PATCH 16/26] discord-ptb: 0.0.51 -> 0.0.53 (cherry picked from commit 2df8c660df4cb24f8db1b4e2b4e176873fa84b9a) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 9747218bdecc..1ab082b5b226 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.33"; - ptb = "0.0.51"; + ptb = "0.0.53"; canary = "0.0.173"; development = "0.0.1"; } else { @@ -20,7 +20,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-VlvGZ5qy61zse0mhvrROYwr0C94Zy1Kh4D4dp+sJTN0="; + hash = "sha256-g2NhwkfNi5Yf+n9vHq/MJ0kylPF3MPocgF/zYfCvoZM="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From 0debc191a0b0b492f77e9203b65fcdc4c2f25e95 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Nov 2023 22:04:59 +0000 Subject: [PATCH 17/26] discord: 0.0.281 -> 0.0.282 (cherry picked from commit 5aa06e27cf309a5bb3139f278f384f5f7bb8a320) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 1ab082b5b226..c85b92107c67 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -6,7 +6,7 @@ let canary = "0.0.173"; development = "0.0.1"; } else { - stable = "0.0.281"; + stable = "0.0.282"; ptb = "0.0.82"; canary = "0.0.320"; development = "0.0.2"; @@ -34,7 +34,7 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-Qxh9K0u99xfsVPJyAD3bFeZPxBXg2EeDyM+rbF80EC8="; + hash = "sha256-3WeC+4W9+tpXNXqETorQfnE1HZWCqRkBqW0JM7whRCw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; From 96e5f54b694b40297dcbb92f578909103ea6c701 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Nov 2023 22:05:21 +0000 Subject: [PATCH 18/26] discord-ptb: 0.0.82 -> 0.0.84 (cherry picked from commit a7390c11c83310dac91d85c73f37aca47940b76b) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index c85b92107c67..3cdecf8039dc 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,7 +7,7 @@ let development = "0.0.1"; } else { stable = "0.0.282"; - ptb = "0.0.82"; + ptb = "0.0.84"; canary = "0.0.320"; development = "0.0.2"; }; @@ -38,7 +38,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-U99FiR3IUL8saGtVrWblWqsCIJc0rK5ZMII9/BL5H7w="; + hash = "sha256-e2gvjXUw0Yx8UY6utg1SdX8/buewuVYPl5I8fS3QtrI="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; From f3eccc97c95e7a10d43aa0415babb97708a55e4b Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Nov 2023 22:05:42 +0000 Subject: [PATCH 19/26] discord-canary: 0.0.320 -> 0.0.329 (cherry picked from commit f1d95608410910abda30bb7a1834ba11eee84d0a) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3cdecf8039dc..7955a397c79d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -8,7 +8,7 @@ let } else { stable = "0.0.282"; ptb = "0.0.84"; - canary = "0.0.320"; + canary = "0.0.329"; development = "0.0.2"; }; version = versions.${branch}; @@ -42,7 +42,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-7fPlb4x116HIXEJr1G7wVHriOQu6/2u69SpbU9qxHNw="; + hash = "sha256-B4LPFts+sx8GpZp9iRbwapUYrK4c9unH+mAoODGqDgU="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From 46c6fd91a2701d59e0dae8be041f3fec2ef07c61 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 17 Nov 2023 23:23:00 +0000 Subject: [PATCH 20/26] discord: 0.0.33 -> 0.0.35 (cherry picked from commit 7b84cf368019361259fc5fb53d2a2d6b8d43c51f) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 7955a397c79d..f26a0477f8f1 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.33"; + stable = "0.0.35"; ptb = "0.0.53"; canary = "0.0.173"; development = "0.0.1"; @@ -16,7 +16,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-UVgufPNIS7fa3VDzjCWwgK3xxmqNivq461qWLgirClc="; + hash = "sha256-VcSRV9LDiUXduRt20kVeAnwinl6FmACQgn//W6eFyys="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From e9d2f6244e31a727fb01a11cb156184f5374d14a Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 17 Nov 2023 23:23:19 +0000 Subject: [PATCH 21/26] discord-ptb: 0.0.53 -> 0.0.56 (cherry picked from commit 38f79ca1a5574c2975c1cbc726044b1ceece842d) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f26a0477f8f1..4316c4bd16b8 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.35"; - ptb = "0.0.53"; + ptb = "0.0.56"; canary = "0.0.173"; development = "0.0.1"; } else { @@ -20,7 +20,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-g2NhwkfNi5Yf+n9vHq/MJ0kylPF3MPocgF/zYfCvoZM="; + hash = "sha256-RDXApmhlu2aQTjWVXMyRp0CL29btsQufIPuxjjtJGIU="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From f25513511dbf77ec16caafa464155a3b8ec78681 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 17 Nov 2023 23:25:31 +0000 Subject: [PATCH 22/26] discord-canary: 0.0.173 -> 0.0.184 (cherry picked from commit a3d9516584859123e45508b71d8f7eef23b4bd2a) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 4316c4bd16b8..8fbe4df99470 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.35"; ptb = "0.0.56"; - canary = "0.0.173"; + canary = "0.0.184"; development = "0.0.1"; } else { stable = "0.0.282"; @@ -24,7 +24,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-YFjGUAaZMy1JhtKhAqLbfYTKQSgS9TKWqR078cERNUI="; + hash = "sha256-Pu0kei/ls9yrDEpRQcgDAaEkRbYkFmp/jTwOkljoy18="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From a55e4768bdb0de875bfe3c565ffeab5690c04f46 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 17 Nov 2023 23:25:47 +0000 Subject: [PATCH 23/26] discord-development: 0.0.1 -> 0.0.0 (cherry picked from commit b68ef179bd5f1819403624d9380c071cc000efdc) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 8fbe4df99470..d78b436b9abc 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let stable = "0.0.35"; ptb = "0.0.56"; canary = "0.0.184"; - development = "0.0.1"; + development = "0.0.0"; } else { stable = "0.0.282"; ptb = "0.0.84"; @@ -28,7 +28,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-ogLOZZ9pTXB01TqdnmdORIzZ8GbGzskUzbG4E68gZwY="; + hash = "sha256-/+9NyreRkXu2++uhwCh3/C1Cos39hfzB0Yjf0Otg9pk="; }; }; x86_64-darwin = { From 13897a177b43a6c95ce5e07c4d488e549af8af7e Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 17 Nov 2023 23:26:06 +0000 Subject: [PATCH 24/26] discord: 0.0.282 -> 0.0.284 (cherry picked from commit e32ca489651481558a0f7c40ff943b14ebfa246e) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index d78b436b9abc..dd32b74ecad4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -6,7 +6,7 @@ let canary = "0.0.184"; development = "0.0.0"; } else { - stable = "0.0.282"; + stable = "0.0.284"; ptb = "0.0.84"; canary = "0.0.329"; development = "0.0.2"; @@ -34,7 +34,7 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-3WeC+4W9+tpXNXqETorQfnE1HZWCqRkBqW0JM7whRCw="; + hash = "sha256-TTzhc6P0hFG9BFMviNx8CCg1cVEKDiB3gtb8oR/slNA="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; From 9930e581ff95c10a0133c2629a9f1f64f9284d77 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 17 Nov 2023 23:26:26 +0000 Subject: [PATCH 25/26] discord-ptb: 0.0.84 -> 0.0.87 (cherry picked from commit ee7a555478d72dea8c49345fe06cd0c389469d62) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index dd32b74ecad4..09f09909ca23 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,7 +7,7 @@ let development = "0.0.0"; } else { stable = "0.0.284"; - ptb = "0.0.84"; + ptb = "0.0.87"; canary = "0.0.329"; development = "0.0.2"; }; @@ -38,7 +38,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-e2gvjXUw0Yx8UY6utg1SdX8/buewuVYPl5I8fS3QtrI="; + hash = "sha256-cl6+kTth/7j+HJHPU4Oy1N5EnmMbpdvltKzrU1by+Ik="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; From 46c8f0b33cc52c966502809d3456430e77451b9a Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 17 Nov 2023 23:26:49 +0000 Subject: [PATCH 26/26] discord-canary: 0.0.329 -> 0.0.340 (cherry picked from commit 7cf849dad0381476f3c8f717b78ce4fc34da1011) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 09f09909ca23..554314e36a5f 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -8,7 +8,7 @@ let } else { stable = "0.0.284"; ptb = "0.0.87"; - canary = "0.0.329"; + canary = "0.0.340"; development = "0.0.2"; }; version = versions.${branch}; @@ -42,7 +42,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-B4LPFts+sx8GpZp9iRbwapUYrK4c9unH+mAoODGqDgU="; + hash = "sha256-LfixXyCoTnifw2GVAnCDnBla757JyGzbvUJwY4UhgGI="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";