nixpkgs/pkgs
Jonathan Ringer 46fd0afcb3
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pysdl2/default.nix
	pkgs/top-level/aliases.nix
2022-02-06 18:36:59 -08:00
..
applications Merge remote-tracking branch 'origin/master' into staging-next 2022-02-06 18:36:59 -08:00
build-support Merge master into staging-next 2022-02-05 12:01:13 +00:00
common-updater
data Merge remote-tracking branch 'origin/master' into staging-next 2022-02-06 18:36:59 -08:00
desktops libsForQt5.bismuth: 2.2.0 -> 2.3.0 2022-02-06 17:05:54 -08:00
development Merge remote-tracking branch 'origin/master' into staging-next 2022-02-06 18:36:59 -08:00
games Merge pull request #158389 from legendofmiracles/wordle 2022-02-06 22:23:01 +00:00
misc Merge branch 'master' into staging-next 2022-02-06 10:29:49 +01:00
os-specific Merge remote-tracking branch 'origin/master' into staging-next 2022-02-06 18:36:59 -08:00
pkgs-lib
servers Merge remote-tracking branch 'origin/master' into staging-next 2022-02-06 18:36:59 -08:00
shells
stdenv
test tests: Add test for makeWrapper 2022-02-02 20:08:26 +01:00
tools Merge remote-tracking branch 'origin/master' into staging-next 2022-02-06 18:36:59 -08:00
top-level Merge remote-tracking branch 'origin/master' into staging-next 2022-02-06 18:36:59 -08:00