diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-20 12:09:28 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-20 12:09:28 -0500 |
| commit | ac40a963c97bd38b9baeb82f0fe074c84cbe9e1e (patch) | |
| tree | e2c1a66a944ec2d0e91aae826bc2da7051af2461 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 88171cca9b3b9fa2b8bb5b1d47536fa84f04d175 (diff) | |
| parent | bf6c88eba29055e384859ae551f88cedf5d26033 (diff) | |
Merge branch 'master' into staging-next
Conflicts:
pkgs/applications/editors/vim/common.nix
pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
pkgs/development/python-modules/pymavlink/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions