From eacd0a96dd79395aeb0bac130224e0ddbec40af1 Mon Sep 17 00:00:00 2001 From: 500InternalError Date: Sat, 27 Apr 2024 15:19:11 +0800 Subject: [PATCH 1/3] qq: fix update script --- .../applications/networking/instant-messengers/qq/update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qq/update.sh b/pkgs/applications/networking/instant-messengers/qq/update.sh index 8b9121299bbe..777ea2a90103 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 < Date: Sat, 27 Apr 2024 15:19:31 +0800 Subject: [PATCH 2/3] qq: fix download url --- .../applications/networking/instant-messengers/qq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index d0a7bbf2a1a9..eea656250b93 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; }; }; From 7992ec3a816aa3f5cf2b62146c5412c8581943d1 Mon Sep 17 00:00:00 2001 From: 500InternalError Date: Sat, 27 Apr 2024 15:20:08 +0800 Subject: [PATCH 3/3] qq: 3.2.5-21453 -> 3.2.7 --- .../networking/instant-messengers/qq/sources.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index 0353fcc19fe2..590dbb3605e0 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="; }