commit 15bb6bb9d694393ad3395f693bdd9cd15c8413e7 · pyrox.dev/nixpkgs

nixos/modules/services/desktops/accountsservice.nix

···

       35
       35
        
           services.dbus.packages = [ pkgs.accountsservice ];

     

       36
       36
        
       

     

       37
       37
        
           systemd.packages = [ pkgs.accountsservice ];

     

       38
       38
       +
       

     

       39
       39
       +
           systemd.services.accounts-daemon= {

     

       40
       40
       +
       

     

       41
       41
       +
             wantedBy = [ "graphical.target" ];

     

       42
       42
       +
       

     

       43
       43
       +
           } // (mkIf (!config.users.mutableUsers) {

     

       44
       44
       +
             environment.NIXOS_USERS_PURE = "true";

     

       45
       45
       +
           });

     

       38
       46
        
         };

     

       39
       47
        
       

     

       40
       48
        
       }

+27

pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch

···

       1
       1
       +
       From e069102365a9ff03822667f435e662f938e8d768 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Alexander Ried <ried@mytum.de>

     

       3
       3
       +
       Date: Wed, 1 Jun 2016 12:49:48 +0200

     

       4
       4
       +
       Subject: [PATCH] Add nixbld* to user blacklist

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        src/user-classify.c | 4 ++++

     

       8
       8
       +
        1 file changed, 4 insertions(+)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/src/user-classify.c b/src/user-classify.c

     

       11
       11
       +
       index 69e6809..0e152b6 100644

     

       12
       12
       +
       --- a/src/user-classify.c

     

       13
       13
       +
       +++ b/src/user-classify.c

     

       14
       14
       +
       @@ -75,6 +75,10 @@ user_classify_is_blacklisted (const char *username)

     

       15
       15
       +
                        return TRUE;

     

       16
       16
       +
                }

     

       17
       17
       +
        

     

       18
       18
       +
       +        if (g_str_has_prefix (username, "nixbld")) {

     

       19
       19
       +
       +                return TRUE;

     

       20
       20
       +
       +        }

     

       21
       21
       +
       +

     

       22
       22
       +
                return FALSE;

     

       23
       23
       +
        }

     

       24
       24
       +
        

     

       25
       25
       +
       -- 

     

       26
       26
       +
       2.7.4

     

       27
       27
       +

+130

pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch

