git.iko.soy/typeable/nixpkgs
on master help sign in
python3Packages.geopy: 1.20 -> unstable-2019-11-10 (#73158)
commitc4ed79e977d848862e0635334c20e9da4b236e11 authorDaniel Schaefer <git@danielschaefer.me> dateThu 14 Nov 2019, 23:45 (7 years ago) parent2024d556d12f06
4 files changed+52−17
maintainers/maintainer-list.nix+6 pkgs/development/python-modules/geopy/2.nix+28 pkgs/development/python-modules/geopy/default.nix+15−16 pkgs/top-level/python-packages.nix+3−1
maintainers/maintainer-list.nix+6
@@ -2631,6 +2631,12 @@
26312631 githubId = 9705357;
26322632 name = "Guillaume Bouchard";
26332633 };
2634+ GuillaumeDesforges = {
2635+ email = "aceus02@gmail.com";
2636+ github = "GuillaumeDesforges";
2637+ githubId = 1882000;
2638+ name = "Guillaume Desforges";
2639+ };
26342640 guillaumekoenig = {
26352641 email = "guillaume.edward.koenig@gmail.com";
26362642 github = "guillaumekoenig";
pkgs/development/python-modules/geopy/2.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv
2+, buildPythonPackage
3+, fetchPypi
4+, isPy27
5+, geographiclib
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "geopy";
10+ version = "1.20.0";
11+
12+ disabled = !isPy27; # only Python 2.7
13+ doCheck = false; # Needs network access
14+
15+ propagatedBuildInputs = [ geographiclib ];
16+
17+ src = fetchPypi {
18+ inherit pname version;
19+ sha256 = "9419bc90ee6231590c4ae7acf1cf126cefbd0736942da7a6a1436946e80830e2";
20+ };
21+
22+ meta = with stdenv.lib; {
23+ homepage = "https://github.com/geopy/geopy";
24+ description = "Python Geocoding Toolbox";
25+ license = licenses.mit;
26+ maintainers = with maintainers; [GuillaumeDesforges];
27+ };
28+}
pkgs/development/python-modules/geopy/default.nix+15−16
@@ -1,31 +1,30 @@
11{ stdenv
22, buildPythonPackage
3−, fetchPypi
4−, isPy27
5−, mock
6−, tox
7−, pylint
3+, fetchFromGitHub
4+, isPy3k
5+, geographiclib
86}:
97
108buildPythonPackage rec {
11− pname = "geopy";
12− version = "1.20.0";
13− disabled = !isPy27;
9+ pname = "geopy-unstable";
10+ version = "2019-11-10";
1411
15− src = fetchPypi {
16− inherit pname version;
17− sha256 = "9419bc90ee6231590c4ae7acf1cf126cefbd0736942da7a6a1436946e80830e2";
18− };
12+ disabled = !isPy3k; # only Python 3
13+ doCheck = false; # Needs network access
1914
20− doCheck = false; # too much
15+ propagatedBuildInputs = [ geographiclib ];
2116
22− buildInputs = [ mock tox pylint ];
17+ src = fetchFromGitHub {
18+ owner = "geopy";
19+ repo = "geopy";
20+ rev = "531b7de6126838a3e69370227aa7f2086ba52b89";
21+ sha256 = "07l1pblzg3hb3dbvd9rq8x78ly5dv0zxbc5hwskqil0bhv5v1p39";
22+ };
2323
2424 meta = with stdenv.lib; {
2525 homepage = "https://github.com/geopy/geopy";
2626 description = "Python Geocoding Toolbox";
2727 license = licenses.mit;
28− broken = true;
28+ maintainers = with maintainers; [GuillaumeDesforges];
2929 };
30−
3130}
pkgs/top-level/python-packages.nix+3−1
@@ -4886,7 +4886,9 @@ in {
48864886
48874887 geographiclib = callPackage ../development/python-modules/geographiclib { };
48884888
4889− geopy = callPackage ../development/python-modules/geopy { };
4889+ geopy = if isPy3k
4890+ then callPackage ../development/python-modules/geopy { }
4891+ else callPackage ../development/python-modules/geopy/2.nix { };
48904892
48914893 django-haystack = callPackage ../development/python-modules/django-haystack { };
48924894