Alyssa Ross e2bb7997c4 Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: nixos/doc/manual/release-notes/rl-2111.section.md		2021-09-19 17:08:00 +00:00
..
applications	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-19 17:08:00 +00:00
build-support
common-updater
data
desktops	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-19 17:08:00 +00:00
development	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-19 17:08:00 +00:00
games	Merge pull request #136322 from DeeUnderscore/cataclysm-dda-0.F-2	2021-09-19 18:15:40 +08:00
misc	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-19 17:08:00 +00:00
os-specific	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-19 17:08:00 +00:00
pkgs-lib
servers	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-19 17:08:00 +00:00
shells
stdenv	stdenv: re-add isMachO helper function (#138334)	2021-09-17 23:09:06 -04:00
test
tools	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-19 17:08:00 +00:00
top-level	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-19 17:08:00 +00:00