nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

python.pkgs.gitdb2: remove

Browse Source 
The two are now the same:
https://github.com/gitpython-developers/gitdb/issues/59
This commit is contained in:
Timo Kaufmann 2020-03-14 17:00:41 +01:00 committed by Jon
parent e789990fb6
commit 6db65f8d02
3 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/GitPython/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }: { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }:
buildPythonPackage rec { buildPythonPackage rec {
version = "3.0.5"; version = "3.0.5";
@ -18,7 +18,7 @@ buildPythonPackage rec {
]; ];
checkInputs = [ nose ] ++ lib.optional isPy27 mock; checkInputs = [ nose ] ++ lib.optional isPy27 mock;
propagatedBuildInputs = [ gitdb2 ddt ]; propagatedBuildInputs = [ gitdb ddt ];
# Tests require a git repo # Tests require a git repo
doCheck = false; doCheck = false;

23
pkgs/development/python-modules/gitdb2/default.nix
View File

@ -1,23 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, smmap2 }:
buildPythonPackage rec {
pname = "gitdb2";
version = "2.0.6";
src = fetchPypi {
inherit pname version;
sha256 = "1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350";
};
propagatedBuildInputs = [ smmap2 ];
# Bunch of tests fail because they need an actual git repo
doCheck = false;
meta = {
description = "Git Object Database";
maintainers = [ ];
homepage = https://github.com/gitpython-developers/gitdb;
license = lib.licenses.bsd3;
};
}

2
pkgs/top-level/python-packages.nix
View File

@ -2770,7 +2770,7 @@ in {
gitdb = callPackage ../development/python-modules/gitdb { }; gitdb = callPackage ../development/python-modules/gitdb { };
gitdb2 = callPackage ../development/python-modules/gitdb2 { }; gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
GitPython = callPackage ../development/python-modules/GitPython { }; GitPython = callPackage ../development/python-modules/GitPython { };