From 28a1fffbecc913c05d8fe6d57192bd6371159e98 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 12:05:21 +0200 Subject: [PATCH] python2.pkgs.dulwich: keep 0.19.16 for python 2 --- .../python-modules/dulwich/0_19.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 7 +++-- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/dulwich/0_19.nix diff --git a/pkgs/development/python-modules/dulwich/0_19.nix b/pkgs/development/python-modules/dulwich/0_19.nix new file mode 100644 index 000000000000..82b9bed492cc --- /dev/null +++ b/pkgs/development/python-modules/dulwich/0_19.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, urllib3, certifi +, gevent, geventhttpclient, mock, fastimport +, git, glibcLocales }: + +buildPythonPackage rec { + version = "0.19.16"; + pname = "dulwich"; + + src = fetchPypi { + inherit pname version; + sha256 = "f74561c448bfb6f04c07de731c1181ae4280017f759b0bb04fa5770aa84ca850"; + }; + + LC_ALL = "en_US.UTF-8"; + + propagatedBuildInputs = [ urllib3 certifi ]; + + # Only test dependencies + checkInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; + + doCheck = !stdenv.isDarwin; + + meta = with stdenv.lib; { + description = "Simple Python implementation of the Git file formats and protocols"; + homepage = "https://samba.org/~jelmer/dulwich/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cfe411f08d0..e64626faaaf8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3652,9 +3652,10 @@ in { duckdb = pkgs.duckdb; }; - dulwich = callPackage ../development/python-modules/dulwich { - inherit (pkgs) git glibcLocales; - }; + dulwich = if isPy3k then + callPackage ../development/python-modules/dulwich { } + else + callPackage ../development/python-modules/dulwich/0_19.nix { }; hg-git = callPackage ../development/python-modules/hg-git { };