Jonathan Ringer 6635f5b208 Merge remote-tracking branch 'origin/master' into staging-next ... - Fix which python interpreters are exposed Conflicts: pkgs/top-level/all-packages.nix		2021-12-22 00:31:14 -08:00
..
applications	Merge pull request #151635 from collares/sage-fonttools	2021-12-22 07:50:33 +00:00
build-support	Merge master into staging-next	2021-12-22 00:01:35 +00:00
common-updater
data	Merge master into staging-next	2021-12-21 18:01:15 +00:00
desktops	Merge pull request #146774 from pasqui23/lightly	2021-12-22 07:03:56 +01:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-22 00:31:14 -08:00
games	Merge master into staging-next	2021-12-21 18:01:15 +00:00
misc	Merge master into staging-next	2021-12-22 00:01:35 +00:00
os-specific	Merge master into staging-next	2021-12-22 00:01:35 +00:00
pkgs-lib
servers	Merge master into staging-next	2021-12-22 00:01:35 +00:00
shells
stdenv
test
tools	Merge master into staging-next	2021-12-22 06:01:25 +00:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-22 00:31:14 -08:00