diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-05 07:56:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-05 08:02:48 +0000 |
| commit | a838aa244f52fcf9325e4d41d89a69ce900b09d0 (patch) | |
| tree | 9dbc24eb67c5fdb217cb1bea2c97fbfdc98e9c95 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 894baab1654685f6420df497c62ad7015d636931 (diff) | |
| parent | d579416a56656f914412897973755d5b9908979b (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
The hash for pytensor is not correct, but that's also the case in
master, so a merge commit isn't the place to fix it.
Conflicts:
pkgs/development/python-modules/faadelays/default.nix
pkgs/development/python-modules/pytensor/default.nix
pkgs/tools/admin/rset/default.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions