nixpkgs/pkgs
Alyssa Ross f404068903
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/servers/search/groonga/default.nix
2021-12-02 14:52:44 +00:00
..
applications Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-12-02 14:52:44 +00:00
build-support Merge staging-next into staging 2021-11-30 06:01:59 +00:00
common-updater
data Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-12-02 14:52:44 +00:00
desktops Merge master into staging-next 2021-12-01 12:01:26 +00:00
development Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-12-02 14:52:44 +00:00
games Merge master into staging-next 2021-12-01 18:01:12 +00:00
misc Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-12-02 14:52:44 +00:00
os-specific Merge staging-next into staging 2021-12-01 00:02:28 +00:00
pkgs-lib
servers Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-12-02 14:52:44 +00:00
shells Merge master into staging-next 2021-11-30 00:01:51 +00:00
stdenv Merge staging-next into staging 2021-11-30 00:02:29 +00:00
test
tools Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-12-02 14:52:44 +00:00
top-level Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-12-02 14:52:44 +00:00