diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-03-15 09:42:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-03-15 09:52:04 +0100 |
| commit | f48c1fda6b457520c1214b29992af0c0c9872b6c (patch) | |
| tree | 1bb43ae46bf2c035c48361c764ad4c5995881a10 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 415d23fb4d2b2823a87d410da9beef8332d82d7b (diff) | |
| parent | aa6313a23d749f0d73f91af35a2fe15e74501451 (diff) | |
Merge branch 'master' into staging-next
Conflict in pkgs/development/libraries/libvirt/default.nix
required manual adjustments. The fetched patch is already in src.
I checked that libvirt builds.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions