diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-04-08 22:42:26 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-04-08 22:42:26 -0400 |
| commit | 219590673ce4b8c01d595e64bff21d54a72191b7 (patch) | |
| tree | 2b577ead908bf018df37b1241ba7a01d8659acdb /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 625ce6c7f66c0b2ccae30f95cdd9e48feed8561c (diff) | |
| parent | c99b6f5343030d7e5e3feef8b6c596f7644310a0 (diff) | |
Merge branch 'staging-next' into staging
Conflicts:
pkgs/development/python-modules/panel/default.nix
pkgs/os-specific/linux/kernel/generic.nix
pkgs/servers/home-assistant/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions