nixpkgs/pkgs
Dmitry Kalinkin 2ddda43924
Merge branch 'staging' into staging-next
Conflicts:
	pkgs/os-specific/linux/kernel/common-config.nix
2021-12-25 17:16:26 -05:00
..
applications Merge branch 'staging' into staging-next 2021-12-25 17:16:26 -05:00
build-support Merge branch 'staging' into staging-next 2021-12-25 17:16:26 -05:00
common-updater
data Merge branch 'staging' into staging-next 2021-12-25 17:16:26 -05:00
desktops Merge branch 'staging' into staging-next 2021-12-25 17:16:26 -05:00
development Merge branch 'staging' into staging-next 2021-12-25 17:16:26 -05:00
games Merge master into staging-next 2021-12-25 06:01:04 +00:00
misc Merge master into staging-next 2021-12-24 00:01:44 +00:00
os-specific Merge branch 'staging' into staging-next 2021-12-25 17:16:26 -05:00
pkgs-lib
servers Merge branch 'staging' into staging-next 2021-12-25 17:16:26 -05:00
shells Merge pull request #152085 from r-ryantm/auto-update/powershell 2021-12-25 15:01:13 +01:00
stdenv Merge master into staging-next 2021-12-25 00:01:28 +00:00
test
tools Merge branch 'staging' into staging-next 2021-12-25 17:16:26 -05:00
top-level Merge branch 'staging' into staging-next 2021-12-25 17:16:26 -05:00