Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5f506b95f9f6
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 240381bc733b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 18, 2019

  1. pythonPackages.cartopy: fix tests

    Jonathan Ringer committed Nov 18, 2019
    Copy the full SHA
    d85d3c8 View commit details

  2. pythonPackages.fiona: fix linking issue

    Jonathan Ringer committed Nov 18, 2019
    Copy the full SHA
    240381b View commit details
Showing with 9 additions and 9 deletions.
  1. +2 −2 pkgs/development/python-modules/cartopy/default.nix
  2. +7 −7 pkgs/development/python-modules/fiona/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/cartopy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ buildPythonPackage, lib, fetchPypi
, pytest, filelock, mock, pep8
, pytest_4, filelock, mock, pep8
, cython, isPy27
, six, pyshp, shapely, geos, numpy
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "0q9ckfi37cxj7jwnqnzij62vwcf4krccx576vv5lhvpgvplxjjs2";
};

checkInputs = [ filelock mock pytest pep8 ];
checkInputs = [ filelock mock pytest_4 pep8 ];

# several tests require network connectivity: we disable them.
# also py2.7's tk is over-eager in trying to open an x display,
14 changes: 7 additions & 7 deletions pkgs/development/python-modules/fiona/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ 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
}:

@@ -13,15 +13,15 @@ buildPythonPackage rec {
sha256 = "0gpvdrayam4qvpqvz0911nlyvf7ib3slsyml52qx172vhpldycgs";
};

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
];

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;