summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2021-03-19 18:17:01 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2021-03-19 18:17:01 +0100
commit1ecb97eae93f6ea120ead7628da87c570f8074e2 (patch)
tree3baad8d9af311a012d0d7a0dba9604d0462acc7c /nixos
parentc804f22a81bb70bc8a82939dbfc8388dfe22c0c2 (diff)
parentfe7df3f3ff76fca22c4eefa0ce53eb9f6b1f64a2 (diff)
downloadnixpkgs-1ecb97eae93f6ea120ead7628da87c570f8074e2.tar
nixpkgs-1ecb97eae93f6ea120ead7628da87c570f8074e2.tar.gz
nixpkgs-1ecb97eae93f6ea120ead7628da87c570f8074e2.tar.bz2
nixpkgs-1ecb97eae93f6ea120ead7628da87c570f8074e2.tar.lz
nixpkgs-1ecb97eae93f6ea120ead7628da87c570f8074e2.tar.xz
nixpkgs-1ecb97eae93f6ea120ead7628da87c570f8074e2.tar.zst
nixpkgs-1ecb97eae93f6ea120ead7628da87c570f8074e2.zip
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/system/localtime.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix
index 8f8e2e2e933..bb99e5e36ff 100644
--- a/nixos/modules/services/system/localtime.nix
+++ b/nixos/modules/services/system/localtime.nix
@@ -29,15 +29,14 @@ in {
       };
     };
 
-    # We use the 'out' output, since localtime has its 'bin' output
-    # first, so that is what we get if we use the derivation bare.
     # Install the polkit rules.
-    environment.systemPackages = [ pkgs.localtime.out ];
+    environment.systemPackages = [ pkgs.localtime ];
     # Install the systemd unit.
-    systemd.packages = [ pkgs.localtime.out ];
+    systemd.packages = [ pkgs.localtime ];
 
     users.users.localtimed = {
-      description = "Taskserver user";
+      description = "localtime daemon";
+      isSystemUser = true;
     };
 
     systemd.services.localtime = {