From fdf019979ebe923d0393765f08975d33e557842e Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sat, 21 Sep 2024 16:30:00 +0200 Subject: [PATCH] nixos/jenkinsSlave: remove `with lib;` --- .../services/continuous-integration/jenkins/slave.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index c0599a65b480..d5a6b93a6cf8 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: -with lib; + let + inherit (lib) mkIf mkOption types; cfg = config.services.jenkinsSlave; masterCfg = config.services.jenkins; in { @@ -47,16 +48,16 @@ in { ''; }; - javaPackage = mkPackageOption pkgs "jdk" { }; + javaPackage = lib.mkPackageOption pkgs "jdk" { }; }; }; config = mkIf (cfg.enable && !masterCfg.enable) { - users.groups = optionalAttrs (cfg.group == "jenkins") { + users.groups = lib.optionalAttrs (cfg.group == "jenkins") { jenkins.gid = config.ids.gids.jenkins; }; - users.users = optionalAttrs (cfg.user == "jenkins") { + users.users = lib.optionalAttrs (cfg.user == "jenkins") { jenkins = { description = "jenkins user"; createHome = true;