Unverified Commit 4601133c authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #256027 from dotlambda/proj-9.3.0 

proj: 9.2.1 -> 9.3.0
parents 75ce253a 1797809c

pkgs/development/libraries/proj/default.nix

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


stdenv.mkDerivation (finalAttrs: rec {

  pname = "proj";

  version = "9.2.1";

  version = "9.3.0";



  src = fetchFromGitHub {

    owner = "OSGeo";

    repo = "PROJ";

    rev = version;

    hash = "sha256-cUnnJ9gOh65xBbfamfDkN7ajRdRLO5nUXRLeaBBMchg=";

    hash = "sha256-M1KUXzht4qIjPfHxvzPr7XUnisMwtbegKp18XQjNYHg=";

  };



  patches = [

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

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


buildPythonPackage rec {

  pname = "pyproj";

  version = "3.6.0";

  version = "3.6.1";

  disabled = pythonOlder "3.9";



  src = fetchFromGitHub {

    owner = "pyproj4";

    repo = "pyproj";

    rev = "refs/tags/${version}";

    hash = "sha256-XMJg1azsvMtVnKuIulrrZ1Of3CFk2/EgQjkN1g0FpmQ=";

    hash = "sha256-ynAhu89VpvtQJRkIeVyffQHhd+OvWSiZzaI/7nd6fXA=";

  };



  # force pyproj to use ${proj}