Dmitry Kalinkin da8f155b2a Merge branch 'master' into staging-next ...

Conflicts:
	pkgs/development/python-modules/sphinxext-opengraph/default.nix

2021-12-18 10:18:14 -05:00

..

0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch

…

default.nix

Merge branch 'master' into staging-next

2021-12-18 10:18:14 -05:00