From 9a29d05ec28a79f23e0a5d4cf5ddea4c9a9edd98 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 25 Nov 2020 13:06:25 +0000 Subject: [PATCH] 3p/nixpkgs: update patches --- .../patches/pr104338-gevent-bump-20.9.0.patch | 28 ------------------- .../pr104891-factorio-bump-1.1.1.patch | 28 +++++++++++++++++++ third_party/nixpkgs/patches/series | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 third_party/nixpkgs/patches/pr104338-gevent-bump-20.9.0.patch create mode 100644 third_party/nixpkgs/patches/pr104891-factorio-bump-1.1.1.patch diff --git a/third_party/nixpkgs/patches/pr104338-gevent-bump-20.9.0.patch b/third_party/nixpkgs/patches/pr104338-gevent-bump-20.9.0.patch deleted file mode 100644 index ce19719b5e..0000000000 --- a/third_party/nixpkgs/patches/pr104338-gevent-bump-20.9.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f998e3acdc5ce23908804902e7decf1c59519098 Mon Sep 17 00:00:00 2001 -From: Jonathan Ringer -Date: Thu, 19 Nov 2020 17:24:08 -0800 -Subject: [PATCH 1/4] python3Packages.gevent: 20.5.2 -> 20.9.0 - ---- - pkgs/development/python-modules/gevent/default.nix | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix -index 4eb5c7cdbb9f3..bf066f5190656 100644 ---- a/pkgs/development/python-modules/gevent/default.nix -+++ b/pkgs/development/python-modules/gevent/default.nix -@@ -4,12 +4,12 @@ - - buildPythonPackage rec { - pname = "gevent"; -- version = "20.5.2"; -+ version = "20.9.0"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; -- sha256 = "2756de36f56b33c46f6cc7146a74ba65afcd1471922c95b6771ce87b279d689c"; -+ sha256 = "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz"; - }; - - buildInputs = [ libev ]; 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 new file mode 100644 index 0000000000..9e34d70900 --- /dev/null +++ b/third_party/nixpkgs/patches/pr104891-factorio-bump-1.1.1.patch @@ -0,0 +1,28 @@ +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/series b/third_party/nixpkgs/patches/series index 6240d4ab89..abcb6abb50 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,5 +1,5 @@ pr102855-zram-allow-memorymax.patch pr103084-teamspeak3-bump-3.5.5.patch -pr104338-gevent-bump-20.9.0.patch pr104725-factorio-bump-1.1.0.patch pr104732-factorio-fail-early-without-creds.patch +pr104891-factorio-bump-1.1.1.patch