teamspeak5_client: 5.0.0-beta77 -> 6.0.0-beta2; teamspeak refactors (#377748)

* teamspeak5_client: 5.0.0-beta77 -> 6.0.0-beta2, rename to teamspeak-6-client

* teamspeak6-client: refactor

* lib.licenses: add teamspeak license

* teamspeak{3,_server,6-client}: use teamspeak license

* teamspeak{6-client,_server}: move to pkgs/by-name

* teamspeak_server: fix meta.platforms

* teamspeak6-client: add update script

lib/licenses.nix

···
     redistributable = false; # only free to redistribute "for non-commercial purposes"
   };
 
+  teamspeak = {
+    fullName = "Teamspeak client license";
+    url = "https://www.teamspeak.com/en/privacy-and-terms/";
+    free = false;
+    redistributable = true; # we got a permit to redistribute it:
+    # License issues:
+    # Date: Mon, 10 Dec 2007 19:55:16 -0500
+    # From: TeamSpeak Sales <[e-mail]>
+    # To: 'Marc Weber' <[e-mail]>
+    # Subject: RE: teamspeak on nix?
+    #
+    # Yes, that would be fine.  As long as you are not renting servers or selling
+    # TeamSpeak then you are more than welcome to distribute it.
+    #
+    # Thank you,
+    #
+    # TeamSpeak Sales Team
+    # ________________________________
+    # e-Mail: [e-mail]
+    # TeamSpeak: http://www.TeamSpeak.com
+    # Account Login: https://sales.TritonCIA.com/users
+    #
+    #
+    #
+    # -----Original Message-----
+    # From: Marc Weber [mailto:[e-mail]]
+    # Sent: Monday, December 10, 2007 5:03 PM
+    # To: [e-mail]
+    # Subject: teamspeak on nix?
+    #
+    # Hello,
+    #
+    # nix is very young software distribution system (http://nix.cs.uu.nl/)
+    # I'd like to ask wether you permit us to add teamspeak (server/ client?)
+    #
+    # Sincerly
+    # Marc Weber (small nix contributor)
+  };
+
   tsl = {
     shortName = "TSL";
     fullName = "Timescale License Agreegment";

pkgs/applications/networking/instant-messengers/teamspeak/client5.nix

···
-{
-  lib,
-  stdenv,
-  fetchurl,
-  autoPatchelfHook,
-  copyDesktopItems,
-  makeDesktopItem,
-  makeWrapper,
-  alsa-lib,
-  at-spi2-atk,
-  atk,
-  cairo,
-  cups,
-  dbus,
-  gcc-unwrapped,
-  gdk-pixbuf,
-  glib,
-  gtk3,
-  libdrm,
-  libnotify,
-  libpulseaudio,
-  libxkbcommon,
-  libgbm,
-  nss,
-  udev,
-  xorg,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "teamspeak5-client";
-  version = "5.0.0-beta77";
-
-  src = fetchurl {
-    # check https://teamspeak.com/en/downloads/#ts5 for version and checksum
-    url = "https://files.teamspeak-services.com/pre_releases/client/${version}/teamspeak-client.tar.gz";
-    sha256 = "6f3bf97b120d3c799cefc90c448e45836708a826d7caa07ad32b5c868eb9181b";
-  };
-
-  sourceRoot = ".";
-
-  propagatedBuildInputs = [
-    alsa-lib
-    at-spi2-atk
-    atk
-    cairo
-    cups.lib
-    dbus
-    gcc-unwrapped.lib
-    gdk-pixbuf
-    glib
-    gtk3
-    libdrm
-    libnotify
-    libpulseaudio
-    libxkbcommon
-    libgbm
-    nss
-    xorg.libX11
-    xorg.libXScrnSaver
-    xorg.libXdamage
-    xorg.libXfixes
-    xorg.libxshmfence
-  ];
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    copyDesktopItems
-    makeWrapper
-  ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "TeamSpeak";
-      exec = "TeamSpeak";
-      icon = pname;
-      desktopName = pname;
-      comment = "TeamSpeak Voice Communication Client";
-      categories = [
-        "Audio"
-        "AudioVideo"
-        "Chat"
-        "Network"
-      ];
-    })
-  ];
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin $out/share/${pname} $out/share/icons/hicolor/64x64/apps/
-
-    cp -a * $out/share/${pname}
-    cp logo-256.png $out/share/icons/hicolor/64x64/apps/${pname}.png
-
-    makeWrapper $out/share/${pname}/TeamSpeak $out/bin/TeamSpeak \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ udev ]}"
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "TeamSpeak voice communication tool (beta version)";
-    homepage = "https://teamspeak.com/";
-    license = {
-      fullName = "Teamspeak client license";
-      url = "https://www.teamspeak.com/en/privacy-and-terms/";
-      free = false;
-    };
-    maintainers = with maintainers; [ jojosch ];
-    platforms = [ "x86_64-linux" ];
-  };
-}

pkgs/applications/networking/instant-messengers/teamspeak/distribution-permit.txt

