Merge pull request #185920 from mweinelt/glean-sdk (ee3be6b2) · Commits · nix / nixpkgs

pkgs/applications/misc/moz-phab/default.nix→pkgs/applications/misc/mozphab/default.nix

+78 −0

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonApplication
		, fetchPypi
		, fetchFromGitHub
		, python3

		# tests
		, git
		, mercurial
		# build inputs
		, distro
		, glean-sdk
		, pip
		, python-hglib
		, sentry-sdk
		, setuptools
		, patch
		}:

		buildPythonApplication rec {
		pname = "moz-phab";
		version = "0.1.99";
		python3.pkgs.buildPythonApplication rec {
		pname = "mozphab";
		version = "1.1.0";
		format = "setuptools";

		src = fetchPypi {
		pname = "MozPhab";
		inherit version;
		sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs=";
		src = fetchFromGitHub {
		owner = "mozilla-conduit";
		repo = "review";
		rev = "refs/tags/${version}";
		hash = "sha256-vLHikGjTYOeXd6jDRsoCkq3i0eh6Ttd4KdvlixjzdZ4=";
		};

		# Relax python-hglib requirement
		# https://phabricator.services.mozilla.com/D131618
		postPatch = ''
		substituteInPlace setup.py \
		--replace "==" ">="
		--replace "glean-sdk>=50.0.1,==50.*" "glean-sdk"
		'';

		propagatedBuildInputs = [
		propagatedBuildInputs = with python3.pkgs; [
		distro
		glean-sdk
		pip
		packaging
		python-hglib
		sentry-sdk
		setuptools
		];

		checkInputs = [
		git
		mercurial
		];
		patch
		]
		++ (with python3.pkgs; [
		callee
		immutabledict
		hg-evolve
		mock
		pytestCheckHook
		]);

		preCheck = ''
		export HOME=$(mktemp -d)
		'';

		disabledTestPaths = [
		# codestyle doesn't matter to us
		"tests/test_style.py"
		# integration tests try to submit changes, which requires network access
		"tests/test_integration_git.py"
		"tests/test_integration_hg.py"
		"tests/test_integration_hg_dag.py"
		"tests/test_integration_patch.py"
		"tests/test_integration_reorganise.py"
		"tests/test_sentry.py"
		];

		meta = with lib; {
		description = "Phabricator CLI from Mozilla to support submission of a series of commits";
		longDescription = ''
		@@ -53,7 +72,7 @@ buildPythonApplication rec {
		'';
		homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html";
		license = licenses.mpl20;
		maintainers = [];
		maintainers = with maintainers; [];
		platforms = platforms.unix;
		};
		}

pkgs/development/python-modules/callee/default.nix

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonPackage
		, fetchFromGitHub
		, pytestCheckHook
		}:

		buildPythonPackage rec {
		pname = "callee";
		version = "0.3.1";
		format = "setuptools";

		src = fetchFromGitHub {
		owner = "Xion";
		repo = pname;
		rev = "refs/tags/${version}";
		hash = "sha256-dsXMY3bW/70CmTfCuy5KjxPa+NLCzxzWv5e1aV2NEWE=";
		};

		pythonImportsCheck = [
		"callee"
		];

		doCheck = false; # missing dependency

		checkInputs = [
		# taipan missing, unmaintained, not python3.10 compatible
		pytestCheckHook
		];

		meta = with lib; {
		description = "Argument matchers for unittest.mock";
		homepage = "https://github.com/Xion/callee";
		license = licenses.bsd3;
		maintainers = with maintainers; [ hexa ];
		};
		}

pkgs/development/python-modules/glean-sdk/default.nix

+8 −3

Original line number	Diff line number	Diff line
		@@ -16,19 +16,19 @@

		buildPythonPackage rec {
		pname = "glean-sdk";
		version = "50.1.2";
		version = "51.1.0";

		disabled = pythonOlder "3.6";

		src = fetchPypi {
		inherit pname version;
		hash = "sha256-avTIinFBSoCHeCiX7EoS4ucBK6FyFC1SuAFpSdxwPUk=";
		hash = "sha256-Rt+N/sqX7IyoXbytzF9UkyXsx0vQXbGs+XJkaMhevE0=";
		};

		cargoDeps = rustPlatform.fetchCargoTarball {
		inherit src;
		name = "${pname}-${version}";
		hash = "sha256:10k8684665iawf1yswx39s4cj6c5d37j4d7jgbn0fcm08qlkfzxi";
		hash = "sha256-oY94YVs6I+/klogyajBoCrYexp9oUSrQ6znWVbigf2E=";
		};

		nativeBuildInputs = [
		@@ -49,6 +49,11 @@ buildPythonPackage rec {
		pytestCheckHook
		];

		disabledTests = [
		# RuntimeError: No ping received.
		"test_client_activity_api"
		];

		postPatch = ''
		substituteInPlace glean-core/python/setup.py \
		--replace "glean_parser==5.0.1" "glean_parser>=5.0.1"

pkgs/top-level/aliases.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -895,6 +895,7 @@ mapAliases ({
		mopidy-spotify-tunigo = throw "mopidy-spotify-tunigo has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29

		morituri = throw "'morituri' has been renamed to/replaced by 'whipper'"; # Converted to throw 2022-02-22
		moz-phab = mozphab; # Added 2022-08-09
		mozart-binary = mozart2-binary; # Added 2019-09-23
		mozart = mozart2-binary; # Added 2019-09-23
		mpc_cli = mpc-cli; # moved from top-level 2022-01-24

pkgs/top-level/all-packages.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -8132,7 +8132,7 @@ with pkgs;

		motion = callPackage ../applications/video/motion { };

		moz-phab = python3Packages.callPackage ../applications/misc/moz-phab { };
		mozphab = callPackage ../applications/misc/mozphab { };

		mtail = callPackage ../servers/monitoring/mtail { };