diff options
| author | Vladimír Čunát <v@cunat.cz> | 2025-01-27 09:50:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2025-01-27 09:52:04 +0100 |
| commit | 3d09bba98ddd118712728e5bedc71f0ad5a1a9e4 (patch) | |
| tree | 68740ec4cdf0921ad79ecf444155a51fca989259 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 4b3bf6b204a0476accaa47224d768aba14ce30a3 (diff) | |
| parent | 4e33cead81bd2723fb19febc7e3eea6bc1d8f408 (diff) | |
Merge branch 'staging' into staging-next
Conflicts:
pkgs/by-name/ba/bacon/package.nix
pkgs/by-name/be/beancount-language-server/package.nix
pkgs/by-name/fl/flake-edit/package.nix
pkgs/by-name/fw/fw/package.nix
pkgs/by-name/im/impression/package.nix
pkgs/by-name/in/inori/package.nix
pkgs/by-name/pi/pika-backup/package.nix
pkgs/by-name/ri/rip2/package.nix
pkgs/by-name/sn/sniffnet/package.nix
pkgs/by-name/sy/syndicate_utils/package.nix
pkgs/development/tools/misc/texlab/default.nix
In the cases where an update collided with cargoHash change,
I took the hash from the update.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions