diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-15 02:01:03 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-15 02:01:15 +0100 |
| commit | 3b8cf433506453cfccd255021e1e52882daf4097 (patch) | |
| tree | f32ae1e138468e138615eec0f21f64c10e0742f4 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 231c1145f23b9e7e4477cf280212b92f46698717 (diff) | |
| parent | 1c03223e5c1cf29a349a47ddf76f14806c048852 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/imageio/default.nix
- pkgs/development/python-modules/pytest-order/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions