diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-05-22 18:08:07 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-05-22 18:08:30 +0200 |
| commit | 42493b30b70fa56e71878b5477550ed41a916774 (patch) | |
| tree | 15e401a40aa7ffe732a8b301b089d0b4d2b883ec /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | ef3d271c3b45eb153854b2ea30192e9740bf2da0 (diff) | |
| parent | 9b4fb239930f3ec1bbbe6aae4404e09d69272d97 (diff) | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
- pkgs/development/python-modules/curio/default.nix
- pkgs/development/python-modules/pytest-httpbin/default.nix
- pkgs/development/python-modules/xtensor-python/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions