nixpkgs/pkgs
Jonathan Ringer 4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next
Conflicts:
	nixos/tests/custom-ca.nix
2021-11-22 21:33:23 -08:00
..
applications Merge remote-tracking branch 'origin/staging' into staging-next 2021-11-22 21:33:23 -08:00
build-support Merge remote-tracking branch 'origin/staging' into staging-next 2021-11-22 21:33:23 -08:00
common-updater
data Merge remote-tracking branch 'origin/staging' into staging-next 2021-11-22 21:33:23 -08:00
desktops Merge remote-tracking branch 'origin/staging' into staging-next 2021-11-22 21:33:23 -08:00
development Merge remote-tracking branch 'origin/staging' into staging-next 2021-11-22 21:33:23 -08:00
games Merge remote-tracking branch 'origin/staging' into staging-next 2021-11-22 21:33:23 -08:00
misc Merge master into staging-next 2021-11-22 18:01:08 +00:00
os-specific Merge remote-tracking branch 'origin/staging' into staging-next 2021-11-22 21:33:23 -08:00
pkgs-lib
servers Merge remote-tracking branch 'origin/staging' into staging-next 2021-11-22 21:33:23 -08:00
shells Merge staging-next into staging 2021-11-21 00:02:25 +00:00
stdenv
test
tools Merge remote-tracking branch 'origin/staging' into staging-next 2021-11-22 21:33:23 -08:00
top-level Merge remote-tracking branch 'origin/staging' into staging-next 2021-11-22 21:33:23 -08:00