From 90b96b711ff5ea81fe318b3d92c4b3f45ee592a2 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:36:30 +0100 Subject: [PATCH 1/8] discord: 0.0.35 -> 0.0.37 (cherry picked from commit fdb90f8daf5aa2638f54edf75c9425f51c602f28) --- .../instant-messengers/discord/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 554314e36a5f..1b3e96f0b7b7 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,22 +1,23 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let - versions = if stdenv.isLinux then { - stable = "0.0.35"; - ptb = "0.0.56"; - canary = "0.0.184"; - development = "0.0.0"; - } else { - stable = "0.0.284"; - ptb = "0.0.87"; - canary = "0.0.340"; - development = "0.0.2"; - }; + versions = + if stdenv.isLinux then { + stable = "0.0.37"; + ptb = "0.0.56"; + canary = "0.0.184"; + development = "0.0.0"; + } else { + stable = "0.0.284"; + ptb = "0.0.87"; + canary = "0.0.340"; + development = "0.0.2"; + }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-VcSRV9LDiUXduRt20kVeAnwinl6FmACQgn//W6eFyys="; + hash = "sha256-uyflZ1Zks7M1Re6DxuNUAkIuPY4wFSydf2AGMtIube8="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From 0b473472ff3d0c73b779f871d6c15645b41321b2 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:37:18 +0100 Subject: [PATCH 2/8] discord-ptb: 0.0.56 -> 0.0.59 (cherry picked from commit 3dd2cdad9bbec20121fd4ea059530897a355ed5d) --- .../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 1b3e96f0b7b7..0f68c7cb5baa 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.37"; - ptb = "0.0.56"; + ptb = "0.0.59"; canary = "0.0.184"; development = "0.0.0"; } else { @@ -21,7 +21,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-RDXApmhlu2aQTjWVXMyRp0CL29btsQufIPuxjjtJGIU="; + hash = "sha256-WhDEyRMjuy2e1N51tUj3v97Y0qWabCFPThaehadXFWs="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From 445c3d6857e2d7e17004dde19ee392da7dc5ddd8 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:38:00 +0100 Subject: [PATCH 3/8] discord-canary: 0.0.184 -> 0.0.213 (cherry picked from commit 91976d3a92a6806a54b7e9779b52d40d76c83619) --- .../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 0f68c7cb5baa..b808d0730e28 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let if stdenv.isLinux then { stable = "0.0.37"; ptb = "0.0.59"; - canary = "0.0.184"; + canary = "0.0.213"; development = "0.0.0"; } else { stable = "0.0.284"; @@ -25,7 +25,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-Pu0kei/ls9yrDEpRQcgDAaEkRbYkFmp/jTwOkljoy18="; + hash = "sha256-DGRq58Xj5p/7BunY/vFds9LVmxYOl9LcF8ESHrCLly4="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From daba872edd8137b91313d8992a63d4fbfbb2a2b2 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:39:08 +0100 Subject: [PATCH 4/8] discord-development: 0.0.0 -> 0.0.1 (cherry picked from commit ee0d586f8c8b4e67a4135ffd49e8e29c13286f6d) --- .../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 b808d0730e28..9ff5352e4c9d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -5,7 +5,7 @@ let stable = "0.0.37"; ptb = "0.0.59"; canary = "0.0.213"; - development = "0.0.0"; + development = "0.0.1"; } else { stable = "0.0.284"; ptb = "0.0.87"; @@ -29,7 +29,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-/+9NyreRkXu2++uhwCh3/C1Cos39hfzB0Yjf0Otg9pk="; + hash = "sha256-unzPakomF2hmiikrNfnOueBdcuZCz2z3oCA7Djn6OmY="; }; }; x86_64-darwin = { From 8aa68f0e762c349940eae3f95ec6faa1098eaf2e Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:39:44 +0100 Subject: [PATCH 5/8] discord: 0.0.284 -> 0.0.287 (cherry picked from commit b6649b51c1efce823fae64c16bb190b88e1db9df) --- .../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 9ff5352e4c9d..e854885634a4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,7 +7,7 @@ let canary = "0.0.213"; development = "0.0.1"; } else { - stable = "0.0.284"; + stable = "0.0.287"; ptb = "0.0.87"; canary = "0.0.340"; development = "0.0.2"; @@ -35,7 +35,7 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-TTzhc6P0hFG9BFMviNx8CCg1cVEKDiB3gtb8oR/slNA="; + hash = "sha256-DTkWrUgSYP98IVFTWcm4muRR91Kfvs5pBxc1tvPmj/s="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; From 975c9409466e37dcd1dce36d697db97d4cc3c637 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:40:15 +0100 Subject: [PATCH 6/8] discord-ptb: 0.0.87 -> 0.0.90 (cherry picked from commit 27b7e40f688771a5483ae424e8662b2a2d3d8d79) --- .../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 e854885634a4..3098492ee0d0 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -8,7 +8,7 @@ let development = "0.0.1"; } else { stable = "0.0.287"; - ptb = "0.0.87"; + ptb = "0.0.90"; canary = "0.0.340"; development = "0.0.2"; }; @@ -39,7 +39,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-cl6+kTth/7j+HJHPU4Oy1N5EnmMbpdvltKzrU1by+Ik="; + hash = "sha256-wOTgcHRUu/CjdnvQVNL+rkazhVbZjwI+UbfmsF6aveg="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; From 9d7d75bd9caec39f212b358f6c8126f11f010a30 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:40:48 +0100 Subject: [PATCH 7/8] discord-canary: 0.0.340 -> 0.0.365 (cherry picked from commit bc86fb0a7b24c45bdbc760214dec39ad8a146fad) --- .../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 3098492ee0d0..389a3fdc4879 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let } else { stable = "0.0.287"; ptb = "0.0.90"; - canary = "0.0.340"; + canary = "0.0.365"; development = "0.0.2"; }; version = versions.${branch}; @@ -43,7 +43,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-LfixXyCoTnifw2GVAnCDnBla757JyGzbvUJwY4UhgGI="; + hash = "sha256-a4MyO2Wst+ZYNSpUaF0TXJKtDQcPRLehapwRzp10R2k="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From d368b46ce131e6db7e6761b53a96fae0cab1e507 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:41:28 +0100 Subject: [PATCH 8/8] discord-development: 0.0.2 -> 0.0.10 (cherry picked from commit 3c6a5616041c0fef745326eb20a41e2d922d3f2d) --- .../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 389a3fdc4879..1892516f8e8a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -10,7 +10,7 @@ let stable = "0.0.287"; ptb = "0.0.90"; canary = "0.0.365"; - development = "0.0.2"; + development = "0.0.10"; }; version = versions.${branch}; srcs = rec { @@ -47,7 +47,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-iMw61dXtThXvz2GnZiM4+tURMRfXhrN/ze1RTBL6zy8="; + hash = "sha256-FoYRW5SaR/53yKs/T2XKVKQevA3MxMWAJFjixtwsEF4="; }; }; aarch64-darwin = x86_64-darwin;