ref: organize lib folder

This commit is contained in:
David Arnold 2021-05-28 16:19:03 -05:00
parent 7b057d8c0f
commit bf64929797
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08
6 changed files with 5 additions and 5 deletions

View file

@ -1,7 +1,7 @@
{ lib, pkgs }:
(import ./extra.nix { inherit pkgs lib; }) // {
k8s = import ./k8s.nix { inherit lib; };
docker = import ./docker.nix { inherit lib pkgs; };
k8s = import ./k8s { inherit lib; };
docker = import ./docker { inherit lib pkgs; };
helm = import ./helm { inherit pkgs; };
}

View file

@ -85,7 +85,7 @@ in
}];
# pass docker library as param
_module.args.docker = import ../lib/docker.nix { inherit lib pkgs; };
_module.args.docker = import ../lib/docker { inherit lib pkgs; };
# list of exported docker images
docker.export = mapAttrsToList (_: i: i.image)

View file

@ -374,7 +374,7 @@ in
}];
# expose k8s helper methods as module argument
_module.args.k8s = import ../lib/k8s.nix { inherit lib; };
_module.args.k8s = import ../lib/k8s { inherit lib; };
kubernetes.api = mkMerge ([{
# register custom types

View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
with lib;
with import ../../lib/docker.nix { inherit lib pkgs; };
with import ../../lib/docker { inherit lib pkgs; };
let
testing = config.testing;