···
-License issues:
-Date: Mon, 10 Dec 2007 19:55:16 -0500
-From: TeamSpeak Sales <[e-mail]>
-To: 'Marc Weber' <[e-mail]>
-Subject: RE: teamspeak on nix?
-
-Yes, that would be fine.  As long as you are not renting servers or selling
-TeamSpeak then you are more than welcome to distribute it.
-
-Thank you,
-
-TeamSpeak Sales Team
-________________________________
-e-Mail: [e-mail]
-TeamSpeak: http://www.TeamSpeak.com
-Account Login: https://sales.TritonCIA.com/users
-
-
-
------Original Message-----
-From: Marc Weber [mailto:[e-mail]]
-Sent: Monday, December 10, 2007 5:03 PM
-To: [e-mail]
-Subject: teamspeak on nix?
-
-Hello,
-
-nix is very young software distribution system (http://nix.cs.uu.nl/)
-I'd like to ask wether you permit us to add teamspeak (server/ client?)
-
-Sincerly
-Marc Weber (small nix contributor)

pkgs/applications/networking/instant-messengers/teamspeak/server.nix pkgs/by-name/te/teamspeak_server/package.nix

···
     description = "TeamSpeak voice communication server";
     homepage = "https://teamspeak.com/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak.
-    license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    license = licenses.teamspeak;
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [
       arobyn
       gerschtli

pkgs/by-name/te/teamspeak3/package.nix

···
     description = "TeamSpeak voice communication tool";
     homepage = "https://teamspeak.com/";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = {
-      # See distribution-permit.txt for a confirmation that nixpkgs is allowed to distribute TeamSpeak.
-      fullName = "Teamspeak client license";
-      url = "https://www.teamspeak.com/en/privacy-and-terms/";
-      free = false;
-    };
+    license = lib.licenses.teamspeak;
     maintainers = with lib.maintainers; [
       lhvwb
       lukegb

pkgs/by-name/te/teamspeak6-client/package.nix

···
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  autoPatchelfHook,
+  copyDesktopItems,
+  makeDesktopItem,
+  makeWrapper,
+  alsa-lib,
+  at-spi2-atk,
+  atk,
+  cairo,
+  cups,
+  dbus,
+  gcc-unwrapped,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  libdrm,
+  libnotify,
+  libpulseaudio,
+  libxkbcommon,
+  libgbm,
+  nss,
+  udev,
+  libGL,
+  xorg,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "teamspeak6-client";
+  version = "6.0.0-beta2";
+
+  src = fetchurl {
+    url = "https://files.teamspeak-services.com/pre_releases/client/${finalAttrs.version}/teamspeak-client.tar.gz";
+    hash = "sha256-3jNPv3uQ2RztR1p4XQNLUg5IVrvW/dcdtqXdiGJKVSs=";
+  };
+
+  sourceRoot = ".";
+
+  propagatedBuildInputs = [
+    alsa-lib
+    at-spi2-atk
+    atk
+    cairo
+    cups.lib
+    dbus
+    gcc-unwrapped.lib
+    gdk-pixbuf
+    glib
+    gtk3
+    libdrm
+    libnotify
+    libpulseaudio
+    libxkbcommon
+    libgbm
+    nss
+    xorg.libX11
+    xorg.libXScrnSaver
+    xorg.libXdamage
+    xorg.libXfixes
+    xorg.libxshmfence
+    xorg.libXtst
+  ];
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    copyDesktopItems
+    makeWrapper
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "TeamSpeak";
+      exec = "TeamSpeak";
+      icon = "teamspeak6-client";
+      desktopName = "teamspeak6-client";
+      comment = "TeamSpeak Voice Communication Client";
+      categories = [
+        "Audio"
+        "AudioVideo"
+        "Chat"
+        "Network"
+      ];
+    })
+  ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/teamspeak6-client $out/share/icons/hicolor/64x64/apps/
+
+    cp -a * $out/share/teamspeak6-client
+    cp logo-256.png $out/share/icons/hicolor/64x64/apps/teamspeak6-client.png
+
+    makeWrapper $out/share/teamspeak6-client/TeamSpeak $out/bin/TeamSpeak \
+      --prefix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          udev
+          libGL
+        ]
+      }"
+
+    runHook postInstall
+  '';
+
+  updateScript = ./update.sh;
+
+  meta = {
+    description = "TeamSpeak voice communication tool (beta version)";
+    homepage = "https://teamspeak.com/";
+    license = lib.licenses.teamspeak;
+    mainProgram = "TeamSpeak";
+    maintainers = with lib.maintainers; [
+      gepbird
+      jojosch
+    ];
+    platforms = [ "x86_64-linux" ];
+  };
+})

pkgs/by-name/te/teamspeak6-client/update.sh

···
+#!/usr/bin/env nix-shell
+#!nix-shell --pure -i bash -p bash curl cacert ripgrep nix nix-update
+set -euo pipefail
+
+latest_version=$(
+    curl https://teamspeak.com/en/downloads/#ts6client | \
+    rg -o 'https://files.teamspeak-services.com/pre_releases/client/.*/teamspeak-client.tar.gz' | \
+    head -n1 | \
+    sed -n 's|.*/client/\(.*\)/teamspeak-client.tar.gz|\1|p'
+)
+current_version=$(nix eval --raw .#teamspeak6-client.version)
+
+echo "latest  version: $latest_version"
+echo "current version: $current_version"
+
+if [[ "$latest_version" == "$current_version" ]]; then
+    echo "package is up-to-date"
+    exit 0
+fi
+
+nix-update teamspeak6-client --version $latest_version

pkgs/top-level/aliases.nix

···
   tdesktop = telegram-desktop; # Added 2023-04-07
   tdom = tclPackages.tdom; # Added 2024-10-02
   teamspeak_client = teamspeak3; # Added 2024-11-07
+  teamspeak5_client = teamspeak6-client; # Added 2025-01-29
   teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
   teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
   teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18

pkgs/top-level/all-packages.nix

···
 
   tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { };
 
-  teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { };
-  teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
-
   telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop {
     stdenv = if stdenv.hostPlatform.isDarwin
       then llvmPackages_19.stdenv