Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

1 files changed, 14 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/applications/version-management/git-up/default.nix b/nixpkgs/pkgs/applications/version-management/git-up/default.nix
index e4bd7e3ad8c1..7c0e6d53db0a 100644
--- a/nixpkgs/pkgs/applications/version-management/git-up/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-up/default.nix
@@ -6,26 +6,33 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "git-up";
-  version = "1.6.1";
+  version = "2.2.0";
+  format = "pyproject";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za";
+    pname = "git_up";
+    inherit version;
+    hash = "sha256-GTX2IWLQ48yWfPnmtEa9HJ5umQLttqgTlgZQlaWgeE4=";
   };
 
+  nativeBuildInputs = with pythonPackages; [
+    poetry-core
+  ];
+
   # git should be on path for tool to work correctly
   propagatedBuildInputs = [
     git
   ] ++ (with pythonPackages; [
-    click
     colorama
-    docopt
     gitpython
-    six
     termcolor
   ]);
 
-  nativeCheckInputs = [ git pythonPackages.nose ]; # git needs to be on path
+  nativeCheckInputs = [
+    git
+    pythonPackages.pytestCheckHook
+  ];
+
   # 1. git fails to run as it cannot detect the email address, so we set it
   # 2. $HOME is by default not a valid dir, so we have to set that too
   # https://github.com/NixOS/nixpkgs/issues/12591