From 724859ec1b3094e5f3fb748429278524dd8f7b5b Mon Sep 17 00:00:00 2001 From: lillecarl Date: Wed, 21 Jan 2026 17:23:29 +0000 Subject: [PATCH] fmt --- kubernetes.nix | 3 +-- pkgs/fetchHelm.nix | 61 ++++++++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/kubernetes.nix b/kubernetes.nix index c395070..64a2911 100644 --- a/kubernetes.nix +++ b/kubernetes.nix @@ -223,8 +223,7 @@ in data = lib.importJSON cfg.apiMappingFile; objectToAttr = object: { name = object.kind; - value = - if object.group or "" == "" then object.version else "${object.group}/${object.version}"; + value = if object.group or "" == "" then object.version else "${object.group}/${object.version}"; }; in lib.listToAttrs (map objectToAttr data.resources); diff --git a/pkgs/fetchHelm.nix b/pkgs/fetchHelm.nix index 93b1c03..27a9285 100644 --- a/pkgs/fetchHelm.nix +++ b/pkgs/fetchHelm.nix @@ -1,48 +1,51 @@ -{ stdenvNoCC, lib, kubernetes-helm, cacert }: +{ + stdenvNoCC, + lib, + kubernetes-helm, + cacert, +}: let cleanName = lib.replaceStrings [ "/" ] [ "-" ]; in { # name of the chart - chart -, # chart url to fetch from custom location - chartUrl ? null -, # version of the chart - version ? null -, # chart hash - sha256 -, # whether to extract chart - untar ? true -, # use custom charts repo - repo ? null -, # pass --verify to helm chart - verify ? false -, # pass --devel to helm chart - devel ? false -, + chart, + # chart url to fetch from custom location + chartUrl ? null, + # version of the chart + version ? null, + # chart hash + sha256, + # whether to extract chart + untar ? true, + # use custom charts repo + repo ? null, + # pass --verify to helm chart + verify ? false, + # pass --devel to helm chart + devel ? false, }: stdenvNoCC.mkDerivation { - name = "${cleanName chart}-${ if version == null then "dev" else version }"; + name = "${cleanName chart}-${if version == null then "dev" else version}"; buildCommand = '' export HOME="$PWD" echo "adding helm repo" - ${ if repo == null then "" else "helm repo add repository ${repo}" } + ${if repo == null then "" else "helm repo add repository ${repo}"} echo "fetching helm chart" helm fetch -d ./chart \ - ${ if untar then "--untar" else ""} \ - ${ if version == null then "" else "--version ${version}" } \ - ${ if devel then "--devel" else "" } \ - ${ if verify then "--verify" else "" } \ - ${ if chartUrl == null then ( - if repo == null - then chart - else "repository/${chart}" - ) else chartUrl} + ${if untar then "--untar" else ""} \ + ${if version == null then "" else "--version ${version}"} \ + ${if devel then "--devel" else ""} \ + ${if verify then "--verify" else ""} \ + ${if chartUrl == null then (if repo == null then chart else "repository/${chart}") else chartUrl} cp -r chart/*/ $out ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; outputHash = sha256; - nativeBuildInputs = [ kubernetes-helm cacert ]; + nativeBuildInputs = [ + kubernetes-helm + cacert + ]; }