Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8a7316ed6769
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1b9421062dfa
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 14, 2019

  1. discord-canary: 0.0.96 -> 0.0.97 

    (cherry picked from commit 64ccc04)
    @tadeokondrak
    tadeokondrak committed Nov 14, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    tadeokondrak Tadeo Kondrak
    GPG key ID: D41E092CA43F1D8B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d50afea View commit details

  2. maintainers/scripts/update-discord: improve 

    - add comment specifying file is generated
- remove repetition of version number

(cherry picked from commit ad6e1e4)
    @tadeokondrak
    tadeokondrak committed Nov 14, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    tadeokondrak Tadeo Kondrak
    GPG key ID: D41E092CA43F1D8B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1cb5b33 View commit details

  3. discord-canary: 0.0.97 -> 0.0.98 

    (cherry picked from commit 2e6498332463c435076878be2f9685db22cdb00e)
    @tadeokondrak
    tadeokondrak committed Nov 14, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    tadeokondrak Tadeo Kondrak
    GPG key ID: D41E092CA43F1D8B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4ac29c3 View commit details

Commits on Nov 23, 2019

  1. Merge pull request #70979 from tadeokondrak/discord-canary-0.0.97-19.09 

    discord-canary: 0.0.96 -> 0.0.98 (backport)
    @c0bw3b
    c0bw3b authored Nov 23, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1b94210 View commit details
Showing with 12 additions and 12 deletions.
  1. +3 −3 maintainers/scripts/update-discord
  2. +9 −9 pkgs/applications/networking/instant-messengers/discord/default.nix
6 changes: 3 additions & 3 deletions maintainers/scripts/update-discord
View file
Original file line number Diff line number Diff line change
@@ -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 " };"
18 changes: 9 additions & 9 deletions pkgs/applications/networking/instant-messengers/discord/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
{ 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.96";
version = "0.0.98";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/0.0.96/discord-canary-0.0.96.tar.gz";
sha256 = "1fxyh9v5xglwbgr5sidn0cv70qpzcd2q240wsv87k3nawhvfcwsp";
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "0raqsfakjbcsh7g280yi7sg2jsrmy2q4jldg73wb868z35radld4";
};
};
}.${branch}