From 656343a753b24764b759bc5d8b9aca5260831a1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Aug 2021 20:44:14 +0200 Subject: [PATCH 1/2] python3Packages.versioneer: 0.19 -> 0.20 --- pkgs/development/python-modules/versioneer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 3685e78d4b4e..6bcb9a6cc009 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "versioneer"; - version = "0.19"; + version = "0.20"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a4fed39bbebcbd2d07f8a86084773f303cb442709491955a0e6754858e47afae"; + sha256 = "sha256-Ljk2AOwnF7efWcmE942TX3bkbEyu+HWoe4tO1gLy/2U="; }; # Couldn't get tests to work because, for instance, they used virtualenv and From 2f9cbba25140bc666f000e15fbf54890f56553c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Aug 2021 20:53:40 +0200 Subject: [PATCH 2/2] python3Packages.versioneer: add pythonImportsCheck --- .../python-modules/versioneer/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 6bcb9a6cc009..5336420c79af 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -1,10 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 }: - +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "versioneer"; version = "0.20"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -15,11 +18,12 @@ buildPythonPackage rec { # pip. doCheck = false; + pythonImportsCheck = [ "versioneer" ]; + meta = with lib; { description = "Version-string management for VCS-controlled trees"; homepage = "https://github.com/warner/python-versioneer"; license = licenses.publicDomain; maintainers = with maintainers; [ jluttine ]; }; - }