JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdal: 1.11.2 -> 1.11.3

Browse Source
This commit is contained in:
Michel Kuhlmann 2015-11-03 09:00:08 +01:00
parent 70aff600ff
commit 8e9a8a8fd0
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/merkaartor/default.nix
View File

@ -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";

4
pkgs/development/libraries/gdal/gdal-1_11_2.nix → pkgs/development/libraries/gdal/gdal-1_11.nix
View File

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

2
pkgs/development/libraries/openscenegraph/default.nix
View File

@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };