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