Alyssa Ross c9a581b05f Merge remote-tracking branch 'nixpkgs/master' into staging-next ... CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master. Added pkgs/tools/misc/jsonwatch/default.nix in HEAD		2021-12-09 01:43:58 +00:00
..
applications	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-09 01:43:58 +00:00
build-support
common-updater
data	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-09 01:43:58 +00:00
desktops	Merge pull request #149724 from berbiche/feat/nemo-add-trash-support	2021-12-08 23:08:59 +01:00
development	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-09 01:43:58 +00:00
games	Merge pull request #149505 from thiagokokada/bump-sm64ex	2021-12-08 18:22:27 -05:00
misc
os-specific	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-09 01:43:58 +00:00
pkgs-lib
servers	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-09 01:43:58 +00:00
shells
stdenv
test
tools	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-09 01:43:58 +00:00
top-level	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-09 01:43:58 +00:00