diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-17 18:01:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 18:01:28 +0000 |
| commit | 11332e9137fbbab82b10312da9dad67e3607f553 (patch) | |
| tree | 4699d02091f12f33fb72a081324f4c960298349a /pkgs/top-level/all-packages.nix | |
| parent | 732bd85cf5ce831a88eb7871fd186c386a6493b0 (diff) | |
| parent | d6b748b2b34de00a07b5620ff4b30c14a7d8078a (diff) | |
| download | nixpkgs-11332e9137fbbab82b10312da9dad67e3607f553.tar nixpkgs-11332e9137fbbab82b10312da9dad67e3607f553.tar.gz nixpkgs-11332e9137fbbab82b10312da9dad67e3607f553.tar.bz2 nixpkgs-11332e9137fbbab82b10312da9dad67e3607f553.tar.lz nixpkgs-11332e9137fbbab82b10312da9dad67e3607f553.tar.xz nixpkgs-11332e9137fbbab82b10312da9dad67e3607f553.tar.zst nixpkgs-11332e9137fbbab82b10312da9dad67e3607f553.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 423ca604667..294276048b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8050,10 +8050,7 @@ in podiff = callPackage ../tools/text/podiff { }; - podman = if stdenv.isDarwin then - callPackage ../applications/virtualization/podman { } - else - callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; |