Merge pull request #281721 from fabaff/nomadnet-bump (bbb984e6) · Commits · nix / nixpkgs

pkgs/applications/networking/instant-messengers/zulip-term/default.nix

+30 −5

Original line number	Diff line number	Diff line
		@@ -5,23 +5,47 @@
		, libnotify
		}:

		python3.pkgs.buildPythonApplication rec {
		let
		py = python3.override {
		packageOverrides = self: super: {

		# Requires "urwid~=2.1.2", otherwise some tests are failing
		urwid = super.urwid.overridePythonAttrs (oldAttrs: rec {
		version = "2.1.2";
		src = fetchFromGitHub {
		owner = "urwid";
		repo = "urwid";
		rev = "refs/tags/${version}";
		hash = "sha256-oPb2h/+gaqkZTXIiESjExMfBNnOzDvoMkXvkZ/+KVwo=";
		};
		doCheck = false;
		});
		};
		};
		in
		with py.pkgs;

		buildPythonApplication rec {
		pname = "zulip-term";
		version = "0.7.0";
		pyproject = true;

		# no tests on PyPI
		src = fetchFromGitHub {
		owner = "zulip";
		repo = "zulip-terminal";
		rev = version;
		sha256 = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw=";
		rev = "refs/tags/${version}";
		hash = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw=";
		};

		patches = [
		./pytest-executable-name.patch
		];

		propagatedBuildInputs = with python3.pkgs; [
		nativeBuildInputs = with py.pkgs; [
		setuptools
		];

		propagatedBuildInputs = with py.pkgs; [
		beautifulsoup4
		lxml
		pygments
		@@ -50,6 +74,7 @@ python3.pkgs.buildPythonApplication rec {
		meta = with lib; {
		description = "Zulip's official terminal client";
		homepage = "https://github.com/zulip/zulip-terminal";
		changelog = "https://github.com/zulip/zulip-terminal/releases/tag/${version}";
		license = licenses.asl20;
		maintainers = with maintainers; [ dotlambda ];
		};

pkgs/development/python-modules/blocksat-cli/default.nix

+21 −23

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonPackage
		, fetchPypi
		, distro
		, fetchFromGitHub
		, pyasyncore
		, pysnmp
		, pytestCheckHook
		, python-gnupg
		, pythonAtLeast
		, pythonOlder
		, qrcode
		, requests
		, sseclient-py
		, zfec
		, pytestCheckHook
		, pythonOlder
		, setuptools
		}:

		buildPythonPackage rec {
		pname = "blocksat-cli";
		version = "0.4.6";
		format = "setuptools";
		version = "2.4.6";
		pyproject = true;

		disabled = pythonOlder "3.7";
		disabled = pythonOlder "3.8";

		src = fetchPypi {
		inherit pname version;
		hash = "sha256-uANAMNoAC4HUoUuR5ldxoiy+LLzZVpKosU5JttXLnqg=";
		src = fetchFromGitHub {
		owner = "Blockstream";
		repo = "satellite";
		rev = "refs/tags/v${version}";
		hash = "sha256-1gz2lAS/AHeY54AaVXGeofLC68KjAP7POsIaBL3v2EY=";
		};

		nativeBuildInputs = [
		setuptools
		];

		propagatedBuildInputs = [
		distro
		pysnmp
		python-gnupg
		qrcode
		requests
		sseclient-py
		zfec
		] ++ lib.optionals (pythonAtLeast "3.12") [
		pyasyncore
		];

		nativeCheckInputs = [
		pytestCheckHook
		];

		disabledTestPaths = [
		# disable tests which require being connected to the satellite
		"blocksatcli/test_satip.py"
		"blocksatcli/api/test_listen.py"
		"blocksatcli/api/test_msg.py"
		"blocksatcli/api/test_net.py"
		# disable tests which require being online
		"blocksatcli/api/test_order.py"
		];

		disabledTests = [
		"test_monitor_get_stats"
		"test_monitor_update_with_reporting_enabled"
		@@ -61,6 +58,7 @@ buildPythonPackage rec {
		meta = with lib; {
		description = "Blockstream Satellite CLI";
		homepage = "https://github.com/Blockstream/satellite";
		changelog = "https://github.com/Blockstream/satellite/releases/tag/v${version}";
		license = licenses.gpl3Only;
		maintainers = with maintainers; [ prusnak ];
		};

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

+9 −4

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonPackage
		, fetchFromGitHub
		, rns
		, pythonOlder
		, rns
		, setuptools
		}:

		buildPythonPackage rec {
		pname = "lxmf";
		version = "0.3.8";
		format = "setuptools";
		version = "0.3.9";
		pyproject = true;

		disabled = pythonOlder "3.7";

		@@ -16,9 +17,13 @@ buildPythonPackage rec {
		owner = "markqvist";
		repo = "lxmf";
		rev = "refs/tags/${version}";
		hash = "sha256-tse2Hgu50KfxWLBkzyV4VpDj2YHgxIc5izgvwJAJ/7k=";
		hash = "sha256-nZDcSVHR8IKlGBa5ljd3MmgzUPvG7Hv76WRfXxMsndY=";
		};

		nativeBuildInputs = [
		setuptools
		];

		propagatedBuildInputs = [
		rns
		];

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

+10 −5

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonPackage
		, rns
		, fetchFromGitHub
		, lxmf
		, urwid
		, pythonOlder
		, qrcode
		, rns
		, setuptools
		, urwid
		}:

		buildPythonPackage rec {
		pname = "nomadnet";
		version = "0.4.4";
		format = "setuptools";
		version = "0.4.5";
		pyproject = true;

		disabled = pythonOlder "3.7";

		@@ -19,9 +20,13 @@ buildPythonPackage rec {
		owner = "markqvist";
		repo = "NomadNet";
		rev = "refs/tags/${version}";
		hash = "sha256-k2KJSqOIBU1UwcmNgLek+XVI/C1YwOlAg+l/XJvTx5E=";
		hash = "sha256-+w/Earu76mMJFp8ALvaDEkZOGJqlKbO7jfpW/xxvd1o=";
		};

		nativeBuildInputs = [
		setuptools
		];

		propagatedBuildInputs = [
		rns
		lxmf

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

+33 −22

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonPackage
		, fetchFromGitLab
		, pythonOlder

		# dependencies
		, et-xmlfile

		# tests
		, fetchFromGitLab
		, lxml
		, pandas
		, pillow
		, pytestCheckHook
		, pythonAtLeast
		, pythonOlder
		, setuptools
		}:

		buildPythonPackage rec {
		pname = "openpyxl";
		version = "3.1.2";
		format = "setuptools";
		pyproject = true;

		disabled = pythonOlder "3.7";

		@@ -24,10 +22,14 @@ buildPythonPackage rec {
		domain = "foss.heptapod.net";
		owner = "openpyxl";
		repo = "openpyxl";
		rev = version;
		rev = "refs/tags/${version}";
		hash = "sha256-SWRbjA83AOLrfe6on2CSb64pH5EWXkfyYcTqWJNBEP0=";
		};

		nativeBuildInputs = [
		setuptools
		];

		propagatedBuildInputs = [
		et-xmlfile
		];
		@@ -40,20 +42,29 @@ buildPythonPackage rec {
		];

		pytestFlagsArray = [
		# broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116
		"--deselect=openpyxl/chart/tests/test_reader.py::test_read"
		"--deselect=openpyxl/comments/tests/test_comment_reader.py::test_read_comments"
		"--deselect=openpyxl/drawing/tests/test_spreadsheet_drawing.py::TestSpreadsheetDrawing::test_ignore_external_blip"
		"--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_from_xml"
		"--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_filenames"
		"--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_exts"
		"--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_from_complex"
		"--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_merge_named_styles"
		"--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_unprotected_cell"
		"--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_none_values"
		"--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_rgb_colors"
		"--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_named_styles"
		"--deselect=openpyxl/workbook/external_link/tests/test_external.py::test_read_ole_link"
		"-W"
		"ignore::DeprecationWarning"
		];
		disabledTests = [
		# Tests broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116
		"test_read"
		"test_read_comments"
		"test_ignore_external_blip"
		"test_from_xml"
		"test_filenames"
		"test_exts"
		"test_from_complex"
		"test_merge_named_styles"
		"test_unprotected_cell"
		"test_none_values"
		"test_rgb_colors"
		"test_named_styles"
		"test_read_ole_link"
		] ++ lib.optionals (pythonAtLeast "3.11") [
		"test_broken_sheet_ref"
		"test_name_invalid_index"
		"test_defined_names_print_area"
		"test_no_styles"
		];

		pythonImportsCheck = [

Admin message