JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python3Packages.glean-sdk: 42.2.0 -> 43.0.2

Browse Source
This commit is contained in:
Martin Weinelt 2022-02-02 23:00:34 +01:00
parent 93a6cd0fd6
commit 225fd5c892
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/glean-sdk/default.nix
View File

@ -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 = [

20
pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch
View File

@ -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