git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #158477 from hlolli/fix-slack-updater-and-url

slack: fix linux url and updater

commit64b690300863dd46651da6ecc69451e8ffb8af97 authorBen Siraphob <bensiraphob@gmail.com> dateMon 7 Feb 2022, 17:57 (5 years ago) parent21e762587ef1e8
2 files changed+7−5
compare with master
unifiedsplit
pkgs/applications/networking/instant-messengers/slack/default.nix+3−3 pkgs/applications/networking/instant-messengers/slack/update.sh+4−2
pkgs/applications/networking/instant-messengers/slack/default.nix+3−3
@@ -51,8 +51,8 @@ let
5151 x86_64-linux-version = "4.23.0";
5252 x86_64-linux-sha256 = "1wsrxacnj9f3cb6as7ncbdvi02jqcbyc7ijsavps5bls9phkp0is";
5353
54− aarch64-darwin-version = "4.22.0";
55− aarch64-darwin-sha256 = "1z2pcgva9ixjx702c1535b4k0xr9fdnfzi5m08xgvabk9x66hqx4";
54+ aarch64-darwin-version = "4.23.0";
55+ aarch64-darwin-sha256 = "053psiqysyi7l8pviq0vwvk2azlxcpdrwfa0b99f1h6lbfcf48f3";
5656
5757 version = {
5858 x86_64-darwin = x86_64-darwin-version;
@@ -69,7 +69,7 @@ let
6969 sha256 = x86_64-darwin-sha256;
7070 };
7171 x86_64-linux = fetchurl {
72− url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
72+ url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb";
7373 sha256 = x86_64-linux-sha256;
7474 };
7575 aarch64-darwin = fetchurl {
pkgs/applications/networking/instant-messengers/slack/update.sh+4−2
@@ -18,7 +18,9 @@ nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"
1818nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
1919nixpkgs_mac_arm_version=$(cat "$slack_nix" | sed -n 's/.*aarch64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
2020
21−if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then
21+if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && \
22+ "$nixpkgs_mac_version" == "$latest_mac_version" && \
23+ "$nixpkgs_mac_arm_version" == "$latest_mac_version" ]]; then
2224 echo "nixpkgs versions are all up to date!"
2325 exit 0
2426fi
@@ -34,7 +36,7 @@ sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_
3436sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
3537sed -i "s/aarch64-darwin-version = \".*\"/aarch64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
3638sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix"
37−sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix"
39+sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix"
3840sed -i "s/aarch64-darwin-sha256 = \".*\"/aarch64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix"
3941
4042if ! nix-build -A slack "$nixpkgs"; then