From 69d03945f1027df7fc8d9d27a8be9d71712584f0 Mon Sep 17 00:00:00 2001
From: V <v@unfathomable.blue>
Date: Thu, 2 Jun 2022 18:44:20 +0200
Subject: fleet: upgrade to NixOS 22.05

Change-Id: Ie5542d079ee7b2de06e0faed52343905b3287b39
---
 fleet/modules/cgiserver.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'fleet/modules/cgiserver.nix')

diff --git a/fleet/modules/cgiserver.nix b/fleet/modules/cgiserver.nix
index 6cafbe0..a3e94c2 100644
--- a/fleet/modules/cgiserver.nix
+++ b/fleet/modules/cgiserver.nix
@@ -1,15 +1,16 @@
 # SPDX-FileCopyrightText: V <v@unfathomable.blue>
 # SPDX-License-Identifier: OSL-3.0
 
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, utils, pkgs, ... }:
 
 with lib;
 
 let
   cfg = config.services.cgiserver;
 
-  inherit (import "${modulesPath}/system/boot/systemd-unit-options.nix" { inherit config lib; })
-    serviceOptions socketOptions;
+  inherit (utils.systemdUtils.unitOptions)
+    serviceOptions
+    socketOptions;
 
   # TODO(V): These descriptions could use a bit of work.
   instanceOpts = { name, ... }: {
@@ -33,13 +34,13 @@ let
 
       serviceConfig = mkOption {
         description = "Extra options to put in the [Service] section of the application's service unit.";
-        inherit (serviceOptions.serviceConfig) type;
+        inherit ((serviceOptions { name = null; config = null; }).options.serviceConfig) type;
         default = {};
       };
 
       listenStreams = mkOption {
         description = "Addresses to listen on, in the format used by the ListenStream option of systemd.socket(5).";
-        inherit (socketOptions.listenStreams) type;
+        inherit (socketOptions.options.listenStreams) type;
         default = [ "/run/${name}/${name}.sock" ];
       };
     };
-- 
cgit 1.4.1