Jonathan Ringer 9a16965c75 Merge remote-tracking branch 'origin/staging-next' into staging ... Conflicts: pkgs/development/python-modules/awesomeversion/default.nix pkgs/development/python-modules/md2gemini/default.nix pkgs/development/python-modules/mill-local/default.nix pkgs/development/python-modules/pyatv/default.nix pkgs/development/python-modules/pyezviz/default.nix pkgs/development/python-modules/pyinsteon/default.nix pkgs/development/python-modules/pylitterbot/default.nix pkgs/development/python-modules/pynuki/default.nix pkgs/development/python-modules/pypck/default.nix pkgs/development/python-modules/types-requests/default.nix pkgs/top-level/aliases.nix		2022-02-03 21:29:24 -08:00
..
applications	Merge remote-tracking branch 'origin/staging-next' into staging	2022-02-03 21:29:24 -08:00
build-support	Merge remote-tracking branch 'origin/staging-next' into staging	2022-02-03 21:29:24 -08:00
common-updater
data	Merge remote-tracking branch 'origin/staging-next' into staging	2022-02-03 21:29:24 -08:00
desktops	Merge pull request #157264 from FliegendeWurst/disable-broken-parallel	2022-02-03 16:04:57 +02:00
development	Merge remote-tracking branch 'origin/staging-next' into staging	2022-02-03 21:29:24 -08:00
games	openttd-nml: 0.5.3 -> 0.6.1	2022-01-31 10:00:46 -08:00
misc	cups: Add passthru printing test	2022-02-03 09:39:39 -08:00
os-specific	Merge remote-tracking branch 'origin/staging-next' into staging	2022-02-03 21:29:24 -08:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/staging-next' into staging	2022-02-03 21:29:24 -08: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	tests: Add test for makeWrapper	2022-02-02 20:08:26 +01:00
tools	Merge remote-tracking branch 'origin/staging-next' into staging	2022-02-03 21:29:24 -08:00
top-level	Merge remote-tracking branch 'origin/staging-next' into staging	2022-02-03 21:29:24 -08:00