nixpkgs/pkgs
Dmitry Kalinkin 07a8ae0c5a
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/development/libraries/log4cplus/default.nix
2021-12-11 14:01:19 -05:00
..
applications Merge branch 'master' into staging-next 2021-12-11 13:59:09 -05:00
build-support Merge branch 'master' into staging-next 2021-12-11 13:15:49 -05:00
common-updater
data Merge master into staging-next 2021-12-11 06:01:15 +00:00
desktops Merge branch 'staging-next' into staging 2021-12-11 14:01:19 -05:00
development Merge branch 'staging-next' into staging 2021-12-11 14:01:19 -05:00
games Merge pull request #150265 from legendofmiracles/gzdoom 2021-12-11 17:45:54 +01:00
misc Merge branch 'master' into staging-next 2021-12-11 13:15:49 -05:00
os-specific Merge branch 'staging-next' into staging 2021-12-11 14:01:19 -05:00
pkgs-lib
servers Merge branch 'staging-next' into staging 2021-12-11 14:01:19 -05:00
shells Merge pull request #149807 from r-ryantm/auto-update/oil 2021-12-09 10:08:02 +00:00
stdenv Merge master into staging-next 2021-12-11 00:01:48 +00:00
test Merge pull request #124556 from bergkvist/bergkvist/make-c-wrapper 2021-12-10 00:45:30 +01:00
tools Merge branch 'staging-next' into staging 2021-12-11 14:01:19 -05:00
top-level Merge branch 'master' into staging-next 2021-12-11 13:59:09 -05:00