From 74af93dd192a93bc0d762249bb86e879b0aa2c45 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 9 Apr 2024 22:02:41 +0900 Subject: [PATCH 1/2] python311Packages.yapsy: 1.12.2 -> 1.12.2-unstable-2023-03-29 Diff: https://github.com/tibonihoo/yapsy/compare/release_Yapsy-1.12.2...6b487b04affb19ab40adbbc87827668bea0abcee --- .../python-modules/yapsy/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index 161620530ab8..d2bec1c7b3a2 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -1,21 +1,28 @@ { lib -, stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { pname = "yapsy"; - version = "1.12.2"; - format = "setuptools"; + version = "1.12.2-unstable-2023-03-29"; + pyproject = true; - src = fetchPypi { - pname = "Yapsy"; - inherit version; - sha256 = "12rznbnswfw0w7qfbvmmffr9r317gl1rqg36nijwzsklkjgks4fq"; + src = fetchFromGitHub { + owner = "tibonihoo"; + repo = "yapsy"; + rev = "6b487b04affb19ab40adbbc87827668bea0abcee"; + hash = "sha256-QKZlUAhYMCCsT/jbEHb39ESZ2+2FZYnhJnc1PgsozBA="; }; + sourceRoot = "source/package"; + + build-system = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "yapsy" ]; From 38955a7203f9cbb6bb783a8e74f5b7355082587a Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 9 Apr 2024 22:05:12 +0900 Subject: [PATCH 2/2] python311Packages.yapsy: fix license see https://yapsy.sourceforge.net/#license --- pkgs/development/python-modules/yapsy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index d2bec1c7b3a2..044ce2cf8318 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -30,6 +30,6 @@ buildPythonPackage { meta = with lib; { homepage = "https://yapsy.sourceforge.net/"; description = "Yet another plugin system"; - license = licenses.bsd0; + license = licenses.bsd2; }; }