diff options
author | Alexander Ried <ried@mytum.de> | 2016-10-05 14:49:22 +0200 |
---|---|---|
committer | Alexander Ried <ried@mytum.de> | 2016-10-05 16:34:22 +0200 |
commit | ff81b74833768d3b5b77f688237d1fdea876e64e (patch) | |
tree | 790e6d0a3cfcf8eea3be4a2e7e7fe62d9d84875f /pkgs/development/libraries/accountsservice | |
parent | 2f0d0cd05a91955a5aa554102f2a176b4d6ccf3c (diff) |
accountsservice: 0.6.42 -> 0.6.43
the patch for nixbld is not needed anymore since accountsservice now excludes all users with shell set to nologin. Previously this was only done for users in range 500 - minimum_uid (1000).
Diffstat (limited to 'pkgs/development/libraries/accountsservice')
-rw-r--r-- | pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch | 27 | ||||
-rw-r--r-- | pkgs/development/libraries/accountsservice/default.nix | 5 |
2 files changed, 2 insertions, 30 deletions
diff --git a/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch b/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch deleted file mode 100644 index f5d9e5695026a..0000000000000 --- a/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e069102365a9ff03822667f435e662f938e8d768 Mon Sep 17 00:00:00 2001 -From: Alexander Ried <ried@mytum.de> -Date: Wed, 1 Jun 2016 12:49:48 +0200 -Subject: [PATCH] Add nixbld* to user blacklist - ---- - src/user-classify.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/user-classify.c b/src/user-classify.c -index 69e6809..0e152b6 100644 ---- a/src/user-classify.c -+++ b/src/user-classify.c -@@ -75,6 +75,10 @@ user_classify_is_blacklisted (const char *username) - return TRUE; - } - -+ if (g_str_has_prefix (username, "nixbld")) { -+ return TRUE; -+ } -+ - return FALSE; - } - --- -2.7.4 - diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 2dc6b57c339fb..1a49913727d84 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.42"; + version = "0.6.43"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "0zh0kjpdc631qh36plcgpwvnmh9wj8l5cki3aw5r09w6y7198r75"; + sha256 = "1k6n9079001sgcwlkq0bz6mkn4m8y4dwf6hs1qm85swcld5ajfzd"; }; buildInputs = [ pkgconfig glib intltool libtool makeWrapper @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { patches = [ ./no-create-dirs.patch - ./Add-nixbld-to-user-blacklist.patch ./Disable-methods-that-change-files-in-etc.patch ]; |