3p/nixpkgs: update copybara patches

third_party/nixpkgs/patches/pr102855-zram-allow-memorymax.patch

@@ -1,33 +0,0 @@
-diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
---- a/nixos/modules/config/zram.nix
-+++ b/nixos/modules/config/zram.nix
-@@ -80,6 +80,15 @@ in
-         '';
-       };
- 
-+      memoryMax = mkOption {
-+        default = null;
-+        type = with types; nullOr int;
-+        description = ''
-+          Maximum total amount of memory (in bytes) that can be used by the zram
-+          swap devices.
-+        '';
-+      };
-+
-       priority = mkOption {
-         default = 5;
-         type = types.int;
-@@ -146,7 +155,12 @@ in
- 
-               # Calculate memory to use for zram
-               mem=$(${pkgs.gawk}/bin/awk '/MemTotal: / {
--                  print int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024)
-+                  value=int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024);
-+                    ${if cfg.memoryMax != null then ''
-+                      memory_max=int(${toString cfg.memoryMax}/${toString devicesCount});
-+                      if (value > memory_max) { value = memory_max }
-+                    '' else ""}
-+                  print value
-               }' /proc/meminfo)
- 
-               ${pkgs.utillinux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev}

third_party/nixpkgs/patches/pr103084-teamspeak3-bump-3.5.6.patch

@@ -1,14 +1,14 @@
-From c4b02d504e348d18f3c5cbcd208e8ecae492e463 Mon Sep 17 00:00:00 2001
+From ebeaae1454bf86197f1fb0ac8e0df19f687a0ad8 Mon Sep 17 00:00:00 2001
 From: Luke Granger-Brown <git@lukegb.com>
 Date: Sat, 7 Nov 2020 13:37:58 +0000
-Subject: [PATCH] teamspeak_client: 3.5.3 -> 3.5.5
+Subject: [PATCH] teamspeak_client: 3.5.3 -> 3.5.6
 
 ---
  .../instant-messengers/teamspeak/client.nix          | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
-index 7d2586c670817..3ec888df2fc1f 100644
+index 7d2586c670817..ba726d5b37710 100644
 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
 +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
 @@ -33,13 +33,13 @@ in
@@ -16,15 +16,15 @@ index 7d2586c670817..3ec888df2fc1f 100644
    pname = "teamspeak-client";
  
 -  version = "3.5.3";
-+  version = "3.5.5";
++  version = "3.5.6";
  
    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"
++                then "sha256:0hjai1bd4mq3g2dlyi0zkn8s4zlgxd38skw77mb78nc4di5gvgpg"
-+                else "sha256:0frc2aqz4scm77qs5032b71sjly31abbczc3ipw7liq6m1nr6nw7";
++                else "sha256:1y1c65nap91nv9xkvd96fagqbfl56p9n0rl6iac0i29bkysdmija";
    };
  
    # grab the plugin sdk for the desktop icon

third_party/nixpkgs/patches/pr104732-factorio-fail-early-without-creds.patch

@@ -1,42 +0,0 @@
-From 86aa2a57d3a60d68af8689c4a1eb4da306f90c98 Mon Sep 17 00:00:00 2001
-From: Luke Granger-Brown <git@lukegb.com>
-Date: Tue, 24 Nov 2020 01:27:34 +0000
-Subject: [PATCH] factorio: fail fetch early if no credentials provided
-
-The download URL will redirect to the login page if credentials are not
-present, but will return an error if the credentials are wrong.
-
-Since we know we always expect credentials, we can fail the fetch in
-the preHook if they're not provided.
-
-We can't use e.g. builtins.throw because we want the fetchurl derivation
-to be evaluated in all cases - because that's the mechanism which allows
-you to just manually add the tarball to the Nix store.
----
- pkgs/games/factorio/default.nix | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
-index 0226acf160460..e5527c9d4ef70 100644
---- a/pkgs/games/factorio/default.nix
-+++ b/pkgs/games/factorio/default.nix
-@@ -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}

third_party/nixpkgs/patches/pr105231-factorio-bump-1.1.2.patch

@@ -1,28 +1,28 @@
-From 378db78499c64130dc560cac34729b14e13b09cc Mon Sep 17 00:00:00 2001
+From c3f2f8ff1cdb109d27c20b2706ad9e6340a31e52 Mon Sep 17 00:00:00 2001
-From: Luke Granger-Brown <git@lukegb.com>
+From: nyanotech <nyanotechnology@gmail.com>
-Date: Tue, 24 Nov 2020 00:21:08 +0000
+Date: Sat, 28 Nov 2020 14:28:47 +0000
-Subject: [PATCH] factorio-experimental, factorio-headless-experimental: 1.0.0
+Subject: [PATCH] factorio-experimental, factorio-headless-experimental: 1.1.1
- -> 1.1.0
+ -> 1.1.2
 
 ---
  pkgs/games/factorio/default.nix | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
-index 0226acf160460..0e2592de919ee 100644
+index 07361f1c74288..f5f12b47dd72d 100644
 --- a/pkgs/games/factorio/default.nix
 +++ b/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 = "0z7krilzk91sblik2i9lvsifwq9j5j6jv7jhmndkz4qmp845w1ax"; version = "1.1.1"; withAuth = true; };
-+        experimental  = bdist { sha256 = "0n00nbh44nyf485jys6pkga3pb9j4zywk0liq6jq99pil6z7na3y"; version = "1.1.0"; withAuth = true; };
++        experimental  = bdist { sha256 = "0cmia16d5dhy3f8mck926d7rrnavxmvb6a72ymjllxm37slsx60j"; version = "1.1.2"; withAuth = true; };
        };
        headless = {
          stable        = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
--        experimental  = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; };
+-        experimental  = bdist { sha256 = "1nb9w876dij3ar14s5y96k04nbh9i4a7rggbbck5xmr7pa6snqx4"; version = "1.1.1"; };
-+        experimental  = bdist { sha256 = "15qiwz3wvyaidndrrm1wfznbidnpf12wpzb8vlm9g0gaq3b0f6h6"; version = "1.1.0"; };
++        experimental  = bdist { sha256 = "0x3lwz11z8cczqr5i799m4yg8x3yk6h5qz48pfzw4l2ikrrwgahd"; version = "1.1.2"; };
        };
        demo = {
          stable        = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; };

third_party/nixpkgs/patches/series

@@ -1,5 +1,3 @@
-pr102855-zram-allow-memorymax.patch
+pr103084-teamspeak3-bump-3.5.6.patch
-pr103084-teamspeak3-bump-3.5.5.patch
-pr104725-factorio-bump-1.1.0.patch
-pr104732-factorio-fail-early-without-creds.patch
 pr104891-factorio-bump-1.1.1.patch
+pr105231-factorio-bump-1.1.2.patch