From 6fcae952c1cceea0f28088d04e22e687f6be82a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Apr 2023 00:45:31 +0200 Subject: [PATCH 1/2] python310Packages.ds-store: normalize pname --- pkgs/development/python-modules/ds-store/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ds-store/default.nix b/pkgs/development/python-modules/ds-store/default.nix index 5afa341942e9..e3fc9a695543 100644 --- a/pkgs/development/python-modules/ds-store/default.nix +++ b/pkgs/development/python-modules/ds-store/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - pname = "ds_store"; + pname = "ds-store"; version = "1.3.0"; src = fetchFromGitHub { owner = "al45tair"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "1zmhnz110dvisydp5h6s0ry2v9qf4rgr60xhhlak0c66zpvlkkl0"; }; From 7af2b867481052cbc694d030add96981c18ee1f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Apr 2023 00:50:01 +0200 Subject: [PATCH 2/2] python310Packages.ds-store: 1.3.0 -> 1.3.1 Diff: https://github.com/al45tair/ds_store/compare/refs/tags/v1.3.0...v1.3.1 --- .../python-modules/ds-store/default.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ds-store/default.nix b/pkgs/development/python-modules/ds-store/default.nix index e3fc9a695543..47d58964f475 100644 --- a/pkgs/development/python-modules/ds-store/default.nix +++ b/pkgs/development/python-modules/ds-store/default.nix @@ -3,24 +3,39 @@ , fetchFromGitHub , mac_alias , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "ds-store"; - version = "1.3.0"; + version = "1.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "al45tair"; - repo = pname; + repo = "ds_store"; rev = "refs/tags/v${version}"; - sha256 = "1zmhnz110dvisydp5h6s0ry2v9qf4rgr60xhhlak0c66zpvlkkl0"; + hash = "sha256-45lmkE61uXVCBUMyVVzowTJoALY1m9JI68s7Yb0vCks="; }; - propagatedBuildInputs = [ mac_alias ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ + mac_alias + ]; - pythonImportsCheck = [ "ds_store" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ds_store" + ]; meta = with lib; { homepage = "https://github.com/al45tair/ds_store";