Jonathan Ringer f7500b6f57 python3Packages.hydra: fix bad merge conflict resolution		2022-01-07 11:21:35 -08:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
build-support	Merge master into staging-next	2022-01-07 00:01:42 +00:00
common-updater
data	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
desktops	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
development	python3Packages.hydra: fix bad merge conflict resolution	2022-01-07 11:21:35 -08:00
games	crafty: remove	2022-01-07 16:45:55 +07:00
misc	Merge pull request #153827 from datafoo/vscode-extensions.streetsidesoftware.code-spell-checker	2022-01-07 23:26:06 +08:00
os-specific	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
shells
stdenv
test
tools	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2022-01-07 10:31:29 -08:00