diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-28 04:02:14 +0200 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-28 04:02:14 +0200 |
commit | 7f45fee52a693123c5027e554fa38a8dc0debd40 (patch) | |
tree | d80d200737e36b48ec5b2d5b5e30a545700d88f9 /pkgs/applications/networking/instant-messengers | |
parent | 19c30e016f04874d60ed0922bf58be4aa9a15e53 (diff) | |
parent | 32a79f412e8665f3d0b17833f73914f9e9549a0d (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
5 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index cca91da3abda1..e38d45a001763 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -20,7 +20,7 @@ , sqlite , autoAwaySupport ? true, libXScrnSaver, libX11 , notifySupport ? true, libnotify, gdk-pixbuf -, omemoSupport ? true, libsignal-protocol-c, libgcrypt +, omemoSupport ? true, libsignal-protocol-c, libgcrypt, qrencode , pgpSupport ? true, gpgme , pythonPluginSupport ? true, python3 , traySupport ? true, gtk3 @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { sqlite ] ++ lib.optionals autoAwaySupport [ libXScrnSaver libX11 ] ++ lib.optionals notifySupport [ libnotify gdk-pixbuf ] - ++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt ] + ++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt qrencode ] ++ lib.optionals pgpSupport [ gpgme ] ++ lib.optionals pythonPluginSupport [ python3 ] ++ lib.optionals traySupport [ gtk3 ]; diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index 5e08fc09a97b3..af5bdcc15f487 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -28,11 +28,11 @@ let sources = import ./sources.nix; srcs = { x86_64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/${sources.urlhash}/linuxqq_${sources.version}_amd64.deb"; + url = sources.amd64_url; hash = sources.amd64_hash; }; aarch64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/${sources.urlhash}/linuxqq_${sources.version}_arm64.deb"; + url = sources.arm64_url; hash = sources.arm64_hash; }; }; diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index 0353fcc19fe27..590dbb3605e0e 100644 --- a/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,8 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-02-16 +# Last updated: 2024-04-27 { - version = "3.2.5-21453"; - urlhash = "852276c1"; - arm64_hash = "sha256-g0J1FWG07bkabDHp2nuS48MNut2+N7gk0k5zWcmuQVw="; - amd64_hash = "sha256-6Qe4bP3q9RLEIJn9EfqqYaVTF8FRBNcjtVPl+zY7v5c="; + version = "3.2.7"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240422_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240422_arm64_01.deb"; + arm64_hash = "sha256-MrLkPHri3ifVy3+WNNs/CKK4Myztw8ZjWFEZDr27mpM="; + amd64_hash = "sha256-eZMzMaqCF514Wij8BZ0sLoyzjKNArLSFe92tN9WAiu0="; } diff --git a/pkgs/applications/networking/instant-messengers/qq/update.sh b/pkgs/applications/networking/instant-messengers/qq/update.sh index 8b9121299bbec..777ea2a90103a 100755 --- a/pkgs/applications/networking/instant-messengers/qq/update.sh +++ b/pkgs/applications/networking/instant-messengers/qq/update.sh @@ -9,8 +9,7 @@ payload=$(curl https://im.qq.com/rainbow/linuxQQDownload | grep -oP "var params= amd64_url=$(jq -r .x64DownloadUrl.deb <<< "$payload") arm64_url=$(jq -r .armDownloadUrl.deb <<< "$payload") -urlhash=$(grep -oP "(?<=QQNT/)[a-f0-9]+(?=/linuxqq)" <<< "$amd64_url") -version=$(grep -oP "(?<=/linuxqq_).*(?=_amd64.deb)" <<< "$amd64_url") +version=$(grep -oP "(?<=/QQ_).*(?=_[0-9]{6})" <<< "$amd64_url") amd64_hash=$(nix-prefetch-url $amd64_url) arm64_hash=$(nix-prefetch-url $arm64_url) @@ -24,7 +23,8 @@ cat >sources.nix <<EOF # Last updated: $(date +%F) { version = "$version"; - urlhash = "$urlhash"; + amd64_url = "$amd64_url"; + arm64_url = "$arm64_url"; arm64_hash = "$arm64_hash"; amd64_hash = "$amd64_hash"; } diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index e0ce9027551c2..82494a442f933 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -84,7 +84,7 @@ let changelog = "https://slack.com/release-notes"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ mmahut amaxine ]; + maintainers = with maintainers; [ mmahut ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; mainProgram = "slack"; }; |