nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #226632 from jopejoe1/discord-development

authored by

Artturi and committed by
GitHub
8c05c47e 395077ba

+26 -3
+16 -1
pkgs/applications/networking/instant-messengers/discord/default.nix
··· 4 4 stable = "0.0.26"; 5 5 ptb = "0.0.42"; 6 6 canary = "0.0.151"; 7 + development = "0.0.216"; 7 8 } else { 8 9 stable = "0.0.273"; 9 10 ptb = "0.0.59"; 10 11 canary = "0.0.283"; 12 + development = "0.0.8778"; 11 13 }; 12 14 version = versions.${branch}; 13 15 srcs = rec { ··· 26 24 url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; 27 25 sha256 = "sha256-ZN+lEGtSajgYsyMoGRmyTZCpUGVmb9LKgVv89NA4m7U="; 28 26 }; 27 + development = fetchurl { 28 + url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; 29 + sha256 = "sha256-lQnIQC7Wek7OYDzZvLIJfb8I4oATD8pSB+mjQMPyqYQ="; 30 + }; 29 31 }; 30 32 x86_64-darwin = { 31 33 stable = fetchurl { ··· 44 38 url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; 45 39 sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l"; 46 40 }; 41 + development = fetchurl { 42 + url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; 43 + sha256 = "sha256-K4rlShYhmsjT2QHjb6+IbCXJFK+9REIx/gW68bcVSVc="; 44 + }; 47 45 }; 48 46 aarch64-darwin = x86_64-darwin; 49 47 }; ··· 59 49 downloadPage = "https://discordapp.com/download"; 60 50 sourceProvenance = with sourceTypes; [ binaryNativeCode ]; 61 51 license = licenses.unfree; 62 - maintainers = with maintainers; [ MP2E artturin infinidoge ]; 52 + maintainers = with maintainers; [ MP2E artturin infinidoge jopejoe1 ]; 63 53 platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; 64 54 }; 65 55 package = ··· 92 82 pname = "discord-canary"; 93 83 binaryName = if stdenv.isLinux then "DiscordCanary" else desktopName; 94 84 desktopName = "Discord Canary"; 85 + }; 86 + development = rec { 87 + pname = "discord-development"; 88 + binaryName = if stdenv.isLinux then "DiscordDevelopment" else desktopName; 89 + desktopName = "Discord Development"; 95 90 }; 96 91 } 97 92 );
+10 -2
pkgs/top-level/all-packages.nix
··· 39817 39817 39818 39818 mpvc = callPackage ../applications/misc/mpvc { }; 39819 39819 39820 + # Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906) 39820 39821 discord = import ../applications/networking/instant-messengers/discord { 39821 39822 inherit lib stdenv; 39822 39823 inherit (pkgs) callPackage fetchurl; 39823 39824 branch = "stable"; 39824 39825 }; 39825 - 39826 - discordo = callPackage ../applications/networking/discordo/default.nix { }; 39827 39826 39828 39827 discord-ptb = import ../applications/networking/instant-messengers/discord { 39829 39828 inherit lib stdenv; ··· 39835 39836 inherit (pkgs) callPackage fetchurl; 39836 39837 branch = "canary"; 39837 39838 }; 39839 + 39840 + discord-development = import ../applications/networking/instant-messengers/discord { 39841 + inherit lib stdenv; 39842 + inherit (pkgs) callPackage fetchurl; 39843 + branch = "development"; 39844 + }; 39845 + 39846 + 39847 + discordo = callPackage ../applications/networking/discordo/default.nix { }; 39838 39848 39839 39849 golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { }; 39840 39850