From c60da1cb0d2bf5cd1f2ecad73529552db074588b Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Thu, 27 May 2021 17:55:17 +0200 Subject: [PATCH 1/3] teamspeak_server: fix updateScript (cherry picked from commit 18f28923c6dd34aec04ca95ebeb2384fe9249db3) --- .../networking/instant-messengers/teamspeak/server.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index e266265291b..e6acb7bd702 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -30,14 +30,14 @@ in stdenv.mkDerivation rec { passthru.updateScript = writeScript "update-teampeak-server" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused + #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused jq pup set -eu -o pipefail version=$( \ - curl -s "https://www.teamspeak.de/download/teamspeak-3-amd64-server-linux/" \ - | grep softwareVersion \ - | sed -E -e 's/^.*([^<]+)<\/span>.*$/\1/' \ + curl https://www.teamspeak.com/en/downloads/ \ + | pup "#server .linux .version json{}" \ + | jq -r ".[0].text" ) versionOld=$(nix-instantiate --eval --strict -A "teamspeak_server.version") From b6951a764afb5944df4ee39c90ac77f9eb61aea6 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Thu, 27 May 2021 17:55:40 +0200 Subject: [PATCH 2/3] teamspeak_server: 3.13.3 -> 3.13.5 (cherry picked from commit d0773a3c1fe74a85e8e0c9624d363fa69091b9c7) --- .../networking/instant-messengers/teamspeak/server.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index e6acb7bd702..d76be9c81ca 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -4,13 +4,13 @@ let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.13.3"; + version = "3.13.5"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "sha256-+b9S0ekQmXF5KwvVcmHIDpp0iZRO2W1ls8eYhDzjUUw=" - else "sha256-Qu6xPzbUdqO93j353cfQILlFYqmwFSnFWG9TjniX0+c="; + then "sha256-2tSX/ET2lZsi0mVB3KnbnBXMSTRsneGUA8w6mZ6TmlY=" + else "sha256-RdxG4nGXTTSY+P5oZu4uP5l7gKcU9C6uIILyNldSK50="; }; buildInputs = [ stdenv.cc.cc postgresql.lib ]; From 0699e902e6fef1b9d51f523657575430c8a41354 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Thu, 27 May 2021 18:58:20 +0200 Subject: [PATCH 3/3] teamspeak_server: add missing runHook commands (cherry picked from commit 88b0d669e470b35399c1c0d226f8c42ff6aab55b) --- .../networking/instant-messengers/teamspeak/server.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index d76be9c81ca..daa97b68217 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -18,6 +18,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' + runHook preInstall + # Install files. mkdir -p $out/lib/teamspeak mv * $out/lib/teamspeak/ @@ -26,6 +28,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin/ ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server ln -s $out/lib/teamspeak/tsdns/tsdnsserver $out/bin/tsdnsserver + + runHook postInstall ''; passthru.updateScript = writeScript "update-teampeak-server" ''