zowoq 6431086967 Merge remote-tracking branch 'origin/staging-next' into staging ... Conflicts: pkgs/development/python-modules/symengine/default.nix		2022-03-16 16:03:43 +10:00
..
applications	Merge remote-tracking branch 'origin/staging-next' into staging	2022-03-16 16:03:43 +10:00
build-support	Merge remote-tracking branch 'origin/staging-next' into staging	2022-03-16 16:03:43 +10:00
common-updater
data	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2022-03-14 12:33:16 +00:00
desktops	Merge remote-tracking branch 'origin/staging-next' into staging	2022-03-16 16:03:43 +10:00
development	Merge remote-tracking branch 'origin/staging-next' into staging	2022-03-16 16:03:43 +10:00
games	Merge remote-tracking branch 'origin/staging-next' into staging	2022-03-16 16:03:43 +10:00
misc	Merge remote-tracking branch 'origin/staging-next' into staging	2022-03-16 16:03:43 +10:00
os-specific	Merge remote-tracking branch 'origin/staging-next' into staging	2022-03-16 16:03:43 +10:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/staging-next' into staging	2022-03-16 16:03:43 +10:00
shells	fish: disable flaky pexpect tests on aarch64-linux	2022-03-15 17:14:08 -07:00
stdenv
test
tools	Merge remote-tracking branch 'origin/staging-next' into staging	2022-03-16 16:03:43 +10:00
top-level	Merge remote-tracking branch 'origin/staging-next' into staging	2022-03-16 16:03:43 +10:00