···

       1
       1
       +
       From 6f172007452b39bfda5062fc29ea5382671ac16e Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Alexander Ried <ried@mytum.de>

     

       3
       3
       +
       Date: Thu, 26 May 2016 19:54:21 +0200

     

       4
       4
       +
       Subject: [PATCH] Disable methods that change files in /etc

     

       5
       5
       +
       

     

       6
       6
       +
       Only if environment variable NIXOS_USERS_PURE is set.

     

       7
       7
       +
       ---

     

       8
       8
       +
        src/daemon.c | 10 ++++++++++

     

       9
       9
       +
        src/user.c   | 35 +++++++++++++++++++++++++++++++++++

     

       10
       10
       +
        2 files changed, 45 insertions(+)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/src/daemon.c b/src/daemon.c

     

       13
       13
       +
       index e62e124..87459b2 100644

     

       14
       14
       +
       --- a/src/daemon.c

     

       15
       15
       +
       +++ b/src/daemon.c

     

       16
       16
       +
       @@ -931,6 +931,11 @@ daemon_create_user (AccountsAccounts      *accounts,

     

       17
       17
       +
                            const gchar           *real_name,

     

       18
       18
       +
                            gint                   account_type)

     

       19
       19
       +
        {

     

       20
       20
       +
       +        if (getenv("NIXOS_USERS_PURE")) {

     

       21
       21
       +
       +                throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers");

     

       22
       22
       +
       +                return;

     

       23
       23
       +
       +        }

     

       24
       24
       +
       +

     

       25
       25
       +
                Daemon *daemon = (Daemon*)accounts;

     

       26
       26
       +
                CreateUserData *data;

     

       27
       27
       +
        

     

       28
       28
       +
       @@ -1138,6 +1143,11 @@ daemon_delete_user (AccountsAccounts      *accounts,

     

       29
       29
       +
                            gint64                 uid,

     

       30
       30
       +
                            gboolean               remove_files)

     

       31
       31
       +
        {

     

       32
       32
       +
       +        if (getenv("NIXOS_USERS_PURE")) {

     

       33
       33
       +
       +                throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers");

     

       34
       34
       +
       +                return;

     

       35
       35
       +
       +        }

     

       36
       36
       +
       +

     

       37
       37
       +
                Daemon *daemon = (Daemon*)accounts;

     

       38
       38
       +
                DeleteUserData *data;

     

       39
       39
       +
        

     

       40
       40
       +
       diff --git a/src/user.c b/src/user.c

     

       41
       41
       +
       index 0fb1a17..dbdebaf 100644

     

       42
       42
       +
       --- a/src/user.c

     

       43
       43
       +
       +++ b/src/user.c

     

       44
       44
       +
       @@ -904,6 +904,11 @@ user_set_real_name (AccountsUser          *auser,

     

       45
       45
       +
                            GDBusMethodInvocation *context,

     

       46
       46
       +
                            const gchar           *real_name)

     

       47
       47
       +
        {

     

       48
       48
       +
       +        if (getenv("NIXOS_USERS_PURE")) {

     

       49
       49
       +
       +                throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers");

     

       50
       50
       +
       +                return;

     

       51
       51
       +
       +        }

     

       52
       52
       +
       +

     

       53
       53
       +
                User *user = (User*)auser;

     

       54
       54
       +
                int uid;

     

       55
       55
       +
                const gchar *action_id;

     

       56
       56
       +
       @@ -981,6 +986,11 @@ user_set_user_name (AccountsUser          *auser,

     

       57
       57
       +
                            GDBusMethodInvocation *context,

     

       58
       58
       +
                            const gchar           *user_name)

     

       59
       59
       +
        {

     

       60
       60
       +
       +        if (getenv("NIXOS_USERS_PURE")) {

     

       61
       61
       +
       +                throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers");

     

       62
       62
       +
       +                return;

     

       63
       63
       +
       +        }

     

       64
       64
       +
       +

     

       65
       65
       +
                User *user = (User*)auser;

     

       66
       66
       +
                daemon_local_check_auth (user->daemon,

     

       67
       67
       +
                                         user,

     

       68
       68
       +
       @@ -1263,6 +1273,11 @@ user_set_home_directory (AccountsUser          *auser,

     

       69
       69
       +
                                 GDBusMethodInvocation *context,

     

       70
       70
       +
                                 const gchar           *home_dir)

     

       71
       71
       +
        {

     

       72
       72
       +
       +        if (getenv("NIXOS_USERS_PURE")) {

     

       73
       73
       +
       +                throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers");

     

       74
       74
       +
       +                return;

     

       75
       75
       +
       +        }

     

       76
       76
       +
       +

     

       77
       77
       +
                User *user = (User*)auser;

     

       78
       78
       +
                daemon_local_check_auth (user->daemon,

     

       79
       79
       +
                                         user,

     

       80
       80
       +
       @@ -1322,6 +1337,11 @@ user_set_shell (AccountsUser          *auser,

     

       81
       81
       +
                        GDBusMethodInvocation *context,

     

       82
       82
       +
                        const gchar           *shell)

     

       83
       83
       +
        {

     

       84
       84
       +
       +        if (getenv("NIXOS_USERS_PURE")) {

     

       85
       85
       +
       +                throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers");

     

       86
       86
       +
       +                return;

     

       87
       87
       +
       +        }

     

       88
       88
       +
       +

     

       89
       89
       +
                User *user = (User*)auser;

     

       90
       90
       +
                daemon_local_check_auth (user->daemon,

     

       91
       91
       +
                                         user,

     

       92
       92
       +
       @@ -1602,6 +1622,11 @@ user_set_locked (AccountsUser          *auser,

     

       93
       93
       +
                         GDBusMethodInvocation *context,

     

       94
       94
       +
                         gboolean               locked)

     

       95
       95
       +
        {

     

       96
       96
       +
       +        if (getenv("NIXOS_USERS_PURE")) {

     

       97
       97
       +
       +                throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers");

     

       98
       98
       +
       +                return;

     

       99
       99
       +
       +        }

     

       100
       100
       +
       +

     

       101
       101
       +
                User *user = (User*)auser;

     

       102
       102
       +
                daemon_local_check_auth (user->daemon,

     

       103
       103
       +
                                         user,

     

       104
       104
       +
       @@ -1814,6 +1839,11 @@ user_set_password_mode (AccountsUser          *auser,

     

       105
       105
       +
                                GDBusMethodInvocation *context,

     

       106
       106
       +
                                gint                   mode)

     

       107
       107
       +
        {

     

       108
       108
       +
       +        if (getenv("NIXOS_USERS_PURE")) {

     

       109
       109
       +
       +                throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers");

     

       110
       110
       +
       +                return;

     

       111
       111
       +
       +        }

     

       112
       112
       +
       +

     

       113
       113
       +
                User *user = (User*)auser;

     

       114
       114
       +
                const gchar *action_id;

     

       115
       115
       +
        

     

       116
       116
       +
       @@ -1905,6 +1935,11 @@ user_set_password (AccountsUser          *auser,

     

       117
       117
       +
                           const gchar           *password,

     

       118
       118
       +
                           const gchar           *hint)

     

       119
       119
       +
        {

     

       120
       120
       +
       +        if (getenv("NIXOS_USERS_PURE")) {

     

       121
       121
       +
       +                throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers");

     

       122
       122
       +
       +                return;

     

       123
       123
       +
       +        }

     

       124
       124
       +
       +

     

       125
       125
       +
                User *user = (User*)auser;

     

       126
       126
       +
                gchar **data;

     

       127
       127
       +
        

     

       128
       128
       +
       -- 

     

       129
       129
       +
       2.9.3

     

       130
       130
       +

+18 -7

pkgs/development/libraries/accountsservice/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper, shadow

     

       2
       2
        
       , libtool, gobjectIntrospection, polkit, systemd, coreutils }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "accountsservice-${version}";

     

       6
       6
       -
         version = "0.6.40";

     

       7
       7
       -
         

     

       6
       6
       +
         version = "0.6.42";

     

       7
       7
       +
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";

     

       10
       10
       -
           sha256 = "0ayb3y3l25dmwxlh9g071h02mphjfbkvi2k5f635bayb01k7akzh";

     

       10
       10
       +
           sha256 = "0zh0kjpdc631qh36plcgpwvnmh9wj8l5cki3aw5r09w6y7198r75";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ pkgconfig glib intltool libtool makeWrapper

     
···

       15
       15
        
       

     

       16
       16
        
         configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system"

     

       17
       17
        
                            "--localstatedir=/var" ];

     

       18
       18
       +
         prePatch = ''

     

       19
       19
       +
           substituteInPlace src/daemon.c --replace '"/usr/sbin/useradd"' '"${shadow}/bin/useradd"' \

     

       20
       20
       +
                                          --replace '"/usr/sbin/userdel"' '"${shadow}/bin/userdel"'

     

       21
       21
       +
           substituteInPlace src/user.c   --replace '"/usr/sbin/usermod"' '"${shadow}/bin/usermod"' \

     

       22
       22
       +
                                          --replace '"/usr/bin/chage"' '"${shadow}/bin/chage"' \

     

       23
       23
       +
                                          --replace '"/usr/bin/passwd"' '"${shadow}/bin/passwd"' \

     

       24
       24
       +
                                          --replace '"/bin/cat"' '"${coreutils}/bin/cat"'

     

       25
       25
       +
         '';

     

       18
       26
        
       

     

       19
       19
       -
         patches = [ ./no-create-dirs.patch ];

     

       20
       20
       -
         patchFlags = "-p0";

     

       21
       21
       -
         

     

       27
       27
       +
         patches = [

     

       28
       28
       +
           ./no-create-dirs.patch

     

       29
       29
       +
           ./Add-nixbld-to-user-blacklist.patch

     

       30
       30
       +
           ./Disable-methods-that-change-files-in-etc.patch

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       22
       33
        
         preFixup = ''

     

       23
       34
        
           wrapProgram "$out/libexec/accounts-daemon" \

     

       24
       35
        
             --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/users" \

+2 -2

pkgs/development/libraries/accountsservice/no-create-dirs.patch

···

       1
       1
       -
       --- src/Makefile.in.orig	2014-04-23 22:30:00.276005326 +0200

     

       2
       2
       -
       +++ src/Makefile.in	2014-04-23 22:30:16.809409113 +0200

     

       1
       1
       +
       --- a/src/Makefile.in	2014-04-23 22:30:00.276005326 +0200

     

       2
       2
       +
       +++ b/src/Makefile.in	2014-04-23 22:30:16.809409113 +0200

     

       3
       3
        
       @@ -881,8 +881,8 @@

     

       4
       4
        
        	gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml

     

       5
       5