nixpkgs/pkgs
Alyssa Ross 8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00:00
..
applications Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00
build-support Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00
common-updater
data Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00
desktops Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00
development Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00
games Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00
misc Merge remote-tracking branch 'nixpkgs/master' into staging-next 2022-03-31 11:46:46 +00:00
os-specific Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00
pkgs-lib formats.javaProperties: Add comment 2022-04-01 15:19:45 +02:00
servers Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00
shells Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00
stdenv Merge pull request #134917 from NixOS/binutils-2.37 2022-03-29 10:16:36 -07:00
test Merge master into staging-next 2022-04-01 18:01:22 +00:00
tools Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00
top-level Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2022-04-02 16:45:48 +00:00