Unverified Commit 5b877ff1 authored by dotlambda's avatar dotlambda Committed by GitHub
Browse files

proj: 9.7.1 -> 9.8.0 (#498606)

parents de84ab04 b6300674

pkgs/by-name/pr/proj/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "proj";

  version = "9.7.1";

  version = "9.8.0";



  src = fetchFromGitHub {

    owner = "OSGeo";

    repo = "PROJ";

    tag = finalAttrs.version;

    hash = "sha256-xXtqbLPS2Hu9gC06b72HDjnNRh4m0ism97hP8FFYOMo=";

    hash = "sha256-LvzQ2sW+h5uHJg+6z8/Nf99EVIPUQfWoaNr0iFUpD/0=";

  };



  patches = [

pkgs/development/python-modules/pyproj/default.nix

+18 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch2,

  pytestCheckHook,

  replaceVars,
@@ -33,6 +34,23 @@ buildPythonPackage rec { 
      proj = proj;

      projdev = proj.dev;

    })

    # PROJ 9.8.0 compatibility

    (fetchpatch2 {

      url = "https://github.com/pyproj4/pyproj/pull/1557.diff?full_index=1";

      hash = "sha256-3iK/JaQEgyQvPjybJF/ATxOy3fFl7q6aa9tdfsrhajM=";

    })

    (fetchpatch2 {

      url = "https://github.com/pyproj4/pyproj/pull/1560.diff?full_index=1";

      hash = "sha256-fr+lvDeVFDagc9aHzaQhyZtWK2sy5kR7iImJsuxW8Z4=";

    })

    (fetchpatch2 {

      url = "https://github.com/pyproj4/pyproj/pull/1568.diff?full_index=1";

      hash = "sha256-fVFg3/ikOk6LiRHA/u14g+ZFsROGE7me878Vvq4mxG4=";

    })

    (fetchpatch2 {

      url = "https://github.com/pyproj4/pyproj/pull/1581.diff?full_index=1";

      hash = "sha256-EdzUCt4P99ENS2qCBU30FUNnJYD0B2CqcmZXwEYLdVA=";

    })

  ];



  build-system = [
@@ -72,9 +90,6 @@ buildPythonPackage rec { 
    "test_sync__source_id__list"

    "test_sync_download"

    "test_transformer_group__download_grids"

    # https://github.com/pyproj4/pyproj/issues/1553

    "test_datum_horizontal"

    "test_sub_crs"

  ];



  pythonImportsCheck = [