diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:29:24 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:29:24 -0800 |
| commit | 9a16965c751b90e2674ba8bb8ec25582cf631f29 (patch) | |
| tree | cca818753e0db7af49db0e3e33dbfd4d86f9dbf7 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 3b8270ac54b9e1892e5ed465ac01a61cd575863f (diff) | |
| parent | 2d666e4bf69a81a731f87a06aa54e3dd1dde217d (diff) | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
pkgs/development/python-modules/awesomeversion/default.nix
pkgs/development/python-modules/md2gemini/default.nix
pkgs/development/python-modules/mill-local/default.nix
pkgs/development/python-modules/pyatv/default.nix
pkgs/development/python-modules/pyezviz/default.nix
pkgs/development/python-modules/pyinsteon/default.nix
pkgs/development/python-modules/pylitterbot/default.nix
pkgs/development/python-modules/pynuki/default.nix
pkgs/development/python-modules/pypck/default.nix
pkgs/development/python-modules/types-requests/default.nix
pkgs/top-level/aliases.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions