1
0
Fork 0
mirror of https://git.sr.ht/~goorzhel/turboprop synced 2024-12-14 11:37:37 +00:00

Just import pkgs from the flake; fix stupid typo

This commit is contained in:
Antonio Gurgel 2023-11-14 23:24:30 -08:00
parent aada150c63
commit d53fd11ca2
2 changed files with 7 additions and 7 deletions

View file

@ -34,9 +34,10 @@
inherit system;
};
kubelib = nix-kube-generators.lib {inherit pkgs;};
lib = import ./lib {inherit nix-kube-generators; pkgs = nixpkgs;};
in {
packages = {
chartDerivations = import ./lib {inherit self nix-kube-generators;};
chartDerivations = lib.charts;
nfs-kube = kubelib.buildHelmChart {
name = "nfs-subdir";
chart = "${nfs-helm}/charts/nfs-subdir-external-provisioner";

View file

@ -1,7 +1,6 @@
{
self,
nix-kube-generators,
...
pkgs,
}: let
dirToRepo = repo: {
name = repo;
@ -11,13 +10,13 @@
builtins.listToAttrs (map
(name: {
inherit name;
value = import ./charts/${repo}/${name};
value = import ../charts/${repo}/${name};
})
charts);
};
chartsMetadata = builtins.listToAttrs (map dirToRepo (builtins.attrNames (builtins.readDir ../charts)));
in {
chartsMetadata = builtins.listToAttrs (map dirToRepo (builtins.attrNames (builtins.readDir ./charts)));
charts = {pkgs}: let
charts = let
kubelib = nix-kube-generators.lib {inherit pkgs;};
in
builtins.mapAttrs
@ -29,5 +28,5 @@ in {
)
charts
)
self.chartsMetadata;
chartsMetadata;
}