From 225fd5c892a21ef1d75979aee4c41cd10abb3c8b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 2 Feb 2022 23:00:34 +0100
Subject: [PATCH] python3Packages.glean-sdk: 42.2.0 -> 43.0.2

---
 .../python-modules/glean-sdk/default.nix      | 12 +++--------
 .../fix-spawned-process-environment.patch     | 20 -------------------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch

diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix
index e729d927cdae..e52f2def3954 100644
--- a/pkgs/development/python-modules/glean-sdk/default.nix
+++ b/pkgs/development/python-modules/glean-sdk/default.nix
@@ -12,23 +12,17 @@
 
 buildPythonPackage rec {
   pname = "glean-sdk";
-  version = "42.2.0";
+  version = "43.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-X2p6KQnEB6ZHdCHGFVEoEMiI+0R2vfGqel+jFKTcx74=";
+    sha256 = "sha256-9LLE7cUJhJ+0/rFtVkSdiXUohrXW0JFy3XcYMAAivfw=";
   };
 
-  patches = [
-    # Fix the environment for spawned process
-    # https://github.com/mozilla/glean/pull/1542
-    ./fix-spawned-process-environment.patch
-  ];
-
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    sha256 = "sha256-/+rKGPYTLovgjTGL2F/pWzlUy1tY207yuJz3Xdhm1hg=";
+    sha256 = "sha256:1qi7zn2278jpry466w3xj1wpyy5f82bffi55i6nva591i3r1z4am";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch b/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch
deleted file mode 100644
index f9a7b2723eba..000000000000
--- a/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/glean-core/python/glean/_process_dispatcher.py b/glean-core/python/glean/_process_dispatcher.py
-index 33a8b12796..a39b54a917 100644
---- a/glean-core/python/glean/_process_dispatcher.py
-+++ b/glean-core/python/glean/_process_dispatcher.py
-@@ -120,8 +120,14 @@ def dispatch(cls, func, args) -> Union[_SyncWorkWrapper, subprocess.Popen]:
-                     Path(".coveragerc").absolute()
-                 )
- 
-+            # Explicitly pass the contents of `sys.path` as `PYTHONPATH` to the
-+            # subprocess so that there aren't any module search path
-+            # differences.
-+            python_path = ":".join(sys.path)[1:]
-+
-             p = subprocess.Popen(
--                [sys.executable, _process_dispatcher_helper.__file__, payload]
-+                [sys.executable, _process_dispatcher_helper.__file__, payload],
-+                env={"PYTHONPATH": python_path},
-             )
- 
-             cls._last_process = p