Merge branch 'master' into staging-next

Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
parent e7cccdbb13 ed54a5b51d
commit cdf426488b
247 changed files with 3153 additions and 2159 deletions
@@ -60,7 +60,7 @@ mkDerivation rec {
    license = licenses.gpl2Plus;
    platforms = platforms.all;
    longDescription = ''
-      Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users
+      Pinentry provides a console and (optional) GTK and Qt GUIs allowing users
      to enter a passphrase when `gpg' or `gpg2' is run and needs it.
    '';
    maintainers = [ maintainers.ttuegel ];