diff options
| author | Alyssa Ross <hi@alyssa.is> | 2025-01-31 10:23:31 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2025-01-31 10:23:31 +0100 |
| commit | dffcaaaa64f93f01492c1e26a54f1fe85b181d24 (patch) | |
| tree | 1d65c87a98726d1f666de17cbb9ad3a4fcd9ecd4 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 864b2a12b951ddeff7d2e3642886a3a4152ed89f (diff) | |
| parent | 4e5fe0f5937a37c02c70bc963e198835d27716b1 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
pkgs/applications/virtualization/crosvm/default.nix
pkgs/by-name/as/ast-grep/package.nix
pkgs/by-name/ca/cargo-mobile2/package.nix
pkgs/by-name/cl/clang-tidy-sarif/package.nix
pkgs/by-name/gg/gg-jj/package.nix
pkgs/by-name/gi/git-warp-time/package.nix
pkgs/by-name/je/jellyfin-rpc/package.nix
pkgs/by-name/ne/netbox2netshot/package.nix
pkgs/by-name/sy/sydbox/package.nix
pkgs/by-name/te/television/package.nix
pkgs/development/python-modules/tinytuya/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions