From 8d3a7ff48d8a0d7707b5ce6b0e03376b0c0479bc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 29 Nov 2018 21:14:05 -0500 Subject: [PATCH 1/9] libsignon-glib: unstable-2018-10-24 -> 2.1 --- pkgs/development/libraries/libsignon-glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index db2b468bb3a..2e5162dda00 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "libsignon-glib"; - version = "unstable-2018-10-24"; + version = "2.1"; outputs = [ "out" "dev" "devdoc" "py" ]; src = fetchgit { url = "https://gitlab.com/accounts-sso/${pname}"; - rev = "3639a2e90447e4640a03a44972560afe8f61aa48"; + rev = "refs/tags/${version}"; + sha256 = "0gnx9gqsh0hcfm1lk7w60g64mkn1iicga5f5xcy1j9a9byacsfd0"; fetchSubmodules = true; - sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w"; }; nativeBuildInputs = [ From f966aea21f472aca812caa8e96b2175859ad4e51 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 29 Nov 2018 21:16:32 -0500 Subject: [PATCH 2/9] gsignond: unstable-2018-10-04 -> 1.2.0 --- pkgs/development/libraries/gsignond/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index af7aa2b1207..b7b498f9aa1 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -6,16 +6,15 @@ let unwrapped = stdenv.mkDerivation rec { pname = "gsignond"; - version = "unstable-2018-10-04"; - + version = "1.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitLab { owner = "accounts-sso"; repo = pname; - rev = "39022c86ddb5062a10fb0503ad9d81a8e532d527"; - sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff"; + rev = version; + sha256 = "17cpil3lpijgyj2z5c41vhb7fpk17038k5ggyw9p6049jrlf423m"; }; nativeBuildInputs = [ From 8da5d27db893ee42b84dd2ce801c12bc33086a54 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 29 Nov 2018 21:24:55 -0500 Subject: [PATCH 3/9] gsignondPlugins.mail: 2018-10-04 -> 0.3.0 --- pkgs/development/libraries/gsignond/plugins/mail.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index 763e76c9cc9..f0cc27105a1 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }: 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 = [ From 4428c7c4597f5bd2a3f88131cb1ed13158e80bff Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 29 Nov 2018 22:04:46 -0500 Subject: [PATCH 4/9] gsignond: add meta to wrapper --- pkgs/development/libraries/gsignond/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix index a5df6bbeafb..04463aac379 100644 --- a/pkgs/development/libraries/gsignond/wrapper.nix +++ b/pkgs/development/libraries/gsignond/wrapper.nix @@ -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 \ --replace ${gsignond} $out ''; + + inherit (gsignond) meta; } From 66a8c691344e5aabda2f9d0693e8cf748d49e5fc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 29 Nov 2018 22:05:09 -0500 Subject: [PATCH 5/9] gsignondPlugins.lastfm: correct description --- pkgs/development/libraries/gsignond/plugins/lastfm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index a23c1487881..929309095c7 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -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 ]; From f5d2cb01701f63ba3777b6be402d33b9fcaa23ec Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 29 Nov 2018 22:05:25 -0500 Subject: [PATCH 6/9] gsignondPlugins.mail: correct description --- pkgs/development/libraries/gsignond/plugins/mail.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index f0cc27105a1..165c90b303a 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -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 ]; From 214ac4bf728d0366a13f889a88578d9261683765 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 29 Nov 2018 22:05:41 -0500 Subject: [PATCH 7/9] gsignondPlugins.oauth: correct description --- pkgs/development/libraries/gsignond/plugins/oauth.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index ee45430122c..af623bf0d9b 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -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 ]; From 40e234d2ae01b9bd2f6eabe5b49ad3b4ea000faf Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 29 Nov 2018 22:05:56 -0500 Subject: [PATCH 8/9] gsignondPlugins.sasl: correct description --- pkgs/development/libraries/gsignond/plugins/sasl.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index 25f20557906..6d3fd6c0380 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -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 ]; From 31740434e7d8ab3831459bdce99b27cf01765635 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 29 Nov 2018 22:06:58 -0500 Subject: [PATCH 9/9] libsignon-glib: use double quotes for description --- pkgs/development/libraries/libsignon-glib/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index 2e5162dda00..32e58dcac4b 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -43,9 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = '' - A library for managing single signon credentials which can be used from GLib applications - ''; + description = "A library for managing single signon credentials which can be used from GLib applications"; homepage = https://gitlab.com/accounts-sso/libsignon-glib; license = licenses.lgpl21; maintainers = with maintainers; [ worldofpeace ];