diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-07-11 01:06:18 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-07-11 01:06:28 +0200 |
| commit | 176a56c40f05b237758a6e2bb600a1842968e231 (patch) | |
| tree | 7a452311018befa7f98a0b60ac652f7012fc3f2f /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | f5e6cf0e6eac08d25365d7be503224e2491f6d62 (diff) | |
| parent | fcfac8071db9283d823fdaecdd0fe7cb17bae17a (diff) | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
- pkgs/applications/misc/blender/default.nix
- pkgs/development/web/nodejs/nodejs.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions