qq: 3.2.13-2024.11.12 -> 3.2.15-2024.12.10 (NixOS#362758)

khaneliman · Dec 14, 2024 · 119bb29 · 119bb29
2 parents 5e4f013 + 122fea0
commit 119bb29
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
@@ -75,6 +75,7 @@ stdenv.mkDerivation {
 
   runtimeDependencies = map lib.getLib [
     systemd
+    libkrb5
   ];
 
   installPhase = ''
@@ -84,8 +85,8 @@ stdenv.mkDerivation {
     cp -r opt $out/opt
     cp -r usr/share $out/share
     substituteInPlace $out/share/applications/qq.desktop \
-      --replace "/opt/QQ/qq" "$out/bin/qq" \
-      --replace "/usr/share" "$out/share"
+      --replace-fail "/opt/QQ/qq" "$out/bin/qq" \
+      --replace-fail "/usr/share" "$out/share"
     makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
       --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \

diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
@@ -1,9 +1,9 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2024-11-17
+# Last updated: 2024-12-14
 {
-  version = "3.2.13-2024.11.12";
-  amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.13_241112_amd64_01.deb";
-  arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.13_241112_arm64_01.deb";
-  arm64_hash = "sha256-eAWneMK6aJUVudQemganaRiDnEGtDcJB9z0OIehlD48=";
-  amd64_hash = "sha256-ycGNihLYcemA37PGpGT5hCaiq5nD4KumqSMF7TKk4iI=";
+  version = "3.2.15-2024.12.10";
+  amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241210_amd64_01.deb";
+  arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241210_arm64_01.deb";
+  arm64_hash = "sha256-oQ3pP/9G7Xx3OO//Yl46DNxHsJ0bDwnwQHrtTdfQY6o=";
+  amd64_hash = "sha256-KvcJGLavX8riUsiV6R4xbEns+lu/fb2LXpcXtKW/Grs=";
 }
diff --git a/pkgs/by-name/qq/qq/update.sh b/pkgs/by-name/qq/qq/update.sh
@@ -15,8 +15,8 @@ amd64_hash=$(nix-prefetch-url $amd64_url)
 arm64_hash=$(nix-prefetch-url $arm64_url)
 
 # use friendlier hashes
-amd64_hash=$(nix hash to-sri --type sha256 "$amd64_hash")
-arm64_hash=$(nix hash to-sri --type sha256 "$arm64_hash")
+amd64_hash=$(nix hash convert --to sri --hash-algo sha256 "$amd64_hash")
+arm64_hash=$(nix hash convert --to sri --hash-algo sha256 "$arm64_hash")
 
 cat >sources.nix <<EOF
 # Generated by ./update.sh - do not update manually!