diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-13 19:16:43 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-13 19:16:43 +0100 |
| commit | 01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0 (patch) | |
| tree | fa3b5948ed7c99764e1cd234beba97cc0b2d141b /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 1df29ee4562a573f0528dcfb8866bd309865ba47 (diff) | |
| parent | 5e367ecef917dadbe3e977b281a33c1fc9cf6e59 (diff) | |
Merge branch 'master' into staging-next
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict.
It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions