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

Merge pull request #125341 from hercules-ci/backport-podman-improvements

Browse Source 
[Backport release-21.05] podman improvements
This commit is contained in:
Robert Hensing
2021-06-02 18:23:15 +02:00
committed by GitHub
parent 68e821b051 0684f78698
commit 297970378b
16 changed files with 552 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+3
View File
@@ -22849,6 +22849,8 @@ in
cni = callPackage ../applications/networking/cluster/cni {};
cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {};
dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni {};
cntr = callPackage ../applications/virtualization/cntr { };
communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
@@ -23018,6 +23020,7 @@ in
docker = docker_20_10;
docker-edge = docker_20_10;
docker-client = docker.override { clientOnly = true; };
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };