diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-04 06:01:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-04 06:01:44 +0000 |
| commit | 47507cf77a26d73af8e8bf892b41b07402a7ed10 (patch) | |
| tree | c6fd5222a5f13a3ccba0670f5328013ceaa83222 /pkgs/applications/virtualization/podman/default.nix | |
| parent | e464bde9ba6554bbc0cc29bc65777e68bdaa5b9a (diff) | |
| parent | ce1da07174ab7dd31fde15044dbdc574c4dc1b55 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/virtualization/podman/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 3fed07237f75e..f6cc83fde17c4 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -68,7 +68,6 @@ buildGoModule rec { ${if stdenv.isDarwin then '' mv bin/{darwin/podman,podman} '' else '' - install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d for s in contrib/systemd/**/*.in; do substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary @@ -92,7 +91,6 @@ buildGoModule rec { # related modules inherit (nixosTests) podman-tls-ghostunnel - podman-dnsname ; oci-containers-podman = nixosTests.oci-containers.podman; }; |