From 57a8d147fec34cbcf161f76f55e2cb92bd15ff1a Mon Sep 17 00:00:00 2001
From: Default email <noreply+nixpkgs@lukegb.com>
Date: Thu, 19 Nov 2020 01:13:47 +0100
Subject: [PATCH] Project import generated by Copybara.

GitOrigin-RevId: a322b32e9d74fb476944ff6cfb55833dc69cfaaa
---
 .../instant-messengers/teamspeak/client.nix     | 12 ++++++------
 .../python-modules/gevent/default.nix           |  4 ++--
 .../nixpkgs/pkgs/games/factorio/default.nix     | 17 +++++++++++------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 7d2586c670..3ec888df2f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -33,13 +33,13 @@ in
 stdenv.mkDerivation rec {
   pname = "teamspeak-client";
 
-  version = "3.5.3";
+  version = "3.5.5";
 
   src = fetchurl {
     url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run";
     sha256 = if stdenv.is64bit
-                then "0fp9v2rkxf0zgvf3wcx8nsmf93bzdc22xlqxk3r8cb0415adp76a"
-                else "0ni7hijprc8xygyz41568f1m9wwhl8lk5c3q28bm9m5r6qym39l6";
+                then "sha256:13f9n55ii93y72l68idvhpwdgr8k3qhrwim0n1jz251n3ydnsqjk"
+                else "sha256:0frc2aqz4scm77qs5032b71sjly31abbczc3ipw7liq6m1nr6nw7";
   };
 
   # grab the plugin sdk for the desktop icon
@@ -99,15 +99,15 @@ stdenv.mkDerivation rec {
   dontStrip = true;
   dontPatchELF = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "The TeamSpeak voice communication tool";
     homepage = "https://teamspeak.com/";
     license = {
       fullName = "Teamspeak client license";
-      url = "http://sales.teamspeakusa.com/licensing.php";
+      url = "https://www.teamspeak.com/en/privacy-and-terms/";
       free = false;
     };
-    maintainers = [ stdenv.lib.maintainers.lhvwb ];
+    maintainers = with maintainers; [ lhvwb lukegb ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix
index bf066f5190..4eb5c7cdbb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gevent/default.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "gevent";
-  version = "20.9.0";
+  version = "20.5.2";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz";
+    sha256 = "2756de36f56b33c46f6cc7146a74ba65afcd1471922c95b6771ce87b279d689c";
   };
 
   buildInputs = [ libev ];
diff --git a/third_party/nixpkgs/pkgs/games/factorio/default.nix b/third_party/nixpkgs/pkgs/games/factorio/default.nix
index 0226acf160..6feac05309 100644
--- a/third_party/nixpkgs/pkgs/games/factorio/default.nix
+++ b/third_party/nixpkgs/pkgs/games/factorio/default.nix
@@ -63,11 +63,11 @@ let
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
       alpha = {
         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 = {
         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 = {
         stable        = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; };
@@ -104,10 +104,15 @@ let
               ];
             })
             (_: { # This preHook hides the credentials from /proc
-                  preHook = ''
-                    echo -n "${username}" >username
-                    echo -n "${token}"    >token
-                  '';
+                  preHook =
+                    if username != "" && token != "" then ''
+                      echo -n "${username}" >username
+                      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 = ''
                     cat <<EOF
                     ${helpMsg}