git.iko.soy/typeable/nixpkgs
on master help sign in
python3Packages.glean-sdk: 42.2.0 -> 43.0.2
commit225fd5c892a21ef1d75979aee4c41cd10abb3c8b authorMartin Weinelt <hexa@darmstadt.ccc.de> dateWed 2 Feb 2022, 23:00 (5 years ago) parent93a6cd0
2 files changed+3−29
pkgs/development/python-modules/glean-sdk/default.nix+3−9 pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch−20
pkgs/development/python-modules/glean-sdk/default.nix+3−9
@@ -12,23 +12,17 @@
1212
1313buildPythonPackage rec {
1414 pname = "glean-sdk";
15− version = "42.2.0";
15+ version = "43.0.2";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "sha256-X2p6KQnEB6ZHdCHGFVEoEMiI+0R2vfGqel+jFKTcx74=";
19+ sha256 = "sha256-9LLE7cUJhJ+0/rFtVkSdiXUohrXW0JFy3XcYMAAivfw=";
2020 };
2121
22− patches = [
23− # Fix the environment for spawned process
24− # https://github.com/mozilla/glean/pull/1542
25− ./fix-spawned-process-environment.patch
26− ];
27−
2822 cargoDeps = rustPlatform.fetchCargoTarball {
2923 inherit src;
3024 name = "${pname}-${version}";
31− sha256 = "sha256-/+rKGPYTLovgjTGL2F/pWzlUy1tY207yuJz3Xdhm1hg=";
25+ sha256 = "sha256:1qi7zn2278jpry466w3xj1wpyy5f82bffi55i6nva591i3r1z4am";
3226 };
3327
3428 nativeBuildInputs = [
pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patchdeleted−20
@@ -1,20 +0,0 @@
1−diff --git a/glean-core/python/glean/_process_dispatcher.py b/glean-core/python/glean/_process_dispatcher.py
2−index 33a8b12796..a39b54a917 100644
3−--- a/glean-core/python/glean/_process_dispatcher.py
4−+++ b/glean-core/python/glean/_process_dispatcher.py
5−@@ -120,8 +120,14 @@ def dispatch(cls, func, args) -> Union[_SyncWorkWrapper, subprocess.Popen]:
6− Path(".coveragerc").absolute()
7− )
8−
9−+ # Explicitly pass the contents of `sys.path` as `PYTHONPATH` to the
10−+ # subprocess so that there aren't any module search path
11−+ # differences.
12−+ python_path = ":".join(sys.path)[1:]
13−+
14− p = subprocess.Popen(
15−- [sys.executable, _process_dispatcher_helper.__file__, payload]
16−+ [sys.executable, _process_dispatcher_helper.__file__, payload],
17−+ env={"PYTHONPATH": python_path},
18− )
19−
20− cls._last_process = p