From 24a269500a2311288ce708aaad9ebd42f794d691 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Wed, 3 Jun 2026 11:54:09 +0800 Subject: [PATCH] qq: 2026-04-01 -> 2026-05-28 Stop removing bundled sharp-lib: QQ 3.2.29's sharp native module requires vips_g_once, a symbol not present in nixpkgs vips 8.18.2. Ref: https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=09687efd16879e1cecc532b06e2f4602722d3c69 --- pkgs/by-name/qq/qq/package.nix | 5 ----- pkgs/by-name/qq/qq/sources.nix | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index 8f8e29ad5ae4..71e592b1d694 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -21,7 +21,6 @@ systemd, stdenv, undmg, - vips, at-spi2-core, autoPatchelfHook, writeShellScript, @@ -112,7 +111,6 @@ else libkrb5 libgbm nss - vips libxdamage ]; @@ -201,9 +199,6 @@ else --run '${versionConfigScript} || true' ''} - # Remove bundled libraries - rm -r $out/opt/QQ/resources/app/sharp-lib - # https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=f7644776ee62fa20e5eb30d0b1ba832513c77793 rm -r $out/opt/QQ/resources/app/libssh2.so.1 diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index a7d2b8b1bc63..069b9861e72e 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,12 +1,12 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2026-04-15 +# Last updated: 2026-06-03 { fetchurl }: let any-darwin = { - version = "6.9.93-2026-04-01"; + version = "6.9.96-2026-05-28"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.93_260401_01.dmg"; - hash = "sha256-xCyvVAxYKma92SkL1fLraXKeDcKlRLLybtwKPWUKlis="; + url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/045f4292/QQ_6.9.96_260528_01.dmg"; + hash = "sha256-cMgWMXfKtL4ZLBrjGhROpCMNAHtFIdnZRfyi9XtsIjI="; }; }; in @@ -14,17 +14,17 @@ in aarch64-darwin = any-darwin; x86_64-darwin = any-darwin; aarch64-linux = { - version = "3.2.27-2026-04-01"; + version = "3.2.29-2026-05-28"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.27_260401_arm64_01.deb"; - hash = "sha256-sGLYPAdZmcxGy+3Lo7MEeEXysqP24XTWaQY/iM9bRLU="; + url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/00e6a3e7/QQ_3.2.29_260528_arm64_01.deb"; + hash = "sha256-W82MzaQB+/oYIafDx1j4SiU8MXVo8LnC10QmokdJ6aY="; }; }; x86_64-linux = { - version = "3.2.27-2026-04-01"; + version = "3.2.29-2026-05-28"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.27_260401_amd64_01.deb"; - hash = "sha256-iI5gc0VSZAzab2B+w1I/6idSD/zx45Ou+uyqSJzCC+c="; + url = "https://qqdl.gtimg.cn/qqfile/QQNT/9.9.31/release/00e6a3e7/QQ_3.2.29_260528_amd64_01.deb"; + hash = "sha256-HjgoB5ZzyUmUvA9HgNXYUoZHY5kgZZhi1J0cLyoZjiU="; }; }; }