diff options
| author | Alyssa Ross <hi@alyssa.is> | 2025-01-24 16:40:22 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2025-01-24 16:40:22 +0100 |
| commit | 53de5140aef9eb3a0446d5f082d1bcbe3805820d (patch) | |
| tree | b882416346daf5d698e80280995818bf40bfea20 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | d175d8a4c55ce11c61e70f6d0d0458e7801441c8 (diff) | |
| parent | 28b95d785aeb6df101bbdf36f5a797b4206ce4a3 (diff) | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix
pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix
pkgs/by-name/ce/cedar/package.nix
pkgs/by-name/gn/gnome-podcasts/package.nix
pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
pkgs/by-name/sy/systemctl-tui/package.nix
pkgs/by-name/ti/tinty/package.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions