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
..
adapta-backgrounds
brise
cacert
cldr-emoji-annotation
combinatorial_designs
common-licenses
conway_polynomials
ddccontrol-db
dns-root-data
elliptic_curves
fedora-backgrounds
freepats
geolite-legacy
graphs
hackage
iana-etc
libkkc-data
mailcap
media-player-info
miscfiles
mobile-broadband-provider-info
nixos-artwork
osinfo-db
pari-galdata
pari-seadata-small
polytopes_db
poppler-data
publicsuffix-list
rime-data
scowl
shared-desktop-ontologies
shared-mime-info
sound-theme-freedesktop
spdx-license-list-data
tzdata
unicode-character-database
unicode-emoji
unihan-database
v2ray-domain-list-community
v2ray-geoip
wireless-regdb
xorg-rgb