Merge pull request #108663 from fabaff/geopy

This commit is contained in:
Sandro 2021-01-15 10:30:55 +01:00 committed by GitHub
commit 6212342f2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 15 deletions

View File

@ -1,30 +1,42 @@
{ lib, stdenv { lib
, async_generator
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, isPy3k
, geographiclib , geographiclib
, isPy3k
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "geopy-unstable"; pname = "geopy";
version = "2019-11-10"; version = "2.1.0";
disabled = !isPy3k; # only Python 3 disabled = !isPy3k; # only Python 3
doCheck = false; # Needs network access
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0239a4achk49ngagb6aqy6cgzfwgbxir07vwi13ysbpx78y0l4g9";
};
propagatedBuildInputs = [ geographiclib ]; propagatedBuildInputs = [ geographiclib ];
src = fetchFromGitHub { checkInputs = [
owner = "geopy"; async_generator
repo = "geopy"; pytestCheckHook
rev = "531b7de6126838a3e69370227aa7f2086ba52b89"; ];
sha256 = "07l1pblzg3hb3dbvd9rq8x78ly5dv0zxbc5hwskqil0bhv5v1p39";
}; # Exclude tests which perform API calls
pytestFlagsArray = [ "--ignore test/geocoders/" ];
pythonImportsCheck = [ "geopy" ];
__darwinAllowLocalNetworking = true;
meta = with lib; { meta = with lib; {
homepage = "https://github.com/geopy/geopy"; homepage = "https://github.com/geopy/geopy";
description = "Python Geocoding Toolbox"; description = "Python Geocoding Toolbox";
license = licenses.mit; changelog = "https://github.com/geopy/geopy/releases/tag/${version}";
maintainers = with maintainers; [GuillaumeDesforges]; license = with licenses; [ mit ];
maintainers = with maintainers; [ GuillaumeDesforges ];
}; };
} }

View File

@ -39,7 +39,7 @@
"apns" = ps: with ps; [ ]; # missing inputs: apns2 "apns" = ps: with ps; [ ]; # missing inputs: apns2
"apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ];
"apprise" = ps: with ps; [ apprise ]; "apprise" = ps: with ps; [ apprise ];
"aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib
"aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic
"aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc
"arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj