Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-12-03 12:18:43 +01:00
388 changed files with 3023 additions and 1285 deletions
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with stdenv.lib; {
description = "Plugin for the Accounts-SSO gSignOn daemon handles the Last.FM credentials.";
description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials";
homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ worldofpeace ];
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobject-introspection }:
stdenv.mkDerivation rec {
name = "gsignond-plugin-mail-${version}";
version = "2018-10-04";
pname = "gsignond-plugin-mail";
version = "0.3.0";
src = fetchFromGitLab {
owner = "accounts-sso";
repo = "gsignond-plugin-mail";
rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346";
sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw";
rev = version;
sha256 = "0x8jcl0ra9kacm80f1im5wpxp9r9wxayjwnk6dkv7fhjbl2p4nh0";
};
nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with stdenv.lib; {
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the E-Mail credentials.";
description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials";
homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ worldofpeace ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with stdenv.lib; {
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols.";
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols";
homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ worldofpeace ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with stdenv.lib; {
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol.";
description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol";
homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ worldofpeace ];