Dmitry Kalinkin 3087088c41 Merge branch 'staging-next' into staging ... Conflicts: pkgs/top-level/aliases.nix pkgs/top-level/python-aliases.nix		2022-02-01 21:37:39 -05:00
..
applications	Merge branch 'staging-next' into staging	2022-02-01 21:37:39 -05:00
build-support	Merge staging-next into staging	2022-01-31 12:01:50 +00:00
common-updater
data	Merge staging-next into staging	2022-02-01 18:05:39 +00:00
desktops	Merge master into staging-next	2022-02-02 00:01:49 +00:00
development	Merge branch 'staging-next' into staging	2022-02-01 21:37:39 -05:00
games	openttd-nml: 0.5.3 -> 0.6.1	2022-01-31 10:00:46 -08:00
misc	Merge pull request #157633 from AndersonTorres/new-misc	2022-02-01 09:18:58 -03:00
os-specific	Merge branch 'staging-next' into staging	2022-02-01 21:37:39 -05:00
pkgs-lib
servers	Merge branch 'staging-next' into staging	2022-02-01 21:37:39 -05:00
shells	oh-my-zsh: 2021-12-18 -> 2022-01-18	2022-01-31 10:01:00 -08:00
stdenv	Merge branch 'staging-next' into staging	2022-02-01 21:37:39 -05:00
test
tools	Merge branch 'staging-next' into staging	2022-02-01 21:37:39 -05:00
top-level	Merge branch 'staging-next' into staging	2022-02-01 21:37:39 -05:00