public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.fiona: pin gdal to gdal_2

Browse Source
This commit is contained in:
Jonathan Ringer 2019-07-13 21:00:48 -07:00
parent 70671e71d1
commit ca0fe27302
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/fiona/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder { stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
, attrs, click, cligj, click-plugins, six, munch, enum34 , attrs, click, cligj, click-plugins, six, munch, enum34
, pytest, boto3, mock , pytest, boto3, mock
, gdal , gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -16,11 +16,11 @@ buildPythonPackage rec {
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
nativeBuildInputs = [ nativeBuildInputs = [
gdal # for gdal-config gdal_2 # for gdal-config
]; ];
buildInputs = [ buildInputs = [
gdal gdal_2
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

2
pkgs/top-level/python-packages.nix
View File

@ -2718,7 +2718,7 @@ in {
filelock = callPackage ../development/python-modules/filelock {}; filelock = callPackage ../development/python-modules/filelock {};
fiona = callPackage ../development/python-modules/fiona { gdal = pkgs.gdal; }; fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; };
fitbit = callPackage ../development/python-modules/fitbit { }; fitbit = callPackage ../development/python-modules/fitbit { };