From 505fc54e225719f0cad0bb6d71d1bb7170317a75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jul 2021 11:18:29 +0200 Subject: [PATCH 1/2] python3Packages.shellingham: 1.3.2 -> 1.4.0 --- pkgs/development/python-modules/shellingham/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 300368b31f13..2bf54f093dca 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.3.2"; + version = "1.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e"; + sha256 = "sha256-SFXCRY1pBIKb00wpnxH97tfP77+KLFIuTK6mzXazFx4="; }; meta = with lib; { From afbc7eb8252c8d04f2263883e66d3cc725282e56 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jul 2021 11:28:06 +0200 Subject: [PATCH 2/2] python3Packages.shellingham: enable tests --- .../python-modules/shellingham/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 2bf54f093dca..1d1a1fc46bdd 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -1,18 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "shellingham"; version = "1.4.0"; format = "pyproject"; + disabled = pythonOlder "3.4"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-SFXCRY1pBIKb00wpnxH97tfP77+KLFIuTK6mzXazFx4="; + src = fetchFromGitHub { + owner = "sarugaku"; + repo = pname; + rev = version; + sha256 = "0f686ym3ywjffis5jfqkhsshjgii64060hajysczflhffrjn9jcp"; }; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "shellingham" ]; + meta = with lib; { - description = "Tool to Detect Surrounding Shell"; + description = "Tool to detect the surrounding shell"; homepage = "https://github.com/sarugaku/shellingham"; license = licenses.isc; maintainers = with maintainers; [ mbode ];