diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-09-07 08:43:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-09-07 08:43:26 +0200 |
| commit | 09f57637848ad3ccf9560d83aca22751b7b54385 (patch) | |
| tree | 1c5d892a02888873e6320612502fe812814c7a5a /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | dbc322824873e4e428c7ddc740000693959cff28 (diff) | |
| parent | e622dd1c8422fa378b0ee242b2804afac19b61ec (diff) | |
Merge branch 'master' into staging-next
Conflicts:
- pkgs/development/python-modules/pathspec/default.nix
The hashes are equivalent, so it's not a real conflict.
- pkgs/top-level/static.nix
I can't see a solution, deffered redoing this to the later PR:
https://github.com/NixOS/nixpkgs/pull/136849
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions