diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2025-01-28 00:15:33 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2025-01-28 00:15:44 +0100 |
| commit | 33647a81795cc397c88b4fa0dd6221a5cae3ad85 (patch) | |
| tree | 8c7ccc5a4eefe22a2ccfdfc4cf5d20cb10fe6b50 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 3ca518fe7868a15590678bc1879a2c4d67ce07de (diff) | |
| parent | e16e376ee3ece686725bbf454255a5dcc9a40c7a (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/by-name/ca/cargo-leptos/package.nix
- pkgs/by-name/ha/harper/package.nix
- pkgs/by-name/ma/marmite/package.nix
- pkgs/by-name/no/nomino/package.nix
- pkgs/by-name/st/stgit/package.nix
- pkgs/development/python-modules/pycm/default.nix
- pkgs/development/python-modules/python-gvm/default.nix
- pkgs/development/tools/rbspy/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions