about summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2022-02-03 21:29:24 -0800
committerJonathan Ringer <jonringer117@gmail.com>2022-02-03 21:29:24 -0800
commit9a16965c751b90e2674ba8bb8ec25582cf631f29 (patch)
treecca818753e0db7af49db0e3e33dbfd4d86f9dbf7 /maintainers
parent3b8270ac54b9e1892e5ed465ac01a61cd575863f (diff)
parent2d666e4bf69a81a731f87a06aa54e3dd1dde217d (diff)
downloadnixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar
nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.gz
nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.bz2
nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.lz
nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.xz
nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.zst
nixlib-9a16965c751b90e2674ba8bb8ec25582cf631f29.zip
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/awesomeversion/default.nix
	pkgs/development/python-modules/md2gemini/default.nix
	pkgs/development/python-modules/mill-local/default.nix
	pkgs/development/python-modules/pyatv/default.nix
	pkgs/development/python-modules/pyezviz/default.nix
	pkgs/development/python-modules/pyinsteon/default.nix
	pkgs/development/python-modules/pylitterbot/default.nix
	pkgs/development/python-modules/pynuki/default.nix
	pkgs/development/python-modules/pypck/default.nix
	pkgs/development/python-modules/types-requests/default.nix
	pkgs/top-level/aliases.nix
Diffstat (limited to 'maintainers')
0 files changed, 0 insertions, 0 deletions