cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/sourcehut: remove usages of 'with lib;'

Browse source 
Inherit library attributes at a finer granularity, instead.
This commit is contained in:
Tomas Antonio Lopez 2023-11-16 14:57:07 +01:00 committed by Anderson Torres
parent ba6817ed22
commit 9e6f9c6d83
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nixos/modules/services/misc/sourcehut/default.nix
View file

@ -1,6 +1,15 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
with lib;
let let
inherit (builtins) head tail;
inherit (lib) generators maintainers types;
inherit (lib.attrsets) attrValues filterAttrs mapAttrs mapAttrsToList recursiveUpdate;
inherit (lib.lists) flatten optional optionals;
inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.strings) concatMapStringsSep concatStringsSep optionalString versionOlder;
inherit (lib.trivial) mapNullable;
inherit (lib.modules) mkBefore mkDefault mkForce mkIf mkMerge
mkRemovedOptionModule mkRenamedOptionModule;
inherit (config.services) nginx postfix postgresql redis; inherit (config.services) nginx postfix postgresql redis;
inherit (config.users) users groups; inherit (config.users) users groups;
cfg = config.services.sourcehut; cfg = config.services.sourcehut;

7
nixos/modules/services/misc/sourcehut/service.nix
View file

@ -11,8 +11,13 @@ srv:
}: }:
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib;
let let
inherit (lib) types;
inherit (lib.attrsets) mapAttrs optionalAttrs;
inherit (lib.lists) optional;
inherit (lib.modules) mkBefore mkDefault mkForce mkIf mkMerge;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.strings) concatStringsSep hasSuffix optionalString;
inherit (config.services) postgresql; inherit (config.services) postgresql;
redis = config.services.redis.servers."sourcehut-${srvsrht}"; redis = config.services.redis.servers."sourcehut-${srvsrht}";
inherit (config.users) users; inherit (config.users) users;