Fix lots of typos
This commit is contained in:
@@ -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; };
|
||||
};
|
||||
|
||||
+9
-5
@@ -13,17 +13,21 @@
|
||||
shellcheck,
|
||||
python3,
|
||||
xonsh,
|
||||
|
||||
name,
|
||||
...
|
||||
}:
|
||||
let
|
||||
basicPython = (python3.withPackages (p: with p; [ pyyaml ]));
|
||||
x = xonsh.overridePtyhonAttrs (old:
|
||||
{
|
||||
x = xonsh.overridePythonAttrs (old: {
|
||||
python3 = basicPython;
|
||||
propagatedbuildInputs = old.propagatedBuildInputs ++ [ basicPython.pkgs.pyyaml ];
|
||||
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"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user