Merge staging-next into staging

2021-02-01 00:47:02 +00:00
parent 98cc48e3f7 2e25044cc9
commit 104c56e909
32 changed files with 866 additions and 283 deletions
@@ -2526,6 +2526,8 @@ in {

  geojson-client = callPackage ../development/python-modules/geojson-client { };

+  geomet = callPackage ../development/python-modules/geomet { };
+
  geopandas = callPackage ../development/python-modules/geopandas { };

  geopy = if isPy3k then
@@ -2793,6 +2795,8 @@ in {

  grequests = callPackage ../development/python-modules/grequests { };

+  gremlinpython = callPackage ../development/python-modules/gremlinpython { };
+
  grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override {
    enablePython = true;
    pythonPackages = self;