nixpkgs/pkgs
Alyssa Ross c6c7493c3b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pyarrow/default.nix
2023-02-13 00:15:28 +00:00
..
applications Merge remote-tracking branch 'origin/master' into staging-next 2023-02-13 00:15:28 +00:00
build-support
common-updater
data Merge remote-tracking branch 'origin/master' into staging-next 2023-02-13 00:15:28 +00:00
desktops Merge master into staging-next 2023-02-11 18:01:19 +00:00
development Merge remote-tracking branch 'origin/master' into staging-next 2023-02-13 00:15:28 +00:00
games Merge master into staging-next 2023-02-11 18:01:19 +00:00
misc Merge master into staging-next 2023-02-12 12:01:29 +00:00
os-specific Merge remote-tracking branch 'origin/master' into staging-next 2023-02-13 00:15:28 +00:00
pkgs-lib
servers Merge remote-tracking branch 'origin/master' into staging-next 2023-02-13 00:15:28 +00:00
shells Merge master into staging-next 2023-02-12 16:02:45 +00:00
stdenv
test
tools Merge remote-tracking branch 'origin/master' into staging-next 2023-02-13 00:15:28 +00:00
top-level Merge remote-tracking branch 'origin/master' into staging-next 2023-02-13 00:15:28 +00:00