public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50176 from Mic92/docker-componse

Browse Source 
docker-compose: rename from docker_compose, python3 by default
This commit is contained in:
Jörg Thalheim 2018-11-12 10:14:53 +00:00 committed by GitHub
commit 92c478babd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/python-modules/docker_compose/default.nix → pkgs/applications/virtualization/docker-compose/default.nix
View File

1
pkgs/top-level/aliases.nix
View File

@ -85,6 +85,7 @@ mapAliases ({
docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
docbook_xml_xslt = docbook_xsl; # added 2018-04-25 docbook_xml_xslt = docbook_xsl; # added 2018-04-25
double_conversion = double-conversion; # 2017-11-22 double_conversion = double-conversion; # 2017-11-22
docker_compose = docker-compose; # 2018-11-10
dwarf_fortress = dwarf-fortress; # added 2016-01-23 dwarf_fortress = dwarf-fortress; # added 2016-01-23
emacsMelpa = emacs25PackagesNg; # for backward compatibility emacsMelpa = emacs25PackagesNg; # for backward compatibility
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18

2
pkgs/top-level/all-packages.nix
View File

@ -142,7 +142,7 @@ with pkgs;
dockerTools = callPackage ../build-support/docker { }; 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 { }; docker-ls = callPackage ../tools/misc/docker-ls { };

2
pkgs/top-level/python-packages.nix
View File

@ -2224,8 +2224,6 @@ in {
pyfribidi = callPackage ../development/python-modules/pyfribidi { }; pyfribidi = callPackage ../development/python-modules/pyfribidi { };
docker_compose = callPackage ../development/python-modules/docker_compose {};
pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; pyftpdlib = callPackage ../development/python-modules/pyftpdlib { };
fdroidserver = callPackage ../development/python-modules/fdroidserver { }; fdroidserver = callPackage ../development/python-modules/fdroidserver { };