diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index d322f913..d3a0e056 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -67,7 +67,7 @@ nix why-depends .# .# ### Packages update process -* Checkout to `weekly-update` PR (PR title "pkgs: weekly update ()") (Thursday - Friday) +* Checkout to `weekly-update` PR (PR title "pkgs: weekly update (weekly-update-)") (Thursday - Friday) ```bash gh pr checkout -f ``` @@ -78,6 +78,9 @@ utils/pull-nixpkgs.sh ``` * Visually review changes created by `pull-nixpkgs.sh` script +``` +git diff +``` * Identify related PRs in Nixpkgs ``` diff --git a/flake.lock b/flake.lock index e1751d47..2e48a040 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1710868679, - "narHash": "sha256-V1o2bCZdeYKP/0zgVp4EN0KUjMItAMk6J7SvCXUI5IU=", + "lastModified": 1713543440, + "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", "owner": "nix-community", "repo": "nixGL", - "rev": "d709a8abcde5b01db76ca794280745a43c8662be", + "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713013257, - "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", + "lastModified": 1713564160, + "narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", + "rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c", "type": "github" }, "original": { diff --git a/pkgs/fiona/nixpkgs/cython.patch b/pkgs/fiona/nixpkgs/cython.patch new file mode 100644 index 00000000..9f39e022 --- /dev/null +++ b/pkgs/fiona/nixpkgs/cython.patch @@ -0,0 +1,22 @@ +diff --git b/pkgs/fiona/default.nix a/pkgs/fiona/default.nix +index 35c9b57..e198752 100644 +--- b/pkgs/fiona/default.nix ++++ a/pkgs/fiona/default.nix +@@ -2,7 +2,7 @@ + , buildPythonPackage + , pythonOlder + , fetchFromGitHub +-, cython ++, cython_3 + , gdal + , oldest-supported-numpy + , setuptools +@@ -34,7 +34,7 @@ buildPythonPackage rec { + }; + + nativeBuildInputs = [ +- cython ++ cython_3 + gdal # for gdal-config + oldest-supported-numpy + setuptools diff --git a/pkgs/qgis/unwrapped-ltr.nix b/pkgs/qgis/unwrapped-ltr.nix index ad3ceddd..0c926061 100644 --- a/pkgs/qgis/unwrapped-ltr.nix +++ b/pkgs/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.5"; + version = "3.34.6"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-TRSS1YclGUfBjNz+Lo8U8YlN4kdJ9JLcwd7qpgwRbG0="; + hash = "sha256-eWd8oIINWVN5Dt6s4bc1RtQbytFd0foPgIcd/N2hsMw="; }; passthru = { diff --git a/pkgs/qgis/unwrapped.nix b/pkgs/qgis/unwrapped.nix index 6e4161fb..8d7f7d12 100644 --- a/pkgs/qgis/unwrapped.nix +++ b/pkgs/qgis/unwrapped.nix @@ -73,14 +73,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.36.1"; + version = "3.36.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-/0wVPcQoliJFgY8Kn506gUHfY+kDTdLgzbp/0KLSAkI="; + hash = "sha256-/8mpzl/6UpjrMVjae2nqpS2DBRCq86rE+B3INzoRz8g="; }; passthru = { diff --git a/pkgs/rasterio/nixpkgs/cython.patch b/pkgs/rasterio/nixpkgs/cython.patch new file mode 100644 index 00000000..f4ce2d97 --- /dev/null +++ b/pkgs/rasterio/nixpkgs/cython.patch @@ -0,0 +1,22 @@ +diff --git b/pkgs/rasterio/default.nix a/pkgs/rasterio/default.nix +index abf2de3..150fe76 100644 +--- b/pkgs/rasterio/default.nix ++++ a/pkgs/rasterio/default.nix +@@ -13,7 +13,7 @@ + , click + , click-plugins + , cligj +-, cython ++, cython_3 + , gdal + , hypothesis + , ipython +@@ -54,7 +54,7 @@ buildPythonPackage rec { + ''; + + nativeBuildInputs = [ +- cython ++ cython_3 + gdal + numpy + setuptools diff --git a/pkgs/shapely/nixpkgs/cython.patch b/pkgs/shapely/nixpkgs/cython.patch new file mode 100644 index 00000000..760e20b5 --- /dev/null +++ b/pkgs/shapely/nixpkgs/cython.patch @@ -0,0 +1,22 @@ +diff --git b/pkgs/shapely/default.nix a/pkgs/shapely/default.nix +index 28f2acd..209cdf3 100644 +--- b/pkgs/shapely/default.nix ++++ a/pkgs/shapely/default.nix +@@ -5,7 +5,7 @@ + , pytestCheckHook + , pythonOlder + +-, cython_0 ++, cython + , geos + , numpy + , oldest-supported-numpy +@@ -26,7 +26,7 @@ buildPythonPackage rec { + }; + + nativeBuildInputs = [ +- cython_0 ++ cython + geos # for geos-config + oldest-supported-numpy + setuptools