public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51263 from worldofpeace/accounts-sso/updates 

accounts-sso updates
This commit is contained in:
worldofpeace 2018-11-30 16:17:10 -05:00 committed by GitHub
parent 0f4bb32129 31740434e7
commit 57febcf7eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/gsignond/default.nix
View File

@ -6,16 +6,15 @@
let let
unwrapped = stdenv.mkDerivation rec { unwrapped = stdenv.mkDerivation rec {
pname = "gsignond"; pname = "gsignond";
version = "unstable-2018-10-04"; version = "1.2.0";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "accounts-sso"; owner = "accounts-sso";
repo = pname; repo = pname;
rev = "39022c86ddb5062a10fb0503ad9d81a8e532d527"; rev = version;
sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff"; sha256 = "17cpil3lpijgyj2z5c41vhb7fpk17038k5ggyw9p6049jrlf423m";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/development/libraries/gsignond/plugins/lastfm.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with stdenv.lib; { 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; homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ worldofpeace ];

10
pkgs/development/libraries/gsignond/plugins/mail.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }: { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gsignond-plugin-mail-${version}"; pname = "gsignond-plugin-mail";
version = "2018-10-04"; version = "0.3.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "accounts-sso"; owner = "accounts-sso";
repo = "gsignond-plugin-mail"; repo = "gsignond-plugin-mail";
rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346"; rev = version;
sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw"; sha256 = "0x8jcl0ra9kacm80f1im5wpxp9r9wxayjwnk6dkv7fhjbl2p4nh0";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with stdenv.lib; { 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; homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ worldofpeace ];

2
pkgs/development/libraries/gsignond/plugins/oauth.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with stdenv.lib; { 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; homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ worldofpeace ];

2
pkgs/development/libraries/gsignond/plugins/sasl.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
meta = with stdenv.lib; { 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; homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ worldofpeace ];

2
pkgs/development/libraries/gsignond/wrapper.nix
View File

@ -20,4 +20,6 @@ symlinkJoin {
substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \ substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \
--replace ${gsignond} $out --replace ${gsignond} $out
''; '';
inherit (gsignond) meta;
} }

10
pkgs/development/libraries/libsignon-glib/default.nix
View File

@ -2,15 +2,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libsignon-glib"; pname = "libsignon-glib";
version = "unstable-2018-10-24"; version = "2.1";
outputs = [ "out" "dev" "devdoc" "py" ]; outputs = [ "out" "dev" "devdoc" "py" ];
src = fetchgit { src = fetchgit {
url = "https://gitlab.com/accounts-sso/${pname}"; url = "https://gitlab.com/accounts-sso/${pname}";
rev = "3639a2e90447e4640a03a44972560afe8f61aa48"; rev = "refs/tags/${version}";
sha256 = "0gnx9gqsh0hcfm1lk7w60g64mkn1iicga5f5xcy1j9a9byacsfd0";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -43,9 +43,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = '' description = "A library for managing single signon credentials which can be used from GLib applications";
A library for managing single signon credentials which can be used from GLib applications
'';
homepage = https://gitlab.com/accounts-sso/libsignon-glib; homepage = https://gitlab.com/accounts-sso/libsignon-glib;
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = with maintainers; [ worldofpeace ]; maintainers = with maintainers; [ worldofpeace ];