nixpkgs/pkgs
Alyssa Ross 22c23dbb8d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/google-auth-oauthlib/default.nix
2022-03-31 11:42:24 +00:00
..
applications Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-31 11:42:24 +00:00
build-support Merge branch 'staging-next' into staging 2022-03-28 17:56:38 +02:00
common-updater
data Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-31 11:42:24 +00:00
desktops Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-31 11:42:24 +00:00
development Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-31 11:42:24 +00:00
games Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-31 11:42:24 +00:00
misc Merge branch 'master' into staging-next 2022-03-28 17:55:31 +02:00
os-specific Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-31 11:42:24 +00:00
pkgs-lib
servers Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-31 11:42:24 +00:00
shells Merge branch 'staging-next' into staging 2022-03-28 17:56:38 +02:00
stdenv Merge pull request #134917 from NixOS/binutils-2.37 2022-03-29 10:16:36 -07:00
test
tools Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-31 11:42:24 +00:00
top-level Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-03-31 11:42:24 +00:00