From f3613abf455e6892124ab66580d3f95091559c91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Mar 2023 01:12:10 +0000 Subject: [PATCH 1/3] pipx: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/pipx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index cf0af0d1decf..b6ab84e1b418 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-6cKKVOgHIoKNfGqvDWK5cwBGBDkgfyRuBRDV6fruBoA="; + sha256 = "sha256-lm/Q+8nNubhaUR1pUbSIoD4DEUEkK+pQvvUdWNquW4Q="; }; nativeBuildInputs = [ From 8624b3d255182ceae5881dc992b8fad64f814501 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 09:43:56 +0100 Subject: [PATCH 2/3] pipx: add changelog to meta --- pkgs/development/python-modules/pipx/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index b6ab84e1b418..d5dd85194868 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -18,12 +18,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - # no tests in the pypi tarball, so we directly fetch from github src = fetchFromGitHub { owner = "pipxproject"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-lm/Q+8nNubhaUR1pUbSIoD4DEUEkK+pQvvUdWNquW4Q="; + hash = "sha256-lm/Q+8nNubhaUR1pUbSIoD4DEUEkK+pQvvUdWNquW4Q="; }; nativeBuildInputs = [ @@ -51,6 +50,7 @@ buildPythonPackage rec { # start local pypi server and use in tests "--net-pypiserver" ]; + disabledTests = [ # disable tests which are difficult to emulate due to shell manipulations "path_warning" @@ -74,9 +74,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = - "Install and Run Python Applications in Isolated Environments"; + description = "Install and run Python applications in isolated environments"; homepage = "https://github.com/pipxproject/pipx"; + changelog = "https://github.com/pypa/pipx/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ yshym ]; }; From 0967f9524e8bbfdf59bb3df810c1842631b9aaa8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Mar 2023 10:10:59 +0100 Subject: [PATCH 3/3] python310Packages.pipx: add input --- pkgs/development/python-modules/pipx/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index d5dd85194868..5ee12b7a223d 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -1,14 +1,15 @@ { lib +, argcomplete , buildPythonPackage , fetchFromGitHub -, pythonOlder , hatchling -, userpath -, argcomplete -, packaging , importlib-metadata +, packaging , pip +, platformdirs , pytestCheckHook +, pythonOlder +, userpath }: buildPythonPackage rec { @@ -30,9 +31,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - userpath argcomplete packaging + platformdirs + userpath ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];