diff options
| author | Alyssa Ross <hi@alyssa.is> | 2025-01-30 15:02:26 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2025-01-30 15:02:26 +0100 |
| commit | 97fc6f36d0a5c2e03b89dc98b0ed86d6953da172 (patch) | |
| tree | ff43a49477bd488a29c30a35b2bac62e7bb6d563 /pkgs/development/python-modules/rangehttpserver | |
| parent | ec703a9ea86eb7e9771199e50371d4bd3d091bcc (diff) | |
| parent | 06d633e659b6bf004b309018d1edfa2a7a7010ae (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
pkgs/by-name/ez/eza/package.nix
pkgs/by-name/re/rewatch/package.nix
pkgs/by-name/rq/rqbit/package.nix
pkgs/development/python-modules/diffusers/default.nix
pkgs/development/python-modules/manga-ocr/default.nix
pkgs/development/tools/misc/texlab/default.nix
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions