nixpkgs/pkgs
Jonathan Ringer 11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
..
applications Merge remote-tracking branch 'origin/master' into staging-next 2021-05-22 18:19:10 -07:00
build-support Merge remote-tracking branch 'origin/master' into staging-next 2021-05-22 18:19:10 -07:00
common-updater
data Merge pull request #123801 from romildo/upd.matcha-gtk-theme 2021-05-22 17:29:38 +02:00
desktops Merge remote-tracking branch 'origin/master' into staging-next 2021-05-22 18:19:10 -07:00
development Merge remote-tracking branch 'origin/master' into staging-next 2021-05-22 18:19:10 -07:00
games Merge remote-tracking branch 'origin/master' into staging-next 2021-05-22 18:19:10 -07:00
misc Merge remote-tracking branch 'origin/master' into staging-next 2021-05-22 18:19:10 -07:00
os-specific Merge remote-tracking branch 'origin/master' into staging-next 2021-05-22 18:19:10 -07:00
pkgs-lib
servers Merge remote-tracking branch 'origin/master' into staging-next 2021-05-22 18:19:10 -07:00
shells maintainers: rename metadark -> kira-bruneau (#124035) 2021-05-22 16:47:40 +02:00
stdenv stdenv/darwin: add bootstrap tools for aarch64-darwin 2021-05-18 21:34:57 +02:00
test Merge remote-tracking branch 'origin/master' into staging-next 2021-05-17 07:01:38 -07:00
tools Merge remote-tracking branch 'origin/master' into staging-next 2021-05-22 18:19:10 -07:00
top-level Merge remote-tracking branch 'origin/master' into staging-next 2021-05-22 18:19:10 -07:00