aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/version-management/git-up/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management/git-up/default.nix')
-rw-r--r--nixpkgs/pkgs/applications/version-management/git-up/default.nix20
1 files changed, 10 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/git-up/default.nix b/nixpkgs/pkgs/applications/version-management/git-up/default.nix
index ba0625c433d..5812ff8c1d1 100644
--- a/nixpkgs/pkgs/applications/version-management/git-up/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-up/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, python2Packages, git }:
+{ stdenv, fetchurl, pythonPackages, git }:
-python2Packages.buildPythonApplication rec {
- version = "1.4.2";
+pythonPackages.buildPythonApplication rec {
pname = "git-up";
+ version = "1.6.1";
- src = fetchurl {
- url = "mirror://pypi/g/git-up/${pname}-${version}.zip";
- sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za";
};
- buildInputs = [ git ] ++ (with python2Packages; [ nose ]);
- propagatedBuildInputs = with python2Packages; [ click colorama docopt GitPython six termcolor ];
+ # git should be on path for tool to work correctly
+ propagatedBuildInputs = [ git ] ++ (with pythonPackages; [ click colorama docopt GitPython six termcolor ]);
+ checkInputs = [ git pythonPackages.nose ]; # git needs to be on path
# 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
@@ -22,7 +23,7 @@ python2Packages.buildPythonApplication rec {
'';
postInstall = ''
- rm -r $out/${python2Packages.python.sitePackages}/PyGitUp/tests
+ rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests
'';
meta = with stdenv.lib; {
@@ -31,6 +32,5 @@ python2Packages.buildPythonApplication rec {
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
- broken = true; # Incompatible with Git 2.15 object store.
};
}