ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 04:28:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #154037 from risicle/ris-gdal-3.4.1

Browse Source 
gdal: 3.3.2 -> 3.4.1, t-rex: 0.14.2 -> 0.14.3-beta4
This commit is contained in:
Robert Scott 2022-01-19 19:11:07 +00:00 committed by GitHub
commit 2a13b8ef6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/gdal/default.nix
View File

@ -7,13 +7,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "gdal";
version = "3.3.2";
version = "3.4.1";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
rev = "v${version}";
sha256 = "sha256-fla3EMDmuW0+vmmU0sgtLsGfO7dDApLQ2EoKJeR/1IM=";
sha256 = "11rjdaxmsp9n3r9xhmgd7ksy8bh5fazwsxdj0xvl4hsy6bcn4n97";
};
sourceRoot = "source/gdal";
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
expat
libxml2
postgresql
] ++ (with pythonPackages; [ python numpy wrapPython ])
] ++ (with pythonPackages; [ python setuptools numpy wrapPython ])
++ lib.optional stdenv.isDarwin libiconv
++ lib.optionals netcdfSupport [ netcdf hdf5 curl ];

7
pkgs/servers/t-rex/default.nix
View File

@ -2,16 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "t-rex";
version = "0.14.2";
version = "0.14.3-beta4";
src = fetchFromGitHub {
owner = "t-rex-tileserver";
repo = pname;
rev = "v${version}";
hash = "sha256-QNowkQzEYLOgJ2h0yq+gShmW5WgqPF3iiSejqwrOrHo=";
hash = "sha256-EG/nnHxnBwlxreJ+RWHvKqLpaVtlU95+YTJynEnypOE=";
};
cargoHash = "sha256-k10DjLJCJLqjmtEED5pwQDt3mOiey89UYC36lG+3AmM=";
cargoHash = "sha256-noDZNFZlfX6lZ4czsSrHXe7xbBLTD0Gz8i5EyfEp8lc=";
nativeBuildInputs = [ pkg-config ];