diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2025-01-29 16:08:41 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2025-01-29 16:08:53 +0100 |
| commit | 909803a20e33acb659c62332198c5d9d04d6f98a (patch) | |
| tree | aeae159543352c51ad06f809b6e3ceb1b7b3ceb6 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | c864087bd2e466b1d3be537e0a662208f20b1886 (diff) | |
| parent | 1eebcc7cdde7015109fafb284d52f78e1e273fa0 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/by-name/au/automatic-timezoned/package.nix
- pkgs/by-name/da/darklua/package.nix
- pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
- pkgs/by-name/li/limbo/package.nix
- pkgs/by-name/mi/minijinja/package.nix
- pkgs/by-name/pa/pay-respects/package.nix
- pkgs/by-name/ri/river-bsp-layout/package.nix
- pkgs/by-name/sv/svgbob/package.nix
- pkgs/by-name/tu/tui-journal/package.nix
- pkgs/by-name/wa/waypipe/package.nix
- pkgs/development/python-modules/zxcvbn-rs-py/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions