Jonathan Ringer 39669ea2b6 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/top-level/aliases.nix		2022-02-09 19:58:40 -08:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-09 19:58:40 -08:00
build-support	Merge master into staging-next	2022-02-05 12:01:13 +00:00
common-updater
data	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-09 19:58:40 -08:00
desktops	Merge pull request #157732 from romildo/upd.xfce4-cpufreq-plugin	2022-02-09 23:37:39 +01:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-09 19:58:40 -08:00
games	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-09 19:58:40 -08:00
misc	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-09 19:58:40 -08:00
os-specific	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-09 19:58:40 -08:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-09 19:58:40 -08:00
shells	Merge pull request #154679 from mweinelt/zsh-p10k	2022-02-09 23:36:43 +01:00
stdenv	Merge master into staging-next	2022-02-08 00:01:49 +00:00
test
tools	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-09 19:58:40 -08:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-09 19:58:40 -08:00