summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--users/id1000.scm38
1 files changed, 21 insertions, 17 deletions
diff --git a/users/id1000.scm b/users/id1000.scm
index bf15101..a432a14 100644
--- a/users/id1000.scm
+++ b/users/id1000.scm
@@ -26,7 +26,8 @@
#:use-module (gnu services)
;; user-account
- #:use-module (gnu system accounts)
+ #:use-module ((gnu system accounts)
+ #:prefix gnu:system:accounts:)
;; local-file
#:use-module (guix gexp)
@@ -228,16 +229,18 @@
(stop #~ (make-kill-destructor)))))))
(define %dkimproxy-accounts
- (list (user-group (name "dkimproxy")
- (system? #t))
- (user-account (name "dkimproxy")
- (group "dkimproxy")
- (system? #t)
- (comment "Dkimproxy user")
- (home-directory "/var/empty")
- (shell (file-append (@ (gnu packages admin)
- shadow)
- "/sbin/nologin")))))
+ (list (gnu:system:accounts:user-group
+ (name "dkimproxy")
+ (system? #t))
+ (gnu:system:accounts:user-account
+ (name "dkimproxy")
+ (group "dkimproxy")
+ (system? #t)
+ (comment "Dkimproxy user")
+ (home-directory "/var/empty")
+ (shell (file-append (@ (gnu packages admin)
+ shadow)
+ "/sbin/nologin")))))
(define dkimproxy-out-service-type
(service-type
@@ -526,12 +529,13 @@
"marek")
(define-public uid1000-account
- (user-account (name uid1000-name)
- (group "users")
- (supplementary-groups groups)
- (uid 1000)
- (comment "Marek Paśnikowski")
- (home-directory "/home/marek")))
+ (gnu:system:accounts:user-account
+ (name uid1000-name)
+ (group "users")
+ (supplementary-groups groups)
+ (uid 1000)
+ (comment "Marek Paśnikowski")
+ (home-directory "/home/marek")))
(define-public uid1000-home-environment
(lambda (host-name*)