nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-19 10:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #317001 from NixOS/backport-316828-to-release-24.05

Browse Source 
[Backport release-24.05] proj: 9.4.0 -> 9.4.1
This commit is contained in:
Ivan Mincik 2024-06-04 14:35:38 +00:00 committed by GitHub
commit 85ca4ce22e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/proj/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "proj"; pname = "proj";
version = "9.4.0"; version = "9.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OSGeo"; owner = "OSGeo";
repo = "PROJ"; repo = "PROJ";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-m8u5+uWeXI2lxxsTcVJbvCiV30CQifw4reAY3GHHavA="; hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU=";
}; };
patches = [ patches = [

23
pkgs/development/python-modules/pyproj/default.nix
View File

@ -2,17 +2,18 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
python, fetchpatch,
proj, pytestCheckHook,
pythonOlder, pythonOlder,
substituteAll, substituteAll,
cython,
pytestCheckHook,
mock,
certifi, certifi,
cython,
mock,
numpy, numpy,
shapely,
pandas, pandas,
proj,
shapely,
xarray, xarray,
}: }:
@ -36,6 +37,12 @@ buildPythonPackage rec {
proj = proj; proj = proj;
projdev = proj.dev; projdev = proj.dev;
}) })
# fix test failure caused by update of EPSG DB
(fetchpatch {
url = "https://github.com/pyproj4/pyproj/commit/3f7c7e5bcec33d9b2f37ceb03c484ea318dff3ce.patch";
hash = "sha256-0J8AlInuhFDAYIBJAJ00XbqIanJY/D8xPVwlOapmLDE=";
})
]; ];
nativeBuildInputs = [ cython ]; nativeBuildInputs = [ cython ];
@ -44,11 +51,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ certifi ]; propagatedBuildInputs = [ certifi ];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook
mock mock
numpy numpy
shapely
pandas pandas
pytestCheckHook
shapely
xarray xarray
]; ];