# This list is used to avoid multiple name/email instances of the same # contributors reported by "git log" and "git shortlog" commands. Adriano Peluso Al McElrath Alex Sassmannshausen Alexander I. Grafov Alírio Eyng Amin Bandali Amirouche Boubekki Andreas Enge Andreas Enge Andy Wingo Ben Woodcroft Ben Woodcroft Ben Woodcroft Brett Gilio Christine Lemmer-Webber Claes Wallin (韋嘉誠) Cyprien Nicolas Daniel Pimentel Danny Milosavljevic David Hashe David Thompson David Thompson David Thompson Deck Pickard Eric Bavier Eric Bavier Eric Dvorsak Evgeny Pisemsky George Clemmer ison Ivan Vilata i Balaguer Jakob L. Kreuze Jeff Mickey John Darrington John J. Foerch Joshua Grant Joshua Grant Joshua Grant Joshua Grant Juliana Sims Kei Kebreau Leo Famulari Liliana Marie Prikler Liliana Marie Prikler Leo Prikler Ludovic Courtès Marek Benc Marius Bakke Marius Bakke Marius Bakke Marius Bakke Mathieu Lirzin Mathieu Lirzin Mathieu Othacehe Mathieu Othacehe Mathieu Othacehe Matthew James Kraai Nikita Karetnikov nikita nikita ng0 nikita Nils Gillmann nikita Nils Gillmann nikita ng0 nikita nikita nikita nikita nikita nikita nikita nikita nikita nikita Pierre Neidhardt Pierre-Antoine Rouby Pjotr Prins Pjotr Prins Pjotr Prins Raimon Grau Raoul Jean Pierre Bonnal Raymond Nicholson Rene Saavedra Ricardo Wurmus Ricardo Wurmus Sou Bunnbu (宋文武) Sou Bunnbu (宋文武) Stefan Reichör Taylan Ulrich Bayırlı/Kammer Theodoros Foradis Thomas Danckaert Tobias Geerinckx-Rice Tomas Volf <~@wolfsden.cz> Tomáš Čech Vincent Legoll Zheng Junjie <873216071@qq.com> Z572 <873216071@qq.com> 7b6155'>Merge branch 'master' into core-updates...Note: this merge actually changes the 'curl' and 'python-attrs' derivations, as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and 12964df69a99de6190422c752fef65ef813f3b6b respectively. 4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it cannot currently be tested. Conflicts: gnu/local.mk gnu/packages/aidc.scm gnu/packages/boost.scm gnu/packages/curl.scm gnu/packages/nettle.scm gnu/packages/networking.scm gnu/packages/python-xyz.scm gnu/packages/tls.scm Marius Bakke 2021-06-14gnu: Rename qtbase to qtbase-5....This change was automated via the following command: $ git ls-files | xargs sed -i 's/,qtbase)/,qtbase-5)/g' $ git ls-files | xargs sed -i 's/inherit qtbase)/inherit qtbase-5)/g' $ git ls-files | xargs sed -i 's/package-version qtbase)/package-version qtbase-5)/g' $ git checkout etc # to clear some spurious changes This is done so the qtbase package can be upgraded to version 6 in the following commit. Maxim Cournoyer 2021-06-13gnu: connman: Fix CVE-2021-33833....* gnu/packages/patches/connman-CVE-2021-33833.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/connman.scm (connman)[source]: Use it. Leo Famulari