docker-compose: default to v2
This commit is contained in:
parent
d8cdbde2c9
commit
b7b91880d3
|
@ -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 ]} \
|
||||
;
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, python3, glibcLocales, docker-compose }:
|
||||
{ lib, python3, glibcLocales, docker-compose_1 }:
|
||||
let
|
||||
docker_compose = changeVersion (with localPython.pkgs; docker-compose.override {
|
||||
docker_compose = changeVersion (with localPython.pkgs; docker-compose_1.override {
|
||||
inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko;
|
||||
}).overridePythonAttrs "1.25.5" "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks";
|
||||
|
||||
|
|
|
@ -340,6 +340,7 @@ mapAliases ({
|
|||
docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22
|
||||
doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its depedencies where removed."; # Added 2022-03-30
|
||||
docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22
|
||||
docker-compose_2 = throw "'docker-compose_2' has been renamed to 'docker-compose'"; # Added 2022-06-05
|
||||
docker-edge = throw "'docker-edge' has been removed, it was an alias for 'docker'"; # Added 2022-06-05
|
||||
dolphinEmu = dolphin-emu; # Added 2021-11-10
|
||||
dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10
|
||||
|
|
|
@ -496,8 +496,6 @@ with pkgs;
|
|||
|
||||
nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { };
|
||||
|
||||
docker-compose = python3Packages.callPackage ../applications/virtualization/docker-compose {};
|
||||
|
||||
docker-ls = callPackage ../tools/misc/docker-ls { };
|
||||
|
||||
docker-slim = callPackage ../applications/virtualization/docker-slim { };
|
||||
|
@ -25870,7 +25868,8 @@ with pkgs;
|
|||
afterburn = callPackage ../tools/admin/afterburn {};
|
||||
|
||||
docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { };
|
||||
docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { };
|
||||
docker-compose = callPackage ../applications/virtualization/docker/compose.nix { };
|
||||
docker-compose_1 = python3Packages.callPackage ../applications/virtualization/docker/compose_1.nix {};
|
||||
|
||||
amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue