diff options
| author | Philipp Riegger <philipp@riegger.name> | 2024-10-01 19:09:25 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-10-01 21:00:57 +0000 |
| commit | 1b6755659a271d5f261228d853a7405b984af9d0 (patch) | |
| tree | 8d15f6ad48c58dfeb8f03816bb5bc2eb574a1426 | |
| parent | [Backport release-24.05] qq: enable wayland-ime (#338760) (diff) | |
| download | nixpkgs-1b6755659a271d5f261228d853a7405b984af9d0.tar.gz | |
teamspeak_{client,server}: move distribution note
Move the distribution permit to a separate file to prevent mangling by
formatters.
(cherry picked from commit 8b13497049e13643c06d8106c4ce07a8e1af2663)
3 files changed, 34 insertions, 70 deletions
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 45197d2d7086..22db48b264c7 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { homepage = "https://teamspeak.com/"; sourceProvenance = with 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; @@ -119,38 +120,3 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; } - -/* -License issues: -Date: Mon, 10 Dec 2007 19:55:16 -0500 -From: TeamSpeak Sales <sales@tritoncia.com> -To: 'Marc Weber' <marco-oweber@gmx.de> -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: sales@tritoncia.com -TeamSpeak: http://www.TeamSpeak.com -Account Login: https://sales.TritonCIA.com/users - - - ------Original Message----- -From: Marc Weber [mailto:marco-oweber@gmx.de] -Sent: Monday, December 10, 2007 5:03 PM -To: sales@tritoncia.com -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) -*/ diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/distribution-permit.txt b/pkgs/applications/networking/instant-messengers/teamspeak/distribution-permit.txt new file mode 100644 index 000000000000..e053d470b316 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/teamspeak/distribution-permit.txt @@ -0,0 +1,32 @@ +License issues: +Date: Mon, 10 Dec 2007 19:55:16 -0500 +From: TeamSpeak Sales <sales@tritoncia.com> +To: 'Marc Weber' <marco-oweber@gmx.de> +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: sales@tritoncia.com +TeamSpeak: http://www.TeamSpeak.com +Account Login: https://sales.TritonCIA.com/users + + + +-----Original Message----- +From: Marc Weber [mailto:marco-oweber@gmx.de] +Sent: Monday, December 10, 2007 5:03 PM +To: sales@tritoncia.com +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) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 577589f6a40b..7b97d5bea1ac 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -59,43 +59,9 @@ in stdenv.mkDerivation rec { 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; maintainers = with maintainers; [ arobyn gerschtli ]; }; } - -/* -License issues: -Date: Mon, 10 Dec 2007 19:55:16 -0500 -From: TeamSpeak Sales <sales@tritoncia.com> -To: 'Marc Weber' <marco-oweber@gmx.de> -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: sales@tritoncia.com -TeamSpeak: http://www.TeamSpeak.com -Account Login: https://sales.TritonCIA.com/users - - - ------Original Message----- -From: Marc Weber [mailto:marco-oweber@gmx.de] -Sent: Monday, December 10, 2007 5:03 PM -To: sales@tritoncia.com -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) -*/ |
