Merge pull request #313909 from fabaff/aioquic-bump (5b47d43f) · Commits · nix / nixpkgs

pkgs/applications/networking/dyndns/dyndnsc/default.nix

+47 −25

Original line number	Diff line number	Diff line
		{ lib, python3Packages, fetchPypi, stdenv }:
		{
		lib,
		stdenv,
		python3Packages,
		fetchPypi,
		}:

		python3Packages.buildPythonApplication rec {
		pname = "dyndnsc";
		version = "0.6.1";
		pyproject = true;

		src = fetchPypi {
		inherit pname version;
		sha256 = "13078d29eea2f9a4ca01f05676c3309ead5e341dab047e0d51c46f23d4b7fbb4";
		hash = "sha256-EweNKe6i+aTKAfBWdsMwnq1eNB2rBH4NUcRvI9S3+7Q=";
		};

		postPatch = ''
		substituteInPlace setup.py --replace "bottle==" "bottle>="
		substituteInPlace setup.py \
		--replace-fail '"pytest-runner"' ""
		'';

		nativeBuildInputs = with python3Packages; [ pytest-runner ];
		propagatedBuildInputs = with python3Packages; [
		pythonRelaxDeps = [ "bottle" ];

		build-system = with python3Packages; [ setuptools ];

		nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ];

		dependencies = with python3Packages; [
		daemonocle
		dnspython
		json-logging
		netifaces
		requests
		json-logging
		setuptools
		];
		nativeCheckInputs = with python3Packages; [ bottle mock pytest-console-scripts pytestCheckHook ];

		disabledTests = [
		nativeCheckInputs = with python3Packages; [
		bottle
		pytest-console-scripts
		pytestCheckHook
		];

		disabledTests =
		[
		# dnswanip connects to an external server to discover the
		# machine's IP address.
		"dnswanip"
		] ++ lib.optionals stdenv.isDarwin [
		# AssertionError
		"test_null_dummy"
		]
		++ lib.optionals stdenv.isDarwin [
		# The tests that spawn a server using Bottle cannot be run on
		# macOS or Windows as the default multiprocessing start method
		# on those platforms is 'spawn', which requires the code to be
		@@ -42,7 +63,6 @@ python3Packages.buildPythonApplication rec {

		meta = with lib; {
		description = "Dynamic DNS update client with support for multiple protocols";
		mainProgram = "dyndnsc";
		longDescription = ''
		Dyndnsc is a command line client for sending updates to Dynamic
		DNS (DDNS, DynDNS) services. It supports multiple protocols and
		@@ -54,8 +74,10 @@ python3Packages.buildPythonApplication rec {
		external notification services.
		'';
		homepage = "https://github.com/infothrill/python-dyndnsc";
		changelog = "https://github.com/infothrill/python-dyndnsc/releases/tag/${version}";
		license = licenses.mit;
		maintainers = with maintainers; [ AluisioASG ];
		mainProgram = "dyndnsc";
		platforms = platforms.unix;
		};
		}

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -58,10 +58,15 @@ buildPythonPackage rec {
		];

		disabledTests = [
		# calls apache benchmark and fails, no usable output
		# Test calls apache benchmark and fails, no usable output
		"test_concurrency_error_rates"
		];

		disabledTestPaths = [
		# Benchmark and performance tests are not relevant for Nixpkgs
		"tests/performance/"
		];

		preCheck = ''
		${lib.getBin pkgs.redis}/bin/redis-server &
		REDIS_PID=$!
		@@ -83,7 +88,7 @@ buildPythonPackage rec {
		description = "Python API Rate Limit Decorator";
		homepage = "https://github.com/aio-libs/aiocache";
		changelog = "https://github.com/aio-libs/aiocache/releases/tag/v${version}";
		license = with licenses; [ bsd3 ];
		license = licenses.bsd3;
		maintainers = with maintainers; [ fab ];
		};
		}

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

+4 −12

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@
		certifi,
		cryptography,
		fetchPypi,
		fetchpatch,
		openssl,
		pylsqpack,
		pyopenssl,
		@@ -16,26 +15,19 @@

		buildPythonPackage rec {
		pname = "aioquic";
		version = "0.9.25";
		version = "1.0.0";
		pyproject = true;

		disabled = pythonOlder "3.8";

		src = fetchPypi {
		inherit pname version;
		hash = "sha256-cHlceJBTJthVwq5SQHIjSq5YbHibgSkuJy0CHpsEMKM=";
		hash = "sha256-7THCta+pjFtsr6TzYUnerx3/bFppcB6t0nFnQV+fFmA=";
		};

		patches = [
		(fetchpatch {
		url = "https://github.com/aiortc/aioquic/commit/e899593805e0b31325a1d347504eb8e6100fe87d.diff";
		hash = "sha256-TTpIIWX/R4k2KxhsN17O9cRW/dN0AARYnju8JTht3D8=";
		})
		];

		nativeBuildInputs = [ setuptools ];
		build-system = [ setuptools ];

		propagatedBuildInputs = [
		dependencies = [
		certifi
		cryptography
		pylsqpack

pkgs/development/python-modules/strawberry-graphql/default.nix

+12 −18

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

		buildPythonPackage rec {
		pname = "strawberry-graphql";
		version = "0.219.2";
		format = "pyproject";
		version = "0.230.0";
		pyproject = true;

		disabled = pythonOlder "3.8";
		disabled = pythonOlder "3.10";

		src = fetchFromGitHub {
		owner = "strawberry-graphql";
		repo = "strawberry";
		rev = "refs/tags/${version}";
		hash = "sha256-uIUETjzuDnlQp6wM7uxyLRSMT5uyrXFrI9NilcjP0BU=";
		hash = "sha256-jhInHoOvPGIEoSddv8+30gY38L6XR5OEATUTdrHbNpA=";
		};

		patches = [
		@@ -62,22 +62,16 @@ buildPythonPackage rec {
		url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch";
		hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y=";
		})
		(fetchpatch {
		# https://github.com/strawberry-graphql/strawberry/pull/3255
		name = "fix-tests-with-pydantic_2.patch";
		url = "https://github.com/strawberry-graphql/strawberry/commit/0a0dc284ee6d31d4e82ac7ff1ed9fea4dff39fa6.patch";
		hash = "sha256-LACWD7XA6YL/apJwhpx3LPCKxKUfa+XWyTLK+Zkxlaw=";
		})
		];

		postPatch = ''
		substituteInPlace pyproject.toml \
		--replace "--emoji --mypy-ini-file=mypy.ini" "" \
		--replace-fail "--emoji --mypy-ini-file=mypy.ini" "" \
		'';

		nativeBuildInputs = [ poetry-core ];
		build-system = [ poetry-core ];

		propagatedBuildInputs = [
		dependencies = [
		graphql-core
		python-dateutil
		typing-extensions
		@@ -135,9 +129,8 @@ buildPythonPackage rec {
		rich
		libcst
		];
		# starlite = [
		# starlite
		# ];
		# starlite = [ starlite ];
		# litestar = [ litestar ];
		pyinstrument = [ pyinstrument ];
		};

		@@ -169,16 +162,17 @@ buildPythonPackage rec {
		"tests/test_dataloaders.py"
		"tests/utils/test_pretty_print.py"
		"tests/websockets/test_graphql_transport_ws.py"
		"tests/litestar/"
		];

		__darwinAllowLocalNetworking = true;

		meta = with lib; {
		description = "A GraphQL library for Python that leverages type annotations";
		mainProgram = "strawberry";
		homepage = "https://strawberry.rocks";
		changelog = "https://github.com/strawberry-graphql/strawberry/blob/${version}/CHANGELOG.md";
		license = with licenses; [ mit ];
		license = licenses.mit;
		maintainers = with maintainers; [ izorkin ];
		mainProgram = "strawberry";
		};
		}

pkgs/tools/security/wapiti/default.nix

+39 −39

Original line number	Diff line number	Diff line
		{ lib
		, fetchFromGitHub
		, python3
		{
		lib,
		fetchFromGitHub,
		python3,
		}:

		python3.pkgs.buildPythonApplication rec {
		pname = "wapiti";
		version = "3.1.8";
		format = "pyproject";
		pyproject = true;

		src = fetchFromGitHub {
		owner = "wapiti-scanner";
		repo = pname;
		repo = "wapiti";
		rev = "refs/tags/${version}";
		hash = "sha256-2ssbczUa4pTA5Fai+sK1hES8skJMIHxa/R2hNIiEVLs=";
		};

		postPatch = ''
		# Ignore pinned versions
		sed -i -e "s/==[0-9.]//;s/>=[0-9.]//" pyproject.toml

		# Remove code coverage checking
		substituteInPlace pyproject.toml \
		--replace "--cov --cov-report=xml" ""
		'';

		nativeBuildInputs = with python3.pkgs; [
		setuptools
		wheel
		];
		pythonRelaxDeps = true;

		build-system = with python3.pkgs; [ setuptools ];

		propagatedBuildInputs = with python3.pkgs; [
		nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];

		dependencies =
		with python3.pkgs;
		[
		aiocache
		aiohttp
		aiosqlite
		@@ -50,7 +51,8 @@ python3.pkgs.buildPythonApplication rec {
		sqlalchemy
		tld
		yaswfp
		] ++ httpx.optional-dependencies.brotli
		]
		++ httpx.optional-dependencies.brotli
		++ httpx.optional-dependencies.socks;

		__darwinAllowLocalNetworking = true;
		@@ -138,9 +140,7 @@ python3.pkgs.buildPythonApplication rec {
		"tests/attack/test_mod_ssl.py"
		];

		pythonImportsCheck = [
		"wapitiCore"
		];
		pythonImportsCheck = [ "wapitiCore" ];

		meta = with lib; {
		description = "Web application vulnerability scanner";
		@@ -154,7 +154,7 @@ python3.pkgs.buildPythonApplication rec {
		'';
		homepage = "https://wapiti-scanner.github.io/";
		changelog = "https://github.com/wapiti-scanner/wapiti/blob/${version}/doc/ChangeLog_Wapiti";
		license = with licenses; [ gpl2Only ];
		license = licenses.gpl2Only;
		maintainers = with maintainers; [ fab ];
		};
		}

Admin message