Merge pull request #226632 from jopejoe1/discord-development (8c05c47e) · Commits · nix / nixpkgs

pkgs/applications/networking/instant-messengers/discord/default.nix

+16 −1

Original line number	Diff line number	Diff line
		@@ -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;
		};
		@@ -49,7 +59,7 @@ let
		downloadPage = "https://discordapp.com/download";
		sourceProvenance = with sourceTypes; [ binaryNativeCode ];
		license = licenses.unfree;
		maintainers = with maintainers; [ MP2E artturin infinidoge ];
		maintainers = with maintainers; [ MP2E artturin infinidoge jopejoe1 ];
		platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
		};
		package =
		@@ -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

pkgs/top-level/all-packages.nix

+10 −2

Original line number	Diff line number	Diff line
		@@ -39817,14 +39817,13 @@ 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;
		branch = "stable";
		};

		discordo = callPackage ../applications/networking/discordo/default.nix { };

		discord-ptb = import ../applications/networking/instant-messengers/discord {
		inherit lib stdenv;
		inherit (pkgs) callPackage fetchurl;
		@@ -39837,6 +39836,15 @@ with pkgs;
		branch = "canary";
		};

		discord-development = import ../applications/networking/instant-messengers/discord {
		inherit lib stdenv;
		inherit (pkgs) callPackage fetchurl;
		branch = "development";
		};


		discordo = callPackage ../applications/networking/discordo/default.nix { };

		golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { };

		golden-cheetah-bin = callPackage ../applications/misc/golden-cheetah-bin {};