diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2025-01-30 00:30:24 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2025-01-30 00:32:08 +0100 |
| commit | d59a511001e1e25e4038a1f2fe90cc42f3a85edb (patch) | |
| tree | 9bbfd6b8598f36741f91495b407aa3e6ebe64677 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 34e6ffaf2e11fc855eaaeff6048e8f6f02670469 (diff) | |
| parent | 3c9c51328c654a95c942b6b4105182a3a9c372b0 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/by-name/ca/cargo-pgo/package.nix
- pkgs/by-name/lr/lrcget/package.nix
- pkgs/by-name/no/noseyparker/package.nix
- pkgs/development/python-modules/cysignals/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions