tjh.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
fork
Configure Feed
Select the types of activity you want to include in your feed.
pythonPackages.cartopy: use proj_5
+5
-4
+5
-4
pkgs/development/python-modules/cartopy/default.nix
+5
-4
pkgs/development/python-modules/cartopy/default.nix
···
1
1
{ buildPythonPackage, lib, fetchPypi
2
2
, pytest, filelock, mock, pep8
3
3
, cython, isPy27
4
-
, six, pyshp, shapely, geos, proj, numpy
4
+
, six, pyshp, shapely, geos, numpy
5
5
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
6
6
, xvfb_run
7
+
, proj_5 # see https://github.com/SciTools/cartopy/pull/1252 for status on proj 6 support
7
8
}:
8
9
9
10
buildPythonPackage rec {
···
28
27
export HOME=$(mktemp -d)
29
28
${maybeXvfbRun} pytest --pyargs cartopy \
30
29
-m "not network and not natural_earth" \
31
-
-k "not test_nightshade_image"
30
+
-k "not test_nightshade_image and not background_img"
32
31
'';
33
32
34
33
nativeBuildInputs = [
35
34
cython
36
35
geos # for geos-config
37
-
proj
36
+
proj_5
38
37
];
39
38
40
39
buildInputs = [
41
-
geos proj
40
+
geos proj_5
42
41
];
43
42
44
43
propagatedBuildInputs = [