From fd5e71c41cf3ba6a77617b3250d4aaf214737f31 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 2 May 2023 12:45:21 +0200
Subject: [PATCH 1/3] discord-development: init at {0.0.216,0.0.8778}

(cherry picked from commit 5333d97bdc62f120dc259bd6bca605af41ee5ff5)
---
 .../instant-messengers/discord/default.nix        | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                   |  8 +++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 441b15e519f7e..8790441b8bf0b 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -4,10 +4,12 @@ let
     stable = "0.0.26";
     ptb = "0.0.42";
     canary = "0.0.151";
+    development = "0.0.216";
   } else {
     stable = "0.0.273";
     ptb = "0.0.59";
     canary = "0.0.283";
+    development = "0.0.8778";
   };
   version = versions.${branch};
   srcs = rec {
@@ -24,6 +26,10 @@ let
         url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
         sha256 = "sha256-ZN+lEGtSajgYsyMoGRmyTZCpUGVmb9LKgVv89NA4m7U=";
       };
+      development = fetchurl {
+        url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
+        sha256 = "sha256-lQnIQC7Wek7OYDzZvLIJfb8I4oATD8pSB+mjQMPyqYQ=";
+      };
     };
     x86_64-darwin = {
       stable = fetchurl {
@@ -38,6 +44,10 @@ let
         url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
         sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l";
       };
+      development = fetchurl {
+        url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
+        sha256 = "sha256-K4rlShYhmsjT2QHjb6+IbCXJFK+9REIx/gW68bcVSVc=";
+      };
     };
     aarch64-darwin = x86_64-darwin;
   };
@@ -83,6 +93,11 @@ let
           binaryName = if stdenv.isLinux then "DiscordCanary" else desktopName;
           desktopName = "Discord Canary";
         };
+        development = rec {
+          pname = "discord-development";
+          binaryName = if stdenv.isLinux then "DiscordDevelopment" else desktopName;
+          desktopName = "Discord Development";
+        };
       }
   );
 in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce162afe707f3..d26c82d443c63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37813,7 +37813,13 @@ with pkgs;
     branch = "canary";
   };
 
-  golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {};
+  discord-development = import ../applications/networking/instant-messengers/discord {
+    inherit lib stdenv;
+    inherit (pkgs) callPackage fetchurl;
+    branch = "development";
+  };
+
+  golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { };
 
   linkchecker = callPackage ../tools/networking/linkchecker { };
 

From 4b46618622229af99e6b6e00090287dc8bae86e6 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 2 May 2023 12:45:39 +0200
Subject: [PATCH 2/3] discord: add jopejoe1 as maintainer

(cherry picked from commit 985e990c456bdf54e1f9c7e1022117ec46c9b047)
---
 .../networking/instant-messengers/discord/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 8790441b8bf0b..17f0ee8eb92a2 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -59,7 +59,7 @@ let
     downloadPage = "https://discordapp.com/download";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ MP2E devins2518 artturin infinidoge ];
+    maintainers = with maintainers; [ MP2E artturin infinidoge jopejoe1 ];
     platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
   };
   package =

From 55d8f499fe2af56c81840e376fa683eca0433674 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 2 May 2023 12:47:42 +0200
Subject: [PATCH 3/3] discord: add comment about callPackage not working with
 override

https://github.com/NixOS/nixpkgs/pull/179906
(cherry picked from commit 72bf1b54e557d45ed0633e2f91b38371b3e12fed)
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d26c82d443c63..972db9595f356 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37795,6 +37795,7 @@ with pkgs;
 
   mpvc = callPackage ../applications/misc/mpvc { };
 
+  # Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906)
   discord = import ../applications/networking/instant-messengers/discord {
     inherit lib stdenv;
     inherit (pkgs) callPackage fetchurl;