From 77250c2c7b4ecff7bbe1b811f82f283f2464fbb2 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 15 Jul 2021 09:34:11 -0400
Subject: [PATCH] Set isNormalUser for the deployment user
The old version of nixpkgs let us get away with setting neither isNormalUser
nor isSystemUser but setting all of the things a normal user would get
directly. The new version of nixpkgs demands one of these flags be set. So,
set it, and remove all of the redundant settings that it implies.
---
nixos/modules/deployment.nix | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/nixos/modules/deployment.nix b/nixos/modules/deployment.nix
index 26156595..4c3a9dd0 100755
--- a/nixos/modules/deployment.nix
+++ b/nixos/modules/deployment.nix
@@ -104,13 +104,11 @@ in {
# Configure the deployment user.
users.users.deployment = {
- # Without some shell no login is possible at all, even to execute our
- # single non-restricted command.
- useDefaultShell = true;
-
- # Without a home directory, lots of tools break.
- createHome = true;
- home = "/home/deployment";
+ # A user must be either normal or system. A normal user uses the
+ # default shell, has a home directory created for it at the usual
+ # location, and is in the "users" group. That's pretty much what we
+ # want for the deployment user.
+ isNormalUser = true;
packages = [
# update-deployment dependencies
--
GitLab