nixpkgs/pkgs
Jonathan Ringer 6ede9cd761
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/audio/hybridreverb2/default.nix
2021-11-19 08:44:33 -08:00
..
applications Merge remote-tracking branch 'origin/master' into staging-next 2021-11-19 08:44:33 -08:00
build-support Merge master into staging-next 2021-11-19 06:01:08 +00:00
common-updater
data Merge master into staging-next 2021-11-19 00:01:26 +00:00
desktops Merge remote-tracking branch 'origin/master' into staging-next 2021-11-19 08:44:33 -08:00
development Merge remote-tracking branch 'origin/master' into staging-next 2021-11-19 08:44:33 -08:00
games Merge remote-tracking branch 'origin/master' into staging-next 2021-11-19 08:44:33 -08:00
misc Merge remote-tracking branch 'origin/master' into staging-next 2021-11-19 08:44:33 -08:00
os-specific Merge remote-tracking branch 'origin/master' into staging-next 2021-11-19 08:44:33 -08:00
pkgs-lib
servers Merge remote-tracking branch 'origin/master' into staging-next 2021-11-19 08:44:33 -08:00
shells Merge pull request #146272 from KyleOndy/zsh-vi-mode 2021-11-19 13:16:11 -03:00
stdenv
test
tools Merge remote-tracking branch 'origin/master' into staging-next 2021-11-19 08:44:33 -08:00
top-level Merge remote-tracking branch 'origin/master' into staging-next 2021-11-19 08:44:33 -08:00