Merge master into staging-next (49c9e0ce) · Commits · nix / nixpkgs

nixos/modules/services/home-automation/wyoming/piper.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -103,8 +103,8 @@ in

		useCUDA = mkOption {
		type = bool;
		default = config.cudaSupport;
		defaultText = literalExpression "config.cudaSupport";
		default = pkgs.config.cudaSupport;
		defaultText = literalExpression "pkgs.config.cudaSupport";
		description = ''
		Whether to accelerate the underlying onnxruntime library with CUDA.
		'';

pkgs/development/python-modules/commitizen/default.nix→pkgs/by-name/co/commitizen/package.nix

+22 −43

Original line number	Diff line number	Diff line
		@@ -2,45 +2,25 @@
		lib,
		commitizen,
		fetchFromGitHub,
		buildPythonPackage,
		gitMinimal,
		pythonOlder,
		stdenv,
		installShellFiles,
		poetry-core,
		nix-update-script,
		testers,
		argcomplete,
		charset-normalizer,
		colorama,
		decli,
		importlib-metadata,
		jinja2,
		packaging,
		pyyaml,
		questionary,
		termcolor,
		tomlkit,
		py,
		pytest-freezer,
		pytest-mock,
		pytest-regressions,
		pytest7CheckHook,
		deprecated,
		python3Packages,
		versionCheckHook,
		writableTmpDirAsHomeHook,
		}:

		buildPythonPackage rec {
		python3Packages.buildPythonPackage rec {
		pname = "commitizen";
		version = "4.8.3";
		version = "4.9.1";
		pyproject = true;

		disabled = pythonOlder "3.8";

		src = fetchFromGitHub {
		owner = "commitizen-tools";
		repo = "commitizen";
		tag = "v${version}";
		hash = "sha256-ukmLvv1/Ez04UhwXcb5QYiVWXCV7LvYd13Go6ASxsxI=";
		hash = "sha256-vHA+TvKs9TOu/0/FpxLHHbDgshQFhP9Dwe6ZMnUOBKc=";
		};

		pythonRelaxDeps = [
		@@ -49,15 +29,16 @@ buildPythonPackage rec {
		"termcolor"
		];

		build-system = [ poetry-core ];
		build-system = with python3Packages; [ poetry-core ];

		nativeBuildInputs = [ installShellFiles ];

		dependencies = [
		dependencies = with python3Packages; [
		argcomplete
		charset-normalizer
		colorama
		decli
		deprecated
		importlib-metadata
		jinja2
		packaging
		@@ -68,23 +49,25 @@ buildPythonPackage rec {
		];

		nativeCheckInputs = [
		argcomplete
		deprecated
		gitMinimal
		versionCheckHook
		writableTmpDirAsHomeHook
		]
		++ (with python3Packages; [
		argcomplete
		py
		pytest-freezer
		pytest-mock
		pytest-regressions
		pytest7CheckHook
		];
		]);

		versionCheckProgramArg = "version";

		pythonImportsCheck = [ "commitizen" ];

		# The tests require a functional git installation
		# which requires a valid HOME directory.
		preCheck = ''
		export HOME="$(mktemp -d)"

		git config --global user.name "Nix Builder"
		git config --global user.email "nix-builder@nixos.org"
		git init .
		@@ -105,7 +88,7 @@ buildPythonPackage rec {

		postInstall =
		let
		register-python-argcomplete = lib.getExe' argcomplete "register-python-argcomplete";
		register-python-argcomplete = lib.getExe' python3Packages.argcomplete "register-python-argcomplete";
		in
		lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
		installShellCompletion --cmd cz \
		@@ -116,19 +99,15 @@ buildPythonPackage rec {

		passthru = {
		updateScript = nix-update-script { };
		tests.version = testers.testVersion {
		package = commitizen;
		command = "cz version";
		};
		};

		meta = with lib; {
		meta = {
		description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs";
		homepage = "https://github.com/commitizen-tools/commitizen";
		changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md";
		license = licenses.mit;
		changelog = "https://github.com/commitizen-tools/commitizen/blob/${src.tag}/CHANGELOG.md";
		license = lib.licenses.mit;
		mainProgram = "cz";
		maintainers = with maintainers; [
		maintainers = with lib.maintainers; [
		lovesegfault
		anthonyroussel
		];

pkgs/by-name/cy/cyclone-scheme/package.nix

+8 −6

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		}:

		let
		version = "0.34.0";
		version = "0.36.0";
		bootstrap = stdenv.mkDerivation {
		pname = "cyclone-bootstrap";
		inherit version;
		@@ -16,7 +16,7 @@ let
		owner = "justinethier";
		repo = "cyclone-bootstrap";
		rev = "v${version}";
		sha256 = "sha256-kJBPb0Ej32HveY/vdGpH2gyxSwq8Xq7muneFIw3Y7hM=";
		sha256 = "sha256-8WK4rsLK3gi9a6PKFaT3KRK256rEDTTO6QvqYrOtYDs=";
		};

		enableParallelBuilding = true;
		@@ -36,7 +36,7 @@ stdenv.mkDerivation {
		owner = "justinethier";
		repo = "cyclone";
		rev = "v${version}";
		sha256 = "sha256-4U/uOTbFpPTC9BmO6Wkhy4PY8UCFVt5eHSGqrOlKT/U=";
		sha256 = "sha256-5h8jZ8EBgiLLYH/j3p7CqsQGXHhjGtQfOnxPbFnT5WM=";
		};

		enableParallelBuilding = true;
		@@ -47,10 +47,12 @@ stdenv.mkDerivation {

		makeFlags = [ "PREFIX=${placeholder "out"}" ];

		meta = with lib; {
		meta = {
		homepage = "https://justinethier.github.io/cyclone/";
		description = "Brand-new compiler that allows practical application development using R7RS Scheme";
		license = licenses.mit;
		maintainers = with maintainers; [ siraben ];
		license = lib.licenses.mit;
		maintainers = with lib.maintainers; [ siraben ];
		platforms = lib.platforms.unix;
		broken = stdenv.hostPlatform.isDarwin;
		};
		}

pkgs/by-name/db/dbus-cpp/package.nix

+5 −3

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

		stdenv.mkDerivation (finalAttrs: {
		pname = "dbus-cpp";
		version = "5.0.4";
		version = "5.0.5";

		src = fetchFromGitLab {
		owner = "ubports";
		repo = "development/core/lib-cpp/dbus-cpp";
		tag = finalAttrs.version;
		hash = "sha256-ki4bnwRpvmB9yzt/Mn3MQs1Dr6Vrcs2D0tvCjvvfmq4=";
		hash = "sha256-+QqmZsBFmYRwaAFqRyMBxVFFrjZGBDdMaW4YD/7D2gU=";
		};

		outputs = [
		@@ -94,7 +94,9 @@ stdenv.mkDerivation (finalAttrs: {
		passthru = {
		tests.pkg-config = testers.hasPkgConfigModules {
		package = finalAttrs.finalPackage;
		versionCheck = true;
		# Not bumped for 5.0.5: https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/9
		# Try again on next bump.
		versionCheck = finalAttrs.version != "5.0.5";
		};
		updateScript = gitUpdater { };
		};

pkgs/by-name/es/esptool/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,14 +8,14 @@

		python3Packages.buildPythonApplication rec {
		pname = "esptool";
		version = "5.0.2";
		version = "5.1.0";
		pyproject = true;

		src = fetchFromGitHub {
		owner = "espressif";
		repo = "esptool";
		tag = "v${version}";
		hash = "sha256-oRvtEBp88tmgjjIuoQS5ySm4I0aD/Zs8VLRUZo0sh/I=";
		hash = "sha256-pdkL/QfrrTs/NdXlsr+2Yo+r8UTFLkxw4E6XGDAt1yE=";
		};

		postPatch = ''

Admin message