nixpkgs/pkgs
Alyssa Ross d7e181ff83
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/compilers/ocaml/4.12.nix
	pkgs/development/python-modules/oci/default.nix
	pkgs/tools/admin/bubblewrap/default.nix
2022-03-14 12:33:16 +00:00
..
applications Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-14 12:33:16 +00:00
build-support Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-14 12:33:16 +00:00
common-updater
data Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-14 12:33:16 +00:00
desktops Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-14 12:33:16 +00:00
development Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-14 12:33:16 +00:00
games Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-14 12:33:16 +00:00
misc
os-specific Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-14 12:33:16 +00:00
pkgs-lib
servers Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-14 12:33:16 +00:00
shells Merge master into staging-next 2022-03-14 00:02:12 +00:00
stdenv
test
tools Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-14 12:33:16 +00:00
top-level Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-14 12:33:16 +00:00