Merge branch 'staging' into staging-next

Browse Source

A few conflicts but relatively clear ones (I think).

...

This commit is contained in:

Vladimír Čunát

2021-04-14 10:08:25 +02:00

parent 3257feac49 25ae1fd29f

commit d2eb7a7887

675 changed files with 5919 additions and 3687 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

pkgs/top-level/python-packages.nix

+154 -792

File diff suppressed because it is too large Load Diff