diff --git a/third_party/nixpkgs/patches/pr102855-zram-allow-memorymax.patch b/third_party/nixpkgs/patches/pr102855-zram-allow-memorymax.patch deleted file mode 100644 index 5f5154dbb5..0000000000 --- a/third_party/nixpkgs/patches/pr102855-zram-allow-memorymax.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 961b7c7a6d47b224b2c3fea44ed18b722611d7ab Mon Sep 17 00:00:00 2001 -From: Luke Granger-Brown -Date: Thu, 5 Nov 2020 02:29:46 +0000 -Subject: [PATCH] nixos/zram: add zramSwap.memoryMax option - -This allows capping the total amount of memory that will be used for -zram-swap, in addition to the percentage-based calculation, which is -useful when blanket-applying a configuration to many machines. - -This is based off the strategy used by Fedora for their rollout of -zram-swap-by-default in Fedora 33 -(https://fedoraproject.org/wiki/Changes/SwapOnZRAM), which caps the -maximum amount of memory used for zram at 4GiB. - -In future it might be good to port this to the systemd zram-generator, -instead of using this separate infrastructure. ---- - nixos/modules/config/zram.nix | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix -index 341101bc184..1f513b7e4da 100644 ---- 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); -+ ${lib.optionalString (cfg.memoryMax != null) '' -+ memory_max=int(${toString cfg.memoryMax}/${toString devicesCount}); -+ if (value > memory_max) { value = memory_max } -+ ''} -+ print value - }' /proc/meminfo) - - ${pkgs.util-linux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev} --- -2.29.2 - diff --git a/third_party/nixpkgs/patches/pr103084-teamspeak3-bump-3.5.6.patch b/third_party/nixpkgs/patches/pr103084-teamspeak3-bump-3.5.6.patch deleted file mode 100644 index 69984307b7..0000000000 --- a/third_party/nixpkgs/patches/pr103084-teamspeak3-bump-3.5.6.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ebeaae1454bf86197f1fb0ac8e0df19f687a0ad8 Mon Sep 17 00:00:00 2001 -From: Luke Granger-Brown -Date: Sat, 7 Nov 2020 13:37:58 +0000 -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..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 - stdenv.mkDerivation rec { - pname = "teamspeak-client"; - -- version = "3.5.3"; -+ 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:0hjai1bd4mq3g2dlyi0zkn8s4zlgxd38skw77mb78nc4di5gvgpg" -+ else "sha256:1y1c65nap91nv9xkvd96fagqbfl56p9n0rl6iac0i29bkysdmija"; - }; - - # 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/patches/pr104891-factorio-bump-1.1.1.patch b/third_party/nixpkgs/patches/pr104891-factorio-bump-1.1.1.patch deleted file mode 100644 index 9e34d70900..0000000000 --- a/third_party/nixpkgs/patches/pr104891-factorio-bump-1.1.1.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ca7384d8f3dcfe48365e9b9379d19f757bbd3d60 Mon Sep 17 00:00:00 2001 -From: Luke Granger-Brown -Date: Wed, 25 Nov 2020 12:28:28 +0000 -Subject: [PATCH] factorio-experimental, factorio-headless-experimental: 1.1.0 - -> 1.1.1 - ---- - 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 6feac05309cac..07361f1c74288 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 = "0n00nbh44nyf485jys6pkga3pb9j4zywk0liq6jq99pil6z7na3y"; version = "1.1.0"; withAuth = true; }; -+ experimental = bdist { sha256 = "0z7krilzk91sblik2i9lvsifwq9j5j6jv7jhmndkz4qmp845w1ax"; version = "1.1.1"; withAuth = true; }; - }; - headless = { - stable = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; }; -- experimental = bdist { sha256 = "15qiwz3wvyaidndrrm1wfznbidnpf12wpzb8vlm9g0gaq3b0f6h6"; version = "1.1.0"; }; -+ experimental = bdist { sha256 = "1nb9w876dij3ar14s5y96k04nbh9i4a7rggbbck5xmr7pa6snqx4"; version = "1.1.1"; }; - }; - demo = { - stable = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; }; diff --git a/third_party/nixpkgs/patches/pr105231-factorio-bump-1.1.2.patch b/third_party/nixpkgs/patches/pr105231-factorio-bump-1.1.2.patch deleted file mode 100644 index dab79b4281..0000000000 --- a/third_party/nixpkgs/patches/pr105231-factorio-bump-1.1.2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c3f2f8ff1cdb109d27c20b2706ad9e6340a31e52 Mon Sep 17 00:00:00 2001 -From: nyanotech -Date: Sat, 28 Nov 2020 14:28:47 +0000 -Subject: [PATCH] factorio-experimental, factorio-headless-experimental: 1.1.1 - -> 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 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 = "0z7krilzk91sblik2i9lvsifwq9j5j6jv7jhmndkz4qmp845w1ax"; version = "1.1.1"; withAuth = true; }; -+ experimental = bdist { sha256 = "0cmia16d5dhy3f8mck926d7rrnavxmvb6a72ymjllxm37slsx60j"; version = "1.1.2"; withAuth = true; }; - }; - headless = { - stable = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; }; -- experimental = bdist { sha256 = "1nb9w876dij3ar14s5y96k04nbh9i4a7rggbbck5xmr7pa6snqx4"; version = "1.1.1"; }; -+ experimental = bdist { sha256 = "0x3lwz11z8cczqr5i799m4yg8x3yk6h5qz48pfzw4l2ikrrwgahd"; version = "1.1.2"; }; - }; - demo = { - stable = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; }; diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 25dc8039bf..c41268bb55 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,6 +1,2 @@ -pr102855-zram-allow-memorymax.patch -pr103084-teamspeak3-bump-3.5.6.patch -pr104891-factorio-bump-1.1.1.patch -pr105231-factorio-bump-1.1.2.patch pr105296-factorio-updatescript.patch pr105471-factorio-bump-1.1.3.patch