Vladimír Čunát ba2140b657 Merge #122044: compiler-rt: Fix build by passing resource dir ... Fast-forwarded from staging to staging-next. See: https://github.com/NixOS/nixpkgs/pull/111487#issuecomment-840088733		2021-05-12 22:55:14 +02:00
..
applications	Merge master into staging-next	2021-05-12 18:32:26 +00:00
build-support	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-08 14:43:43 +02:00
common-updater
data	Merge pull request #122592 from collares/sage-9.3	2021-05-12 01:31:22 -03:00
desktops	Merge master into staging-next	2021-05-12 12:27:04 +00:00
development	Merge #122044: compiler-rt: Fix build by passing resource dir	2021-05-12 22:55:14 +02:00
games	Merge pull request #122699 from legendofmiracles/steam-tui	2021-05-12 17:29:00 +02:00
misc	Merge master into staging-next	2021-05-12 18:32:26 +00:00
os-specific	Merge master into staging-next	2021-05-12 12:27:04 +00:00
pkgs-lib
servers	Merge master into staging-next	2021-05-12 18:32:26 +00:00
shells	Merge master into staging-next	2021-05-12 12:27:04 +00:00
stdenv	Merge remote-tracking branch 'upstream/staging-next' into staging	2021-05-06 15:48:25 -04:00
test	Merge branch 'master' into haskell-updates	2021-05-07 15:03:54 +02:00
tools	Merge master into staging-next	2021-05-12 18:32:26 +00:00
top-level	Merge master into staging-next	2021-05-12 18:32:26 +00:00