aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/python-modules/fiona/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/fiona/default.nix')
-rw-r--r--nixpkgs/pkgs/development/python-modules/fiona/default.nix18
1 files changed, 9 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix
index 6dd74742741..f5977bf367c 100644
--- a/nixpkgs/pkgs/development/python-modules/fiona/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
+{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
, attrs, click, cligj, click-plugins, six, munch, enum34
-, pytest, boto3, mock
+, pytest, boto3, mock, giflib
, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
}:
buildPythonPackage rec {
pname = "Fiona";
- version = "1.8.6";
+ version = "1.8.8";
src = fetchPypi {
inherit pname version;
- sha256 = "0gpvdrayam4qvpqvz0911nlyvf7ib3slsyml52qx172vhpldycgs";
+ sha256 = "10qym4anwh0mgfgkhrz6cimkv7af3rd49290k497icq36bkkn73i";
};
- CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+ CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
nativeBuildInputs = [
gdal_2 # for gdal-config
@@ -21,7 +21,7 @@ buildPythonPackage rec {
buildInputs = [
gdal_2
- ];
+ ] ++ lib.optionals stdenv.cc.isClang [ giflib ];
propagatedBuildInputs = [
attrs
@@ -30,12 +30,12 @@ buildPythonPackage rec {
click-plugins
six
munch
- ] ++ stdenv.lib.optional (!isPy3k) enum34;
+ ] ++ lib.optional (!isPy3k) enum34;
checkInputs = [
pytest
boto3
- ] ++ stdenv.lib.optional (pythonOlder "3.4") mock;
+ ] ++ lib.optional (pythonOlder "3.4") mock;
checkPhase = ''
rm -r fiona # prevent importing local fiona
@@ -45,7 +45,7 @@ buildPythonPackage rec {
and not test_*_wheel"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "OGR's neat, nimble, no-nonsense API for Python";
homepage = http://toblerity.org/fiona/;
license = licenses.bsd3;