From 318ce72a050a32ba2d0f5ce1192ae7c039e9c323 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 12 May 2018 10:46:59 -0400 Subject: [PATCH] gitdb2: init at 2.0.3 Also move gitdb and gitdb2 to the new python module structure. --- .../python-modules/gitdb/default.nix | 23 ++++++++++++++++ .../python-modules/gitdb2/default.nix | 23 ++++++++++++++++ pkgs/top-level/python-packages.nix | 26 ++----------------- 3 files changed, 48 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/gitdb/default.nix create mode 100644 pkgs/development/python-modules/gitdb2/default.nix diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix new file mode 100644 index 000000000000..ceca6e3719b4 --- /dev/null +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, smmap }: + +buildPythonPackage rec { + pname = "gitdb"; + version = "0.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n4n2c7rxph9vs2l6xlafyda5x1mdr8xy16r9s3jwnh3pqkvrsx3"; + }; + + propagatedBuildInputs = [ smmap ]; + + # 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; + }; +} diff --git a/pkgs/development/python-modules/gitdb2/default.nix b/pkgs/development/python-modules/gitdb2/default.nix new file mode 100644 index 000000000000..1ebbd3de7850 --- /dev/null +++ b/pkgs/development/python-modules/gitdb2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, smmap2 }: + +buildPythonPackage rec { + pname = "gitdb2"; + version = "2.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "02azg62mr99b7cllyjrly77np3vw32y8nrxpa2xjapiyaga2j3mn"; + }; + + 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; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e1ece5c77c2..f20b6d2f2473 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2820,31 +2820,9 @@ in { gpy = callPackage ../development/python-modules/gpy { }; - gitdb = buildPythonPackage rec { - name = "gitdb-0.6.4"; + gitdb = callPackage ../development/python-modules/gitdb { }; - src = pkgs.fetchurl { - url = "mirror://pypi/g/gitdb/${name}.tar.gz"; - sha256 = "0n4n2c7rxph9vs2l6xlafyda5x1mdr8xy16r9s3jwnh3pqkvrsx3"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ smmap ]; - - checkPhase = '' - nosetests - ''; - - doCheck = false; # Bunch of tests fail because they need an actual git repo - - meta = { - description = "Git Object Database"; - maintainers = with maintainers; [ ]; - homepage = https://github.com/gitpython-developers/gitdb; - license = licenses.bsd3; - }; - - }; + gitdb2 = callPackage ../development/python-modules/gitdb2 { }; GitPython = buildPythonPackage rec { version = "2.0.8";