diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-06-04 12:13:44 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-06-06 14:58:18 +1000 |
| commit | b7b91880d3f2358a5eacb31476ab937c0df5562a (patch) | |
| tree | 4e6b3cd4b373ac359cac87456b69fe5d553cf6b7 /pkgs/applications/virtualization | |
| parent | d8cdbde2c94345441235bad1d473b01ec14ca011 (diff) | |
docker-compose: default to v2
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/arion/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/docker/compose_1.nix (renamed from pkgs/applications/virtualization/docker-compose/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/applications/virtualization/arion/default.nix index efe13868524b9..71de7d90ca7e6 100644 --- a/pkgs/applications/virtualization/arion/default.nix +++ b/pkgs/applications/virtualization/arion/default.nix @@ -53,7 +53,7 @@ let mv $out/bin/arion $out/libexec makeWrapper $out/libexec/arion $out/bin/arion \ --unset PYTHONPATH \ - --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose ]} \ + --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose_1 ]} \ ; ''; }; diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker/compose_1.nix index 1299d6f69ec79..1299d6f69ec79 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker/compose_1.nix diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 68f1ff45d144b..ea73e6a7096f5 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -13,7 +13,7 @@ rec { , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool - , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 + , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs , nixosTests @@ -136,7 +136,7 @@ rec { }); plugins = optionals buildxSupport [ docker-buildx ] - ++ optionals composeSupport [ docker-compose_2 ]; + ++ optionals composeSupport [ docker-compose ]; pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in buildGoPackage ((optionalAttrs (!clientOnly) { |