From 2958e1b60ae7ca80d07c69b1c7c9582616b4c3c3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 2 Oct 2023 08:44:26 +0300 Subject: [PATCH 1/4] discord: Add update script for darwin Runnable on linux with ``` nix-shell maintainers/scripts/update.nix --argstr commit true --argstr package pkgsCross.aarch64-darwin.discord ``` The generated commit will have the pkgsCross prefix so that has to be removed manually `pkgsCross.aarch64-darwin.discord-canary: 0.0.312 -> 0.0.314` --- .../instant-messengers/discord/darwin.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index ef3a9031bb9f..c6f901639693 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper +{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, writeScript , branch , withOpenASAR ? false, openasar , withVencord ? false, vencord }: @@ -31,4 +31,19 @@ stdenv.mkDerivation { echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js ''; + + passthru = { + updateScript = writeScript "discord-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + set -x + set -eou pipefail; + url=$(curl -sI "https://discordapp.com/api/download/${ + builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname + }?platform=osx&format=dmg" | grep -oP 'location: \K\S+') + version=''${url##https://dl*.discordapp.net/apps/osx/} + version=''${version%%/*.dmg} + update-source-version ${lib.optionalString (!stdenv.buildPlatform.isDarwin) "pkgsCross.aarch64-darwin."}${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch} + ''; + }; } From cec7bbec36bda4f48d698310a48c92ff3a79e5d6 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 2 Oct 2023 05:46:49 +0000 Subject: [PATCH 2/4] discord-canary: 0.0.312 -> 0.0.314 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 41066090012b..0ac46b875ae1 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -8,7 +8,7 @@ let } else { stable = "0.0.278"; ptb = "0.0.77"; - canary = "0.0.312"; + canary = "0.0.314"; development = "0.0.8795"; }; version = versions.${branch}; @@ -42,7 +42,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-iV131kzFcN2+eqUetqZShKqjAQfm64y6bxzAddV7wuw="; + hash = "sha256-SbCEao9Nh3cqCRD7FsHoKMVdy8T1y5tZAAGWHE6bSz0="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From 51c30df0c783d9f016768b5b94c913e4ac70f176 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 2 Oct 2023 05:50:13 +0000 Subject: [PATCH 3/4] discord-development: 0.0.8795 -> 0.0.8797 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 0ac46b875ae1..2e2cba5462af 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let stable = "0.0.278"; ptb = "0.0.77"; canary = "0.0.314"; - development = "0.0.8795"; + development = "0.0.8797"; }; version = versions.${branch}; srcs = rec { @@ -46,7 +46,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-d/i7LHbJbbUUk/7iU63Xh4RWxs8ZyiCpZSS68JFW2Ps="; + hash = "sha256-ra0El4Y7SqanY6ZBbHE1Y+pqel4OD7nXKKfg/vndULo="; }; }; aarch64-darwin = x86_64-darwin; From 30fac10dbcd7cf941ae8360984c50afeed315187 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 2 Oct 2023 05:50:44 +0000 Subject: [PATCH 4/4] discord-ptb: 0.0.77 -> 0.0.79 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2e2cba5462af..f106a64fc0eb 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,7 +7,7 @@ let development = "0.0.232"; } else { stable = "0.0.278"; - ptb = "0.0.77"; + ptb = "0.0.79"; canary = "0.0.314"; development = "0.0.8797"; }; @@ -38,7 +38,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-Dn+k51SyHpJ1C1gJx3ZLRzD/cdzhX9qANZU2KEn9lY0="; + hash = "sha256-HI4+ABFQtRBL7a3koCehJgn8WxJW86sCyuZE70n1AHk="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";