gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

podman: drop slirp4netns which has been replaced by passt (#313670)

Browse Source
This commit is contained in:
Aleksana
2024-09-09 09:53:33 +08:00
committed by GitHub
parent 59c3aa2d4d 56e8106538
commit 03e62e5bc3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/virtualisation/podman/default.nix
View File

@@ -5,12 +5,16 @@ let
inherit (lib) mkOption types; inherit (lib) mkOption types;
podmanPackage = (pkgs.podman.override { podmanPackage = pkgs.podman.override {
extraPackages = cfg.extraPackages extraPackages = cfg.extraPackages
# setuid shadow # setuid shadow
++ [ "/run/wrappers" ] ++ [ "/run/wrappers" ]
++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package; ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package;
}); extraRuntimes = [ pkgs.runc ]
++ lib.optionals (config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or "" == "slirp4netns") (with pkgs; [
slirp4netns
]);
};
# Provides a fake "docker" binary mapping to podman # Provides a fake "docker" binary mapping to podman
dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}"

2
pkgs/applications/virtualization/podman/default.nix
View File

@@ -23,7 +23,6 @@
, runc , runc
, conmon , conmon
, extraRuntimes ? lib.optionals stdenv.isLinux [ runc ] # e.g.: runc, gvisor, youki , extraRuntimes ? lib.optionals stdenv.isLinux [ runc ] # e.g.: runc, gvisor, youki
, slirp4netns
, fuse-overlayfs , fuse-overlayfs
, util-linux , util-linux
, iptables , iptables
@@ -59,7 +58,6 @@ let
aardvark-dns aardvark-dns
catatonit # added here for the pause image and also set in `containersConf` for `init_path` catatonit # added here for the pause image and also set in `containersConf` for `init_path`
netavark netavark
slirp4netns
passt passt
conmon conmon
crun crun