From 7a86bc32cb6c038313890a09a1f6f4cc13c6f542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 10 Nov 2018 14:00:32 +0000 Subject: [PATCH] docker-compose: rename from docker_compose, python3 by default The command is called docker-compose hence the package should be called the same. Also prefer python3. --- .../virtualization/docker-compose}/default.nix | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{development/python-modules/docker_compose => applications/virtualization/docker-compose}/default.nix (100%) 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 8767d98ad0a..505758d3af0 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 018bba2aff8..d13bc7a3572 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -154,7 +154,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 e4e561682bf..668d79b3774 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2222,8 +2222,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 { };