about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorlewo <lewo@abesis.fr>2019-01-21 16:18:42 +0100
committerGitHub <noreply@github.com>2019-01-21 16:18:42 +0100
commitd98184ba5c6193d0e0bd73a897d505ef24b51608 (patch)
tree568a6e4a605ca388c6cdcd532bd7a3ea815764ef /pkgs/top-level
parent202dec3e7da7ffd85b959f5ecbcee5182d91efa5 (diff)
parentde5fd9e6110489722e8667664dce9fdc17331866 (diff)
downloadnixlib-d98184ba5c6193d0e0bd73a897d505ef24b51608.tar
nixlib-d98184ba5c6193d0e0bd73a897d505ef24b51608.tar.gz
nixlib-d98184ba5c6193d0e0bd73a897d505ef24b51608.tar.bz2
nixlib-d98184ba5c6193d0e0bd73a897d505ef24b51608.tar.lz
nixlib-d98184ba5c6193d0e0bd73a897d505ef24b51608.tar.xz
nixlib-d98184ba5c6193d0e0bd73a897d505ef24b51608.tar.zst
nixlib-d98184ba5c6193d0e0bd73a897d505ef24b51608.zip
Merge pull request #51627 from vdemeester/init-podman
podman: init at 1.0.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfc0e69bbf57..86670b314507 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4966,6 +4966,9 @@ in
 
   podiff = callPackage ../tools/text/podiff { };
 
+  podman = callPackage ../applications/virtualization/podman { };
+  conmon = callPackage ../applications/virtualization/podman/conmon.nix { };
+
   pod2mdoc = callPackage ../tools/misc/pod2mdoc { };
 
   poedit = callPackage ../tools/text/poedit { };