Alyssa Ross 4e1852096f Merge remote-tracking branch 'nixpkgs/staging-next' into staging ... Conflicts: pkgs/development/tools/parsing/flex/2.6.1.nix		2021-11-14 14:17:46 +00:00
..
applications	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-11-14 14:17:46 +00:00
build-support	Merge pull request #144839 from l0b0/fix-redirect	2021-11-13 21:56:43 -05:00
common-updater
data	flat-remix-gnome: 20211028 -> 20211113	2021-11-13 18:50:47 +08:00
desktops	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-11-14 14:17:46 +00:00
development	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-11-14 14:17:46 +00:00
games	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-11-14 14:17:46 +00:00
misc	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-11-14 14:17:46 +00:00
os-specific	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-11-14 14:17:46 +00:00
pkgs-lib
servers	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-11-14 14:17:46 +00:00
shells	Merge pull request #145888 from sei40kr/zdharma-continuum-zinit	2021-11-14 11:54:41 +00:00
stdenv
test
tools	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-11-14 14:17:46 +00:00
top-level	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2021-11-14 14:17:46 +00:00