diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/applications/networking/instant-messengers/slack | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/slack')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/slack/default.nix | 83 | ||||
-rwxr-xr-x | pkgs/applications/networking/instant-messengers/slack/update.sh | 41 |
2 files changed, 97 insertions, 27 deletions
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 777aabf021b..24282f4be33 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,10 +1,11 @@ -{ stdenv +{ lib +, stdenv , fetchurl , dpkg , undmg , makeWrapper , nodePackages -, alsaLib +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -19,18 +20,21 @@ , glib , gnome2 , gtk3 +, libGL , libappindicator-gtk3 , libdrm , libnotify , libpulseaudio , libuuid , libxcb +, libxkbcommon +, libxshmfence , mesa , nspr , nss , pango , systemd -, xdg_utils +, xdg-utils , xorg }: @@ -39,37 +43,56 @@ let throwSystem = throw "Unsupported system: ${system}"; pname = "slack"; - version = { - x86_64-darwin = "4.8.0"; - x86_64-linux = "4.8.0"; - }.${system} or throwSystem; - src = let - base = "https://downloads.slack-edge.com"; - in { - x86_64-darwin = fetchurl { - url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = "0k22w3c3brbc7ivmc5npqy8h7zxfgnbs7bqwii03psymm6sw53j2"; - }; - x86_64-linux = fetchurl { - url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0q8qpz5nwhps7y5gq1bl8hjw7vsk789srrv39hzc7jrl8f1bxzk0"; - }; + x86_64-darwin-version = "4.17.0"; + x86_64-darwin-sha256 = "0r5cafxw73qnn14ljprn7w8bfn67zbkcniq60k9pf2zbqgb4cyj9"; + + x86_64-linux-version = "4.17.0"; + x86_64-linux-sha256 = "07ccms58pq27ilkyhcf6cgwb7qrddwil5kgy8yv95ljikqzi5rxi"; + + aarch64-darwin-version = "4.17.0"; + aarch64-darwin-sha256 = "1a5crmnbz8ng3z2pk5zw17dds9d5fyir4rkvv611fn858kq5fv46"; + + version = { + x86_64-darwin = x86_64-darwin-version; + aarch64-darwin = aarch64-darwin-version; + x86_64-linux = x86_64-linux-version; }.${system} or throwSystem; - meta = with stdenv.lib; { + src = + let + base = "https://downloads.slack-edge.com"; + in + { + x86_64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; + sha256 = x86_64-darwin-sha256; + }; + aarch64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; + sha256 = aarch64-darwin-sha256; + }; + x86_64-linux = fetchurl { + url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; + sha256 = x86_64-linux-sha256; + }; + }.${system} or throwSystem; + + meta = with lib; { description = "Desktop client for Slack"; homepage = "https://slack.com"; license = licenses.unfree; maintainers = with maintainers; [ mmahut ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin"]; }; linux = stdenv.mkDerivation rec { inherit pname version src meta; - rpath = stdenv.lib.makeLibraryPath [ - alsaLib + passthru.updateScript = ./update.sh; + + rpath = lib.makeLibraryPath [ + alsa-lib at-spi2-atk at-spi2-core atk @@ -84,12 +107,14 @@ let glib gnome2.GConf gtk3 + libGL libappindicator-gtk3 libdrm libnotify libpulseaudio libuuid libxcb + libxkbcommon mesa nspr nss @@ -108,10 +133,11 @@ let xorg.libXrender xorg.libXtst xorg.libxkbfile + xorg.libxshmfence ] + ":${stdenv.cc.cc.lib}/lib64"; buildInputs = [ - gtk3 # needed for GSETTINGS_SCHEMAS_PATH + gtk3 # needed for GSETTINGS_SCHEMAS_PATH ]; nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ]; @@ -140,7 +166,7 @@ let rm $out/bin/slack makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --prefix PATH : ${xdg_utils}/bin + --prefix PATH : ${lib.makeBinPath [xdg-utils]} # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ @@ -152,6 +178,8 @@ let darwin = stdenv.mkDerivation { inherit pname version src meta; + passthru.updateScript = ./update.sh; + nativeBuildInputs = [ undmg ]; sourceRoot = "Slack.app"; @@ -162,6 +190,7 @@ let /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES ''; }; -in if stdenv.isDarwin - then darwin - else linux +in +if stdenv.isDarwin +then darwin +else linux diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh new file mode 100755 index 00000000000..0bb0d784167 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl gnused + +set -eou pipefail + +latest_linux_version=$(curl -L --silent https://slack.com/downloads/linux | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') +latest_mac_version=$(curl -L --silent https://slack.com/downloads/mac | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') + +# Double check that the latest mac and linux versions are in sync. +if [[ "$latest_linux_version" != "$latest_mac_version" ]]; then + echo "the latest linux ($latest_linux_version) and mac ($latest_mac_version) versions are not the same" + exit 1 +fi + +nixpkgs="$(git rev-parse --show-toplevel)" +slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix" +nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p') +nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p') + +if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then + echo "nixpkgs versions are all up to date!" + exit 0 +fi + +linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb" +mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg" +linux_sha256=$(nix-prefetch-url ${linux_url}) +mac_sha256=$(nix-prefetch-url ${mac_url}) + +sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix" +sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix" +sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix" +sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix" + +if ! nix-build -A slack "$nixpkgs"; then + echo "The updated slack failed to build." + exit 1 +fi + +echo "Successfully updated" +echo "slack: $nixpkgs_linux_version -> $latest_linux_version" |