Skip to content

Commit

Permalink
chore: apply new formatting rules
Browse files Browse the repository at this point in the history
  • Loading branch information
msanft committed Dec 17, 2024
1 parent 4102c21 commit 090759b
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
4 changes: 3 additions & 1 deletion packages/by-name/microsoft/cloud-hypervisor/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ rustPlatform.buildRustPackage rec {
"mshv"
"kvm"
]
++ lib.optional withIGVM "igvm" ++ lib.optional withSEVSNP "sev_snp" ++ lib.optional withTDX "tdx";
++ lib.optional withIGVM "igvm"
++ lib.optional withSEVSNP "sev_snp"
++ lib.optional withTDX "tdx";

OPENSSL_NO_VENDOR = true;

Expand Down
3 changes: 2 additions & 1 deletion packages/by-name/nvidia-ctk-with-config/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
nvidia-container-toolkit.override {
configTemplatePath = replaceVars ./config.toml {
"nvidia-container-cli" = "${lib.getExe' libnvidia-container "nvidia-container-cli"}";
"nvidia-container-runtime-hook" = "${lib.getExe' nvidia-container-toolkit "nvidia-container-runtime-hook"}";
"nvidia-container-runtime-hook" =
"${lib.getExe' nvidia-container-toolkit "nvidia-container-runtime-hook"}";
"nvidia-ctk" = "${lib.getExe' nvidia-container-toolkit "nvidia-ctk"}";
"glibcbin" = "${lib.getBin glibc}";
};
Expand Down
9 changes: 6 additions & 3 deletions packages/by-name/ociLayerTar/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ runCommandLocal "ociLayer"
);
mediaType =
"application/vnd.oci.image.layer.v1.tar" + (if compression == "" then "" else "+" + compression);
nativeBuildInputs = [
nix
] ++ lib.optional (compression == "gzip") gzip ++ lib.optional (compression == "zstd") zstd;
nativeBuildInputs =
[
nix
]
++ lib.optional (compression == "gzip") gzip
++ lib.optional (compression == "zstd") zstd;
inherit compression;
}
''
Expand Down
3 changes: 2 additions & 1 deletion packages/nixos/gpu.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ in
};
hardware.nvidia-container-toolkit.enable = true;

image.repart.partitions."10-root".contents."/usr/share/oci/hooks/prestart/nvidia-container-toolkit.sh".source = lib.getExe pkgs.nvidia-ctk-oci-hook;
image.repart.partitions."10-root".contents."/usr/share/oci/hooks/prestart/nvidia-container-toolkit.sh".source =
lib.getExe pkgs.nvidia-ctk-oci-hook;

boot.initrd.kernelModules = [
# Extra kernel modules required to talk to the GPU in CC-Mode.
Expand Down
6 changes: 4 additions & 2 deletions packages/nixos/kata.nix
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ in

networking.resolvconf.enable = false;

environment.etc."resolv.conf".text = "dummy file, to be bind-mounted by the Kata agent when writing network configuration";
environment.etc."kata-opa/default-policy.rego".source = "${pkgs.kata-runtime.src}/src/kata-opa/allow-set-policy.rego";
environment.etc."resolv.conf".text =
"dummy file, to be bind-mounted by the Kata agent when writing network configuration";
environment.etc."kata-opa/default-policy.rego".source =
"${pkgs.kata-runtime.src}/src/kata-opa/allow-set-policy.rego";
};
}

0 comments on commit 090759b

Please sign in to comment.