Project import generated by Copybara.

GitOrigin-RevId: a322b32e9d74fb476944ff6cfb55833dc69cfaaa
This commit is contained in:
Default email 2020-11-19 01:13:47 +01:00
parent 872899d581
commit 57a8d147fe
3 changed files with 19 additions and 14 deletions

View file

@ -33,13 +33,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "teamspeak-client"; pname = "teamspeak-client";
version = "3.5.3"; version = "3.5.5";
src = fetchurl { src = fetchurl {
url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run";
sha256 = if stdenv.is64bit sha256 = if stdenv.is64bit
then "0fp9v2rkxf0zgvf3wcx8nsmf93bzdc22xlqxk3r8cb0415adp76a" then "sha256:13f9n55ii93y72l68idvhpwdgr8k3qhrwim0n1jz251n3ydnsqjk"
else "0ni7hijprc8xygyz41568f1m9wwhl8lk5c3q28bm9m5r6qym39l6"; else "sha256:0frc2aqz4scm77qs5032b71sjly31abbczc3ipw7liq6m1nr6nw7";
}; };
# grab the plugin sdk for the desktop icon # grab the plugin sdk for the desktop icon
@ -99,15 +99,15 @@ stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;
meta = { meta = with stdenv.lib; {
description = "The TeamSpeak voice communication tool"; description = "The TeamSpeak voice communication tool";
homepage = "https://teamspeak.com/"; homepage = "https://teamspeak.com/";
license = { license = {
fullName = "Teamspeak client license"; fullName = "Teamspeak client license";
url = "http://sales.teamspeakusa.com/licensing.php"; url = "https://www.teamspeak.com/en/privacy-and-terms/";
free = false; free = false;
}; };
maintainers = [ stdenv.lib.maintainers.lhvwb ]; maintainers = with maintainers; [ lhvwb lukegb ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
}; };
} }

View file

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "gevent"; pname = "gevent";
version = "20.9.0"; version = "20.5.2";
format = "pyproject"; format = "pyproject";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz"; sha256 = "2756de36f56b33c46f6cc7146a74ba65afcd1471922c95b6771ce87b279d689c";
}; };
buildInputs = [ libev ]; buildInputs = [ libev ];

View file

@ -63,11 +63,11 @@ let
x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
alpha = { alpha = {
stable = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; }; stable = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; };
experimental = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; }; experimental = bdist { sha256 = "0n00nbh44nyf485jys6pkga3pb9j4zywk0liq6jq99pil6z7na3y"; version = "1.1.0"; withAuth = true; };
}; };
headless = { headless = {
stable = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; }; stable = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
experimental = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; }; experimental = bdist { sha256 = "15qiwz3wvyaidndrrm1wfznbidnpf12wpzb8vlm9g0gaq3b0f6h6"; version = "1.1.0"; };
}; };
demo = { demo = {
stable = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; }; stable = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; };
@ -104,9 +104,14 @@ let
]; ];
}) })
(_: { # This preHook hides the credentials from /proc (_: { # This preHook hides the credentials from /proc
preHook = '' preHook =
if username != "" && token != "" then ''
echo -n "${username}" >username echo -n "${username}" >username
echo -n "${token}" >token echo -n "${token}" >token
'' else ''
# Deliberately failing since username/token was not provided, so we can't fetch.
# We can't use builtins.throw since we want the result to be used if the tar is in the store already.
exit 1
''; '';
failureHook = '' failureHook = ''
cat <<EOF cat <<EOF