From b17d484c7e556060c4945cdf34e2e439349ca4ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 03:59:23 +0000 Subject: [PATCH 1/2] python310Packages.patiencediff: 0.2.3 -> 0.2.6 --- pkgs/development/python-modules/patiencediff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 99203d78dea2..23d35c675458 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.3"; + version = "0.2.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ATyTGFDomGUY8e53krBJzVgab7ked73fbIIwp63+tzI="; + sha256 = "sha256-wdaNB6VzqeLEt5HBMIki08j08aRuc11l4wg8J01e5Fk="; }; meta = with lib; { From 52fb09e26bf5ebc0b64783f5252e8e461a48b39d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 Oct 2022 09:35:24 +0200 Subject: [PATCH 2/2] python310Packages.patiencediff: enable tests - add pythonImportsCheck - disable on older Python releases --- .../python-modules/patiencediff/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index 23d35c675458..4c14d161f46e 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -1,18 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "patiencediff"; version = "0.2.6"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-wdaNB6VzqeLEt5HBMIki08j08aRuc11l4wg8J01e5Fk="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "breezy-team"; + repo = pname; + rev = "v${version}"; + hash = "sha256-oJOsqZ9XCbYHJ7VEbDpC9wquCkvfj05M0nerlV5jL7w="; }; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "patiencediff" + ]; + meta = with lib; { description = "C implementation of patiencediff algorithm for Python"; homepage = "https://github.com/breezy-team/patiencediff"; license = licenses.gpl2Plus; - maintainers = [ maintainers.wildsebastian ]; + maintainers = with maintainers; [ wildsebastian ]; }; }