Alyssa Ross 56314db098 Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: pkgs/development/compilers/ghc/8.10.7.nix pkgs/development/compilers/ghc/8.8.4.nix I've removed the isWindows check from useLdGold in ghc, since that should be covered by the new hasGold check.		2021-09-11 10:49:13 +00:00
..
applications	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-11 10:49:13 +00:00
build-support	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-11 10:49:13 +00:00
common-updater
data	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-11 10:49:13 +00:00
desktops
development	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-11 10:49:13 +00:00
games	Merge master into staging-next	2021-09-10 18:01:17 +00:00
misc	Merge master into staging-next	2021-09-10 18:01:17 +00:00
os-specific	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-11 10:49:13 +00:00
pkgs-lib
servers	matrix-synapse: use frozendict 1.2	2021-09-11 11:37:48 +09:00
shells
stdenv
test
tools	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-11 10:49:13 +00:00
top-level	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-11 10:49:13 +00:00