diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5948944aa23..586706d53e7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2615,6 +2615,12 @@ githubId = 9705357; name = "Guillaume Bouchard"; }; + GuillaumeDesforges = { + email = "aceus02@gmail.com"; + github = "GuillaumeDesforges"; + githubId = 1882000; + name = "Guillaume Desforges"; + }; guillaumekoenig = { email = "guillaume.edward.koenig@gmail.com"; github = "guillaumekoenig"; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 3a9e8b86c91..817c1e38418 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -1,31 +1,30 @@ { stdenv , buildPythonPackage -, fetchPypi -, isPy27 -, mock -, tox -, pylint +, fetchFromGitHub +, isPy3k +, geographiclib }: buildPythonPackage rec { - pname = "geopy"; - version = "1.20.0"; - disabled = !isPy27; + pname = "geopy-unstable"; + version = "2019-11-10"; - src = fetchPypi { - inherit pname version; - sha256 = "9419bc90ee6231590c4ae7acf1cf126cefbd0736942da7a6a1436946e80830e2"; + disabled = !isPy3k; # only Python 3 + doCheck = false; # Needs network access + + propagatedBuildInputs = [ geographiclib ]; + + src = fetchFromGitHub { + owner = "geopy"; + repo = "geopy"; + rev = "531b7de6126838a3e69370227aa7f2086ba52b89"; + sha256 = "07l1pblzg3hb3dbvd9rq8x78ly5dv0zxbc5hwskqil0bhv5v1p39"; }; - doCheck = false; # too much - - buildInputs = [ mock tox pylint ]; - meta = with stdenv.lib; { homepage = "https://github.com/geopy/geopy"; description = "Python Geocoding Toolbox"; license = licenses.mit; - broken = true; + maintainers = with maintainers; [GuillaumeDesforges]; }; - } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9df5646d8e..a815cfa141b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4877,7 +4877,9 @@ in { geographiclib = callPackage ../development/python-modules/geographiclib { }; - geopy = callPackage ../development/python-modules/geopy { }; + geopy = if isPy3k + then callPackage ../development/python-modules/geopy { } + else callPackage ../development/python-modules/geopy/2.nix { }; django-haystack = callPackage ../development/python-modules/django-haystack { };