diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-24 15:34:55 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-24 15:35:04 +0200 |
| commit | c02aa9b62fd2eeafc44573d38b33a6cb02cef65c (patch) | |
| tree | 3f291d46a599ed2aae941f51a1ea06f4708d9f74 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | c05a24c10b19351dd953069c4333f27d812fa590 (diff) | |
| parent | 6acfb07b7ff392f1cdfe2dfb96f21cb919ca359d (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/pixel-font-builder/default.nix
- pkgs/development/python-modules/unidata-blocks/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions