Skip to content

[Backport release-22.11] discord-development: init at {0.0.216,0.0.8778} #230163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jopejoe1 wants to merge 3 commits into from
Closed

[Backport release-22.11] discord-development: init at {0.0.216,0.0.8778} #230163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd5e71c
discord-development: init at {0.0.216,0.0.8778}
jopejoe1 May 2, 2023
4b46618
discord: add jopejoe1 as maintainer
jopejoe1 May 2, 2023
55d8f49
discord: add comment about callPackage not working with override
jopejoe1 May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion pkgs/applications/networking/instant-messengers/discord/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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;
};
Expand All @@ -49,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 =
Expand Down Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -37813,7 +37814,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 { };

Expand Down