public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

discord-{ptb,canary}: update to latest versions and fixup updateScript

Browse Source 
This commit:

- Moves the update script into the dir, out of the maintainers dir. This makes
  it more discoverable in general. It can also be invoked from anywhere to write
  to default.nix
- Swaps it to use the standardized `passthru.updateScript`. This means that
  eventually bots like `nixpkgs-update` will be able to handle it.
- Runs the script to upgrade to the latest versions

See https://nixos.org/nixpkgs/manual/#ssec-stdenv-attributes
This commit is contained in:
Benjamin Hipple 2020-04-12 11:55:36 -04:00
parent 17a1bf5dbd
commit 58b812f749
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/discord/base.nix
View File

@ -51,6 +51,8 @@ in stdenv.mkDerivation rec {
mimeType = "x-scheme-handler/discord"; mimeType = "x-scheme-handler/discord";
}; };
passthru.updateScript = ./update-discord.sh;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "All-in-one cross-platform voice and text chat for gamers"; description = "All-in-one cross-platform voice and text chat for gamers";
homepage = "https://discordapp.com/"; homepage = "https://discordapp.com/";

10
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -1,5 +1,5 @@
{ branch ? "stable", pkgs }: { branch ? "stable", pkgs }:
# Generated by /maintainers/scripts/update-discord # Generated by ./update-discord.sh
let let
inherit (pkgs) callPackage fetchurl; inherit (pkgs) callPackage fetchurl;
in { in {
@ -17,20 +17,20 @@ in {
pname = "discord-ptb"; pname = "discord-ptb";
binaryName = "DiscordPTB"; binaryName = "DiscordPTB";
desktopName = "Discord PTB"; desktopName = "Discord PTB";
version = "0.0.18"; version = "0.0.19";
src = fetchurl { src = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
sha256 = "1v9xph7shpmabwysbc08qqlkydzgsir8rwarrjf01xmpcpyia17g"; sha256 = "0wixmm16qsmgbr0l9144vl5pc3s2p4jqhl7cnc6kmgy1y4ig56ib";
}; };
}; };
canary = callPackage ./base.nix rec { canary = callPackage ./base.nix rec {
pname = "discord-canary"; pname = "discord-canary";
binaryName = "DiscordCanary"; binaryName = "DiscordCanary";
desktopName = "Discord Canary"; desktopName = "Discord Canary";
version = "0.0.102"; version = "0.0.103";
src = fetchurl { src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "1zl53vprkwbkfn3v0lddpp1swignqjxksi4qxl5zqj7482j372a4"; sha256 = "1d95q75ak4z6wkxlgcmkl7yk20gl7zf568b0xslz42hwx032fn4z";
}; };
}; };
}.${branch} }.${branch}

6
maintainers/scripts/update-discord → pkgs/applications/networking/instant-messengers/discord/update-discord.sh
View File

@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# script to generate `pkgs/networking/instant-messengers/discord/default.nix` # script to generate ./default.nix
set -e set -e
exec >${1:?usage: $0 <output-file>} exec >"${BASH_SOURCE%/*}/default.nix"
cat <<EOF cat <<EOF
{ branch ? "stable", pkgs }: { branch ? "stable", pkgs }:
# Generated by /maintainers/scripts/update-discord # Generated by ./update-discord.sh
let let
inherit (pkgs) callPackage fetchurl; inherit (pkgs) callPackage fetchurl;
in { in {