diff --git a/flake.nix b/flake.nix index b5a5388..602e14a 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,7 @@ { bitwarden = callPackage ./img/bitwarden.nix { inherit name; }; builder = callPackage ./img/builder.nix { inherit name; }; - immich = callPackage ./immg/immich.nix { inherit name; }; + immich = callPackage ./img/immich.nix { inherit name; }; sword-container-builder = callPackage ./img/sword-container-builder.nix { inherit name; }; vm-test = callPackage ./img/vm-test.nix { inherit name; }; }; diff --git a/img/sword-container-builer.nix b/img/sword-container-builder.nix similarity index 100% rename from img/sword-container-builer.nix rename to img/sword-container-builder.nix diff --git a/img/vm-test.nix b/img/vm-test.nix index d61f920..f927f14 100644 --- a/img/vm-test.nix +++ b/img/vm-test.nix @@ -13,17 +13,21 @@ shellcheck, python3, xonsh, + + name, + ... }: let basicPython = (python3.withPackages (p: with p; [ pyyaml ])); - x = xonsh.overridePtyhonAttrs (old: - { - python3 = basicPython; - propagatedbuildInputs = old.propagatedBuildInputs ++ [ basicPython.pkgs.pyyaml ]; - }); + x = xonsh.overridePythonAttrs (old: { + python3 = basicPython; + propagatedBuildInputs = + (if builtins.hasAttr "propagatedBuildInputs" old then old.propagatedBuildInputs else [ ]) + ++ [ basicPython.pkgs.pyyaml ]; + }); in dockerTools.buildLayeredImage { - name = "vm-test"; + name = name "vm-test"; tag = "latest"; contents = [ bash @@ -49,4 +53,4 @@ dockerTools.buildLayeredImage { config.Env = [ "CURL_CA_BUNDLE=${cacert}/etc/ssl/certs/ca-bundle.crt" ]; -}; +}