diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-04-12 07:06:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-04-12 07:06:54 +0200 |
| commit | 24d4f2cd52fc44f375e60ab4c90e159193689d72 (patch) | |
| tree | 113c1984373abdd81ca189e25fa76396a55706bc /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 4cfc319ea877f057cb7ad0c455c6af52e72bc557 (diff) | |
| parent | 993400aeecf5ce185586dded2cebccebd628ec93 (diff) | |
Merge branch 'staging' into staging-next
Conflicts (tried to quickly resolve somehow, checked eval):
pkgs/development/python-modules/apsw/default.nix
pkgs/development/python-modules/mido/default.nix
pkgs/development/python-modules/pytest-bdd/default.nix
pkgs/development/python-modules/sparse/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions