diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-11 13:15:49 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-11 13:15:49 -0500 |
| commit | b6b59334bbb7b3ca273fb729483dcaa2a6f889c8 (patch) | |
| tree | d264bcb769847136b623616512acbec02fc310a2 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 83b45c228556168cb22183d5fbc772fb5a192559 (diff) | |
| parent | 32e770042e8c1ba70d89d9190f30405b26208f26 (diff) | |
Merge branch 'master' into staging-next
Conflicts:
pkgs/development/python-modules/celery/default.nix
pkgs/development/python-modules/kombu/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions