Fix lots of typos
This commit is contained in:
@@ -39,7 +39,7 @@
|
|||||||
{
|
{
|
||||||
bitwarden = callPackage ./img/bitwarden.nix { inherit name; };
|
bitwarden = callPackage ./img/bitwarden.nix { inherit name; };
|
||||||
builder = callPackage ./img/builder.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; };
|
sword-container-builder = callPackage ./img/sword-container-builder.nix { inherit name; };
|
||||||
vm-test = callPackage ./img/vm-test.nix { inherit name; };
|
vm-test = callPackage ./img/vm-test.nix { inherit name; };
|
||||||
};
|
};
|
||||||
|
|||||||
+11
-7
@@ -13,17 +13,21 @@
|
|||||||
shellcheck,
|
shellcheck,
|
||||||
python3,
|
python3,
|
||||||
xonsh,
|
xonsh,
|
||||||
|
|
||||||
|
name,
|
||||||
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
basicPython = (python3.withPackages (p: with p; [ pyyaml ]));
|
basicPython = (python3.withPackages (p: with p; [ pyyaml ]));
|
||||||
x = xonsh.overridePtyhonAttrs (old:
|
x = xonsh.overridePythonAttrs (old: {
|
||||||
{
|
python3 = basicPython;
|
||||||
python3 = basicPython;
|
propagatedBuildInputs =
|
||||||
propagatedbuildInputs = old.propagatedBuildInputs ++ [ basicPython.pkgs.pyyaml ];
|
(if builtins.hasAttr "propagatedBuildInputs" old then old.propagatedBuildInputs else [ ])
|
||||||
});
|
++ [ basicPython.pkgs.pyyaml ];
|
||||||
|
});
|
||||||
in
|
in
|
||||||
dockerTools.buildLayeredImage {
|
dockerTools.buildLayeredImage {
|
||||||
name = "vm-test";
|
name = name "vm-test";
|
||||||
tag = "latest";
|
tag = "latest";
|
||||||
contents = [
|
contents = [
|
||||||
bash
|
bash
|
||||||
@@ -49,4 +53,4 @@ dockerTools.buildLayeredImage {
|
|||||||
config.Env = [
|
config.Env = [
|
||||||
"CURL_CA_BUNDLE=${cacert}/etc/ssl/certs/ca-bundle.crt"
|
"CURL_CA_BUNDLE=${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||||
];
|
];
|
||||||
};
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user