Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0f4bb32129c6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 57febcf7eb83
Choose a head ref
  • 10 commits
  • 7 files changed
  • 1 contributor

Commits on Nov 30, 2018

  1. libsignon-glib: unstable-2018-10-24 -> 2.1

    @worldofpeace
    worldofpeace committed Nov 30, 2018
    Copy the full SHA
    8d3a7ff View commit details

  2. gsignond: unstable-2018-10-04 -> 1.2.0

    @worldofpeace
    worldofpeace committed Nov 30, 2018
    Copy the full SHA
    f966aea View commit details

  3. gsignondPlugins.mail: 2018-10-04 -> 0.3.0

    @worldofpeace
    worldofpeace committed Nov 30, 2018
    Copy the full SHA
    8da5d27 View commit details

  4. gsignond: add meta to wrapper

    @worldofpeace
    worldofpeace committed Nov 30, 2018
    Copy the full SHA
    4428c7c View commit details

  5. gsignondPlugins.lastfm: correct description

    @worldofpeace
    worldofpeace committed Nov 30, 2018
    Copy the full SHA
    66a8c69 View commit details

  6. gsignondPlugins.mail: correct description

    @worldofpeace
    worldofpeace committed Nov 30, 2018
    Copy the full SHA
    f5d2cb0 View commit details

  7. gsignondPlugins.oauth: correct description

    @worldofpeace
    worldofpeace committed Nov 30, 2018
    Copy the full SHA
    214ac4b View commit details

  8. gsignondPlugins.sasl: correct description

    @worldofpeace
    worldofpeace committed Nov 30, 2018
    Copy the full SHA
    40e234d View commit details

  9. libsignon-glib: use double quotes for description

    @worldofpeace
    worldofpeace committed Nov 30, 2018
    Copy the full SHA
    3174043 View commit details

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

    accounts-sso updates
    @worldofpeace
    worldofpeace authored Nov 30, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    57febcf View commit details
7 changes: 3 additions & 4 deletions pkgs/development/libraries/gsignond/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [
2 changes: 1 addition & 1 deletion pkgs/development/libraries/gsignond/plugins/lastfm.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
10 changes: 5 additions & 5 deletions pkgs/development/libraries/gsignond/plugins/mail.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [
@@ -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 ];
2 changes: 1 addition & 1 deletion pkgs/development/libraries/gsignond/plugins/oauth.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
2 changes: 1 addition & 1 deletion pkgs/development/libraries/gsignond/plugins/sasl.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
2 changes: 2 additions & 0 deletions pkgs/development/libraries/gsignond/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
}
10 changes: 4 additions & 6 deletions pkgs/development/libraries/libsignon-glib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [
@@ -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 ];