From 73caa31b137cfe4c25bc8fb8d7793b1c6760ceba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 02:53:11 +0000 Subject: [PATCH 1/3] python310Packages.puremagic: 1.14 -> 1.15 --- pkgs/development/python-modules/puremagic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index aac505dd8f39..7a5d291431b9 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.14"; + version = "1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PV3ybMfsmuu/hCoJEVovqF3FnqZBT6VoVyxEd115bLw="; + sha256 = "sha256-bkaqeBE6Rmq8n2nm6KTOkOtX2Qja+4CVlwEmIQYUYr0="; }; # test data not included on pypi From 66e6bb3f2f5649881445e832311b4feea884f58c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 08:37:47 +0100 Subject: [PATCH 2/3] python310Packages.puremagic: add changelog to meta --- pkgs/development/python-modules/puremagic/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 7a5d291431b9..04d94c7f09f8 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bkaqeBE6Rmq8n2nm6KTOkOtX2Qja+4CVlwEmIQYUYr0="; + hash = "sha256-bkaqeBE6Rmq8n2nm6KTOkOtX2Qja+4CVlwEmIQYUYr0="; }; # test data not included on pypi @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of magic file detection"; homepage = "https://github.com/cdgriffith/puremagic"; + changelog = "https://github.com/cdgriffith/puremagic/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ globin ]; }; From cff718c9dcbf7788658b0aa307193af539ee8f43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 08:47:04 +0100 Subject: [PATCH 3/3] python310Packages.puremagic: enable tests --- .../python-modules/puremagic/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 04d94c7f09f8..ad4037a6c580 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook , pythonOlder }: @@ -11,13 +12,16 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-bkaqeBE6Rmq8n2nm6KTOkOtX2Qja+4CVlwEmIQYUYr0="; + src = fetchFromGitHub { + owner = "cdgriffith"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-WnqDrVPTlNxz3SDt1wLdZmxtj0Vh6gLHDJlYGEHHxsg="; }; - # test data not included on pypi - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "puremagic"