Vladimír Čunát 82bccc2d62

Merge branch 'nixpkgs-unstable' into PR #111431 ...

I'm not really sure about the conflicts in:
	pkgs/development/python-modules/psutil/default.nix

Hydra nixpkgs: ?compare=1666054

2021-04-28 17:13:34 +02:00

..

default.nix

Merge branch 'nixpkgs-unstable' into PR #111431

2021-04-28 17:13:34 +02:00