pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #165859 from fabaff/glean-sdk-fix

python3Packages.glean-sdk: relax glean_parser constraint

authored by

Fabian Affolter and committed by
GitHub e9ac4b07 e6dbd5e0

+53 -28
unified split
+23 -17
pkgs/development/python-modules/glean-parser/default.nix
··· 1 1 { lib 2 - , buildPythonPackage 3 - , fetchPypi 4 - , pytestCheckHook 5 - , pythonOlder 6 - , setuptools-scm 7 - # build inputs 8 2 , appdirs 3 + , buildPythonPackage 9 4 , click 10 5 , diskcache 6 + , fetchPypi 11 7 , jinja2 12 8 , jsonschema 9 + , pytestCheckHook 10 + , pythonOlder 13 11 , pyyaml 12 + , setuptools-scm 14 13 , yamllint 15 14 }: 16 15 17 16 buildPythonPackage rec { 18 - pname = "glean_parser"; 17 + pname = "glean-parser"; 19 18 version = "5.1.0"; 19 + format = "setuptools"; 20 20 21 21 disabled = pythonOlder "3.6"; 22 22 23 23 src = fetchPypi { 24 - inherit pname version; 25 - sha256 = "sha256-8oMbaGsW5Lkw9OluNsXXe2IBNbjeoIb9vDjVOt+uHR0="; 24 + pname = "glean_parser"; 25 + inherit version; 26 + hash = "sha256-8oMbaGsW5Lkw9OluNsXXe2IBNbjeoIb9vDjVOt+uHR0="; 26 27 }; 27 28 28 - postPatch = '' 29 - substituteInPlace setup.py --replace "pytest-runner" "" 30 - ''; 29 + nativeBuildInputs = [ 30 + setuptools-scm 31 + ]; 31 32 32 33 propagatedBuildInputs = [ 33 34 appdirs ··· 38 39 pyyaml 39 40 yamllint 40 41 ]; 41 - nativeBuildInputs = [ 42 - setuptools-scm 43 - ]; 44 42 45 43 checkInputs = [ 46 44 pytestCheckHook 47 45 ]; 46 + 47 + postPatch = '' 48 + substituteInPlace setup.py \ 49 + --replace "pytest-runner" "" 50 + ''; 51 + 48 52 disabledTests = [ 49 53 # https://bugzilla.mozilla.org/show_bug.cgi?id=1741668 50 54 "test_validate_ping" 51 55 ]; 52 56 53 - pythonImportsCheck = [ "glean_parser" ]; 57 + pythonImportsCheck = [ 58 + "glean_parser" 59 + ]; 54 60 55 61 meta = with lib; { 56 62 description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK"; 57 63 homepage = "https://github.com/mozilla/glean_parser"; 58 64 license = licenses.mpl20; 59 - maintainers = [ maintainers.kvark ]; 65 + maintainers = with maintainers; [ kvark ]; 60 66 }; 61 67 }
+30 -11
pkgs/development/python-modules/glean-sdk/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 + , cargo 4 + , cffi 3 5 , fetchPypi 6 + , glean-parser 7 + , iso8601 8 + , pytest-localserver 9 + , pytestCheckHook 10 + , pythonOlder 11 + , rustc 4 12 , rustPlatform 5 - , rustc 6 - , cargo 7 13 , setuptools-rust 8 - # build inputs 9 - , cffi 10 - , glean-parser 11 14 }: 12 15 13 16 buildPythonPackage rec { 14 17 pname = "glean-sdk"; 15 18 version = "44.0.0"; 16 19 20 + disabled = pythonOlder "3.6"; 21 + 17 22 src = fetchPypi { 18 23 inherit pname version; 19 - sha256 = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk="; 24 + hash = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk="; 20 25 }; 21 26 22 27 cargoDeps = rustPlatform.fetchCargoTarball { ··· 26 31 }; 27 32 28 33 nativeBuildInputs = [ 29 - rustc 30 34 cargo 31 - setuptools-rust 35 + rustc 32 36 rustPlatform.cargoSetupHook 37 + setuptools-rust 33 38 ]; 39 + 34 40 propagatedBuildInputs = [ 35 41 cffi 36 42 glean-parser 43 + iso8601 37 44 ]; 38 45 39 - pythonImportsCheck = [ "glean" ]; 46 + checkInputs = [ 47 + pytest-localserver 48 + pytestCheckHook 49 + ]; 50 + 51 + postPatch = '' 52 + substituteInPlace glean-core/python/setup.py \ 53 + --replace "glean_parser==5.0.1" "glean_parser>=5.0.1" 54 + ''; 55 + 56 + pythonImportsCheck = [ 57 + "glean" 58 + ]; 40 59 41 60 meta = with lib; { 42 - description = "Modern cross-platform telemetry client libraries and are a part of the Glean project"; 61 + description = "Telemetry client libraries and are a part of the Glean project"; 43 62 homepage = "https://mozilla.github.io/glean/book/index.html"; 44 63 license = licenses.mpl20; 45 - maintainers = [ maintainers.kvark ]; 64 + maintainers = with maintainers; [ kvark ]; 46 65 }; 47 66 }