Alyssa Ross 16fb150e03 Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: pkgs/development/libraries/libunwind/default.nix		2021-12-07 23:56:16 +00:00
..
applications	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-07 23:56:16 +00:00
build-support	Merge remote-tracking branch 'origin/master' into staging-next	2021-12-07 00:11:07 -08:00
common-updater
data	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-07 23:56:16 +00:00
desktops	evolution-data-server: 3.42.1 -> 3.42.2	2021-12-06 22:07:46 +01:00
development	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-07 23:56:16 +00:00
games	Merge pull request #145044 from lucc/endless-sky	2021-12-07 12:38:11 +01:00
misc	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-07 23:56:16 +00:00
os-specific	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-07 23:56:16 +00:00
pkgs-lib
servers	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-07 23:56:16 +00:00
shells	oh-my-zsh: 2021-11-11 -> 2021-12-02	2021-12-06 09:52:58 -05:00
stdenv
test	tests.dhall.generateDhallDirectoryPackage: init	2021-12-07 13:36:20 +09:00
tools	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-07 23:56:16 +00:00
top-level	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-12-07 23:56:16 +00:00