git-up: 1.4.2 -> 1.6.1

This commit is contained in:
Jonathan Ringer 2019-08-26 11:05:40 -07:00 committed by Lassulus
parent d33e497b1b
commit fe24628a26
2 changed files with 13 additions and 11 deletions

View File

@ -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.
};
}

View File

@ -3380,7 +3380,9 @@ in
git-sizer = callPackage ../applications/version-management/git-sizer { };
git-up = callPackage ../applications/version-management/git-up { };
git-up = callPackage ../applications/version-management/git-up {
pythonPackages = python3Packages;
};
gitfs = callPackage ../tools/filesystems/gitfs { };