Merge pull request #17140 from michelk/gdal/update

gdal: 2.0.2 -> 2.1.1

authored by

Frederik Rietdijk and committed by
GitHub
0af0a20e 0d08b7d0

+2 -8
+2 -8
pkgs/development/libraries/gdal/default.nix
··· 6 6 }: 7 7 8 8 composableDerivation.composableDerivation {} (fixed: rec { 9 - version = "2.0.2"; 9 + version = "2.1.1"; 10 10 name = "gdal-${version}"; 11 11 12 12 src = fetchurl { 13 13 url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; 14 - sha256 = "db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4"; 14 + sha256 = "55fc6ffbe76e9d2e7e6cf637010e5d4bba6a966d065f40194ff798544198236b"; 15 15 }; 16 16 17 17 buildInputs = [ unzip libjpeg libtiff libpng proj openssl ] 18 18 ++ (with pythonPackages; [ python numpy wrapPython ]) 19 19 ++ (stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]); 20 - 21 - patches = [ 22 - # This ensures that the python package is installed into gdal's prefix, 23 - # rather than trying to install into python's prefix. 24 - ./python.patch 25 - ]; 26 20 27 21 # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. 28 22 # Unset CC and CXX as they confuse libtool.