From 70167b64c55b488f115335269779f360194d9fe9 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Fri, 11 Oct 2019 21:48:57 -0600
Subject: [PATCH] maintainers/scripts/update-discord: improve

- add comment specifying file is generated
- remove repetition of version number
---
 maintainers/scripts/update-discord                 |  6 +++---
 .../instant-messengers/discord/default.nix         | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/maintainers/scripts/update-discord b/maintainers/scripts/update-discord
index 23ec6e401be4..b4c26b3bdefd 100755
--- a/maintainers/scripts/update-discord
+++ b/maintainers/scripts/update-discord
@@ -6,7 +6,7 @@ exec >${1:?usage: $0 <output-file>}
 
 cat <<EOF
 { branch ? "stable", pkgs }:
-
+# Generated by /maintainers/scripts/update-discord
 let
   inherit (pkgs) callPackage fetchurl;
 in {
@@ -16,7 +16,7 @@ for branch in "" ptb canary; do
     url=$(curl -sI "https://discordapp.com/api/download${branch:+/}${branch}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')
     version=${url##https://dl*.discordapp.net/apps/linux/}
     version=${version%%/*.tar.gz}
-    echo "  ${branch:-stable} = callPackage ./base.nix {"
+    echo "  ${branch:-stable} = callPackage ./base.nix rec {"
     echo "    pname = \"discord${branch:+-}${branch}\";"
     case $branch in
         "") suffix="" ;;
@@ -27,7 +27,7 @@ for branch in "" ptb canary; do
     echo "    desktopName = \"Discord${suffix:+ }${suffix}\";"
     echo "    version = \"${version}\";"
     echo "    src = fetchurl {"
-    echo "      url = \"${url}\";"
+    echo "      url = \"${url//${version}/\$\{version\}}\";"
     echo "      sha256 = \"$(nix-prefetch-url "$url")\";"
     echo "    };"
     echo "  };"
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 78a1ffbfc110..a54c4f4955aa 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,35 +1,35 @@
 { branch ? "stable", pkgs }:
-
+# Generated by /maintainers/scripts/update-discord
 let
   inherit (pkgs) callPackage fetchurl;
 in {
-  stable = callPackage ./base.nix {
+  stable = callPackage ./base.nix rec {
     pname = "discord";
     binaryName = "Discord";
     desktopName = "Discord";
     version = "0.0.9";
     src = fetchurl {
-      url = "https://dl.discordapp.net/apps/linux/0.0.9/discord-0.0.9.tar.gz";
+      url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
       sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf";
     };
   };
-  ptb = callPackage ./base.nix {
+  ptb = callPackage ./base.nix rec {
     pname = "discord-ptb";
     binaryName = "DiscordPTB";
     desktopName = "Discord PTB";
     version = "0.0.16";
     src = fetchurl {
-      url = "https://dl-ptb.discordapp.net/apps/linux/0.0.16/discord-ptb-0.0.16.tar.gz";
+      url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
       sha256 = "1ia94xvzygim9rx1sjnnss518ggw0i20mhp9pby33q70ha35n0aq";
     };
   };
-  canary = callPackage ./base.nix {
+  canary = callPackage ./base.nix rec {
     pname = "discord-canary";
     binaryName = "DiscordCanary";
     desktopName = "Discord Canary";
     version = "0.0.97";
     src = fetchurl {
-      url = "https://dl-canary.discordapp.net/apps/linux/0.0.97/discord-canary-0.0.97.tar.gz";
+      url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
       sha256 = "17kwgk2kwrfqgjqmfv055gvlqq144gz7bywwrs6i2x7mimz4345x";
     };
   };