Merge pull request #313270 from r-ryantm/auto-update/python311Packages.hy (01f3056f) · Commits · nix / nixpkgs

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

+32 −33

Original line number	Diff line number	Diff line
		{ lib
		, astor
		, buildPythonPackage
		, fetchFromGitHub
		, funcparserlib
		, hy
		, pytestCheckHook
		, python
		, pythonOlder
		, testers
		{
		lib,
		astor,
		buildPythonPackage,
		fetchFromGitHub,
		funcparserlib,
		hy,
		pytestCheckHook,
		python,
		pythonOlder,
		setuptools,
		testers,
		}:

		buildPythonPackage rec {
		pname = "hy";
		version = "0.28.0";
		format = "setuptools";
		version = "0.29.0";
		pyproject = true;

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

		src = fetchFromGitHub {
		owner = "hylang";
		repo = pname;
		repo = "hy";
		rev = "refs/tags/${version}";
		hash = "sha256-XH8qZ6OsTrFXcv/8ZyrTtN6l50JXIUcHJbfCRXHzSTs=";
		hash = "sha256-8b2V78mwzSThmVl1SfMGBw8VSpE5rCuucnIyD0nq5To=";
		};

		# https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10
		HY_VERSION = version;

		propagatedBuildInputs = [
		funcparserlib
		] ++
		lib.optionals (pythonOlder "3.9") [
		astor
		];
		build-system = [ setuptools ];

		nativeCheckInputs = [
		pytestCheckHook
		];
		dependencies = [ funcparserlib ] ++ lib.optionals (pythonOlder "3.9") [ astor ];

		nativeCheckInputs = [ pytestCheckHook ];

		preCheck = ''
		# For test_bin_hy
		@@ -53,13 +50,11 @@ buildPythonPackage rec {
		# For backwards compatibility with removed pkgs/development/interpreters/hy
		# Example usage:
		# hy.withPackages (ps: with ps; [ hyrule requests ])
		withPackages = python-packages:
		(python.withPackages
		(ps: (python-packages ps) ++ [ ps.hy ])).overrideAttrs (old: {
		withPackages =
		python-packages:
		(python.withPackages (ps: (python-packages ps) ++ [ ps.hy ])).overrideAttrs (old: {
		name = "${hy.name}-env";
		meta = lib.mergeAttrs (builtins.removeAttrs hy.meta [ "license" ]) {
		mainProgram = "hy";
		};
		meta = lib.mergeAttrs (builtins.removeAttrs hy.meta [ "license" ]) { mainProgram = "hy"; };
		});
		};

		@@ -68,6 +63,10 @@ buildPythonPackage rec {
		homepage = "https://hylang.org/";
		changelog = "https://github.com/hylang/hy/releases/tag/${version}";
		license = licenses.mit;
		maintainers = with maintainers; [ fab mazurel nixy thiagokokada ];
		maintainers = with maintainers; [
		mazurel
		nixy
		thiagokokada
		];
		};
		}

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

+17 −17

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

		buildPythonPackage rec {
		pname = "hyrule";
		version = "0.5.0";
		format = "setuptools";
		version = "0.6.0";
		pyproject = true;

		disabled = pythonOlder "3.7";

		src = fetchFromGitHub {
		owner = "hylang";
		repo = pname;
		repo = "hyrule";
		rev = "refs/tags/${version}";
		hash = "sha256-MARpQFEypTJ4KpojVRxcHYvo6e6Gvk4B6tnrViV6QmY=";
		hash = "sha256-pmJhhOpNxVEUH8YwBUKSywYgYu43oLSmpWJM4HXGMiI=";
		};

		propagatedBuildInputs = [
		hy
		];
		build-system = [ setuptools ];

		nativeCheckInputs = [
		pytestCheckHook
		];
		propagatedBuildInputs = [ hy ];

		nativeCheckInputs = [ pytestCheckHook ];

		# Some tests depends on hy on PATH
		preCheck = "PATH=${hy}/bin:$PATH";
		@@ -34,7 +34,7 @@ buildPythonPackage rec {
		pythonImportsCheck = [ "hyrule" ];

		meta = with lib; {
		description = "Hyrule is a utility library for the Hy programming language";
		description = "Utility library for the Hy programming language";
		homepage = "https://github.com/hylang/hyrule";
		changelog = "https://github.com/hylang/hylure/releases/tag/${version}";
		license = licenses.mit;