about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2020-04-29 17:05:41 +0200
committerGitHub <noreply@github.com>2020-04-29 17:05:41 +0200
commitf0c83319a6db4a4d936a50687090d173f3230495 (patch)
treef1562a278c1045c0c45534dfb1c46db805daa650 /pkgs/top-level
parentc2c30d926c39cd82b88a3e0c68bc980cd374c72c (diff)
parent78cba5ac1e0883f939766523927205f7a722fa5c (diff)
downloadnixlib-f0c83319a6db4a4d936a50687090d173f3230495.tar
nixlib-f0c83319a6db4a4d936a50687090d173f3230495.tar.gz
nixlib-f0c83319a6db4a4d936a50687090d173f3230495.tar.bz2
nixlib-f0c83319a6db4a4d936a50687090d173f3230495.tar.lz
nixlib-f0c83319a6db4a4d936a50687090d173f3230495.tar.xz
nixlib-f0c83319a6db4a4d936a50687090d173f3230495.tar.zst
nixlib-f0c83319a6db4a4d936a50687090d173f3230495.zip
Merge pull request #86249 from adisbladis/podman-wrapper
podman: Wrap packages required to run containers
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4a88ffc1c2d..51f1a6a1db66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5966,7 +5966,8 @@ in
 
   podiff = callPackage ../tools/text/podiff { };
 
-  podman = callPackage ../applications/virtualization/podman { };
+  podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
+  podman-unwrapped = callPackage ../applications/virtualization/podman { };
 
   podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};