diff options
| author | Alyssa Ross <hi@alyssa.is> | 2025-02-02 19:43:40 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2025-02-02 19:43:40 +0100 |
| commit | ce26e2f25aa231ea15b39e582739689fc9705c6a (patch) | |
| tree | d429e52bacb1a8d42278dfe86cbd6e66bec14e27 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | e43dfe4c52d724196a6cbf8029fc47c4cdbfddc5 (diff) | |
| parent | 6319929dc6c66524a67fef35ee0b17c4123fd471 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
pkgs/by-name/ca/cargo-bundle-licenses/package.nix
pkgs/by-name/ca/cargo-semver-checks/package.nix
pkgs/by-name/co/comrak/package.nix
pkgs/by-name/kr/krabby/package.nix
pkgs/by-name/pr/pretix/plugins/passbook/package.nix
pkgs/by-name/ua/uair/package.nix
pkgs/development/python-modules/dlinfo/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions