diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix similarity index 100% rename from pkgs/development/python-modules/docker_compose/default.nix rename to pkgs/applications/virtualization/docker-compose/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8767d98ad0a9..505758d3af0d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -85,6 +85,7 @@ mapAliases ({ docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 docbook_xml_xslt = docbook_xsl; # added 2018-04-25 double_conversion = double-conversion; # 2017-11-22 + docker_compose = docker-compose; # 2018-11-10 dwarf_fortress = dwarf-fortress; # added 2016-01-23 emacsMelpa = emacs25PackagesNg; # for backward compatibility emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b4f55196e54..c1f96d49fcd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -142,7 +142,7 @@ with pkgs; dockerTools = callPackage ../build-support/docker { }; - docker_compose = pythonPackages.docker_compose; + docker-compose = python3Packages.callPackage ../applications/virtualization/docker-compose {}; docker-ls = callPackage ../tools/misc/docker-ls { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18f67fcf9671..808c3a19ae1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2224,8 +2224,6 @@ in { pyfribidi = callPackage ../development/python-modules/pyfribidi { }; - docker_compose = callPackage ../development/python-modules/docker_compose {}; - pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; fdroidserver = callPackage ../development/python-modules/fdroidserver { };