diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 221b459f84a..a270dca910c 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, boost, proj, gdal_1_11_2}: +{stdenv, fetchurl, qt4, boost, proj, gdal_1_11}: stdenv.mkDerivation rec { name = "merkaartor-0.18.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { qmake -makefile PREFIX=$out ''; - buildInputs = [ qt4 boost proj gdal_1_11_2 ]; + buildInputs = [ qt4 boost proj gdal_1_11 ]; meta = { description = "An openstreetmap editor"; diff --git a/pkgs/development/libraries/gdal/gdal-1_11_2.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix similarity index 95% rename from pkgs/development/libraries/gdal/gdal-1_11_2.nix rename to pkgs/development/libraries/gdal/gdal-1_11.nix index fe7d0869fbd..0e4b4d03541 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11_2.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -3,12 +3,12 @@ , libpng }: composableDerivation.composableDerivation {} (fixed: rec { - version = "1.11.2"; + version = "1.11.3"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; + sha256 = "561588bdfd9ca91919d4679a77a2b44214b158934ee8b425295ca5be33a1014d"; }; buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 476f7e14c60..ecb4d82c965 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng - , coin3d, jasper, gdal_1_11_2, xproto, libX11, libXmu, freeglut, mesa + , coin3d, jasper, gdal_1_11, xproto, libX11, libXmu, freeglut, mesa , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2 , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL , qt4, poppler, librsvg, gtk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7b094980a9..b0b6b2145ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6327,7 +6327,7 @@ let gdal = callPackage ../development/libraries/gdal { }; - gdal_1_11_2 = callPackage ../development/libraries/gdal/gdal-1_11_2.nix { }; + gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; gdcm = callPackage ../development/libraries/gdcm { };