diff --git a/pkgs/applications/virtualization/docker/compose_1.nix b/pkgs/applications/virtualization/docker/compose_1.nix deleted file mode 100644 index ac5d726439ce..000000000000 --- a/pkgs/applications/virtualization/docker/compose_1.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, buildPythonApplication, fetchPypi -, installShellFiles -, mock, pytest, nose -, pyyaml, colorama, docopt -, dockerpty, docker, jsonschema, requests -, six, texttable, websocket-client, cached-property -, paramiko, distro, python-dotenv -}: - -buildPythonApplication rec { - version = "1.29.2"; - pname = "docker-compose"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc="; - }; - - # lots of networking and other fails - doCheck = false; - nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ mock pytest nose ]; - propagatedBuildInputs = [ - pyyaml colorama dockerpty docker - jsonschema requests six texttable websocket-client - docopt cached-property paramiko distro python-dotenv - ]; - - postPatch = '' - # Remove upper bound on requires, see also - # https://github.com/docker/compose/issues/4431 - sed -i "s/, < .*',$/',/" setup.py - ''; - - postInstall = '' - installShellCompletion --bash contrib/completion/bash/docker-compose - installShellCompletion --zsh contrib/completion/zsh/_docker-compose - ''; - - meta = with lib; { - homepage = "https://docs.docker.com/compose/"; - description = "Multi-container orchestration for Docker"; - mainProgram = "docker-compose"; - license = licenses.asl20; - maintainers = with maintainers; [ Frostman ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a8f9e0a88946..a97ab1c0c949 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -326,6 +326,7 @@ mapAliases ({ dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dnnl = oneDNN; # Added 2020-04-22 + docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29 docker-distribution = distribution; # Added 2023-12-26 docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c85f63b569e..bb300af363d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29860,7 +29860,6 @@ with pkgs; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; - docker-compose_1 = python3Packages.callPackage ../applications/virtualization/docker/compose_1.nix { }; docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { };