diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-11-10 14:00:32 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-11-11 11:16:44 +0000 |
| commit | 7a86bc32cb6c038313890a09a1f6f4cc13c6f542 (patch) | |
| tree | 5943c309c8cd20e88d5ac7ebade172b5dfe6ad8f | |
| parent | 0a7d20ece5f0d75e22cda4e2d665aec356310707 (diff) | |
| download | nixpkgs-7a86bc32cb6c038313890a09a1f6f4cc13c6f542.tar nixpkgs-7a86bc32cb6c038313890a09a1f6f4cc13c6f542.tar.gz nixpkgs-7a86bc32cb6c038313890a09a1f6f4cc13c6f542.tar.bz2 nixpkgs-7a86bc32cb6c038313890a09a1f6f4cc13c6f542.tar.lz nixpkgs-7a86bc32cb6c038313890a09a1f6f4cc13c6f542.tar.xz nixpkgs-7a86bc32cb6c038313890a09a1f6f4cc13c6f542.tar.zst nixpkgs-7a86bc32cb6c038313890a09a1f6f4cc13c6f542.zip | |
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.
| -rw-r--r-- | pkgs/applications/virtualization/docker-compose/default.nix (renamed from pkgs/development/python-modules/docker_compose/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 4af9c32fed6..4af9c32fed6 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/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 { }; |