Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker-compose: rename from docker_compose, python3 by default #50176

Merged
merged 1 commit into from Nov 12, 2018

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Nov 10, 2018

The command is called docker-compose hence the package should be called the same.
Also prefer python3.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@Mic92 Mic92 requested a review from FRidh as a code owner November 10, 2018 14:06
@Mic92
Copy link
Member Author

Mic92 commented Nov 10, 2018

cc @jgeerds

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: docker-compose

Partial log (click to expand)

Successfully installed docker-compose-1.23.1
/build/docker-compose-1.23.1
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/2m6n55pqjyzmb5nwzhiw8x1h09zfc54q-docker-compose-1.23.1
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/2m6n55pqjyzmb5nwzhiw8x1h09zfc54q-docker-compose-1.23.1/lib  /nix/store/2m6n55pqjyzmb5nwzhiw8x1h09zfc54q-docker-compose-1.23.1/bin
patching script interpreter paths in /nix/store/2m6n55pqjyzmb5nwzhiw8x1h09zfc54q-docker-compose-1.23.1
checking for references to /build in /nix/store/2m6n55pqjyzmb5nwzhiw8x1h09zfc54q-docker-compose-1.23.1...
wrapping `/nix/store/2m6n55pqjyzmb5nwzhiw8x1h09zfc54q-docker-compose-1.23.1/bin/docker-compose'...
/nix/store/2m6n55pqjyzmb5nwzhiw8x1h09zfc54q-docker-compose-1.23.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: docker-compose

Partial log (click to expand)

Successfully installed docker-compose-1.23.1
/build/docker-compose-1.23.1
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/jsfghgyyccbzpvwbf9bh8a1dzgh5gzi1-docker-compose-1.23.1
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jsfghgyyccbzpvwbf9bh8a1dzgh5gzi1-docker-compose-1.23.1/lib  /nix/store/jsfghgyyccbzpvwbf9bh8a1dzgh5gzi1-docker-compose-1.23.1/bin
patching script interpreter paths in /nix/store/jsfghgyyccbzpvwbf9bh8a1dzgh5gzi1-docker-compose-1.23.1
checking for references to /build in /nix/store/jsfghgyyccbzpvwbf9bh8a1dzgh5gzi1-docker-compose-1.23.1...
wrapping `/nix/store/jsfghgyyccbzpvwbf9bh8a1dzgh5gzi1-docker-compose-1.23.1/bin/docker-compose'...
/nix/store/jsfghgyyccbzpvwbf9bh8a1dzgh5gzi1-docker-compose-1.23.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: docker-compose

Partial log (click to expand)

  The script docker-compose is installed in '/nix/store/riq0xfgp1mxv34ajb4j0n1wsykyvhy6j-docker-compose-1.23.1/bin' which is not on PATH.
  Consider adding this directory to PATH or, if you prefer to suppress this warning, use --no-warn-script-location.
Successfully installed docker-compose-1.23.1
/private/tmp/nix-build-docker-compose-1.23.1.drv-0/docker-compose-1.23.1
post-installation fixup
strip is /nix/store/g5r4apl0za012ffs6ladinwa5w0m1l3k-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/riq0xfgp1mxv34ajb4j0n1wsykyvhy6j-docker-compose-1.23.1/lib  /nix/store/riq0xfgp1mxv34ajb4j0n1wsykyvhy6j-docker-compose-1.23.1/bin
patching script interpreter paths in /nix/store/riq0xfgp1mxv34ajb4j0n1wsykyvhy6j-docker-compose-1.23.1
wrapping `/nix/store/riq0xfgp1mxv34ajb4j0n1wsykyvhy6j-docker-compose-1.23.1/bin/docker-compose'...
/nix/store/riq0xfgp1mxv34ajb4j0n1wsykyvhy6j-docker-compose-1.23.1

@@ -2220,7 +2220,8 @@ in {

pyfribidi = callPackage ../development/python-modules/pyfribidi { };

docker_compose = callPackage ../development/python-modules/docker_compose {};
docker-compose = callPackage ../development/python-modules/docker_compose {};
docker_compose = self.docker-compose; # legacy alias
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't add aliases. They only make it more confusing when overriding stuff. Because users eventually will have to update their expressions, and because an alias like this doesn't cause any notification of it, I don't see the point of it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved it out of python-packages.nix since it is not a library.

The command is called docker-compose hence the package should be called the same.
Also prefer python3.
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: docker-compose

Partial log (click to expand)

copying path '/nix/store/ibkh9bxpxzl8amir64hn4sxwrbb6vlfr-python3.6-dockerpty-0.4.1' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/k36zqcgvlhd32yn86f826yzxljqdfghx-python3.6-packaging-17.1' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/s5pijssrjvbyvp217z0zhcjdm3xfyvxg-python3.6-websocket_client-0.51.0' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/rdd4723xx15450ffxwajbbd8xvwaqcpi-python3.6-cryptography-2.3.1-dev' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/5hvsmy1bmkw10nb6pdmgdw8xxms4l2zm-python3.6-pyOpenSSL-18.0.0-dev' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/w3lvlslna3rqwgv40m2336v6fswlvg1d-python3.6-urllib3-1.23' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/lpl6y173ggcfd6736yxd8mb4kmn0mrz7-python3.6-requests-2.19.1-dev' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/c814zxadfxiww83aiawlkl6qsx6ayy6c-python3.6-docker-3.5.0' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/pqjnnv0z6gpyivsl2cnj8gj0a2jbn6hx-docker-compose-1.23.1' from 'https://nix-cache.s3.amazonaws.com'...
/nix/store/pqjnnv0z6gpyivsl2cnj8gj0a2jbn6hx-docker-compose-1.23.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: docker-compose

Partial log (click to expand)

Successfully installed docker-compose-1.23.1
/build/docker-compose-1.23.1
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/vc5b00fzi5xhj3r4xrsxwjajcvafww3x-docker-compose-1.23.1
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/vc5b00fzi5xhj3r4xrsxwjajcvafww3x-docker-compose-1.23.1/lib  /nix/store/vc5b00fzi5xhj3r4xrsxwjajcvafww3x-docker-compose-1.23.1/bin
patching script interpreter paths in /nix/store/vc5b00fzi5xhj3r4xrsxwjajcvafww3x-docker-compose-1.23.1
checking for references to /build in /nix/store/vc5b00fzi5xhj3r4xrsxwjajcvafww3x-docker-compose-1.23.1...
wrapping `/nix/store/vc5b00fzi5xhj3r4xrsxwjajcvafww3x-docker-compose-1.23.1/bin/docker-compose'...
/nix/store/vc5b00fzi5xhj3r4xrsxwjajcvafww3x-docker-compose-1.23.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: docker-compose

Partial log (click to expand)

copying path '/nix/store/qi97ddd13z02vizs2cjz59r2yg3i7jr3-python3.6-cached-property-1.4.2' from 'https://cache.nixos.org'...
copying path '/nix/store/22cg8g2np22va8wz1kv8nvdbca834fhp-python3.6-colorama-0.3.9' from 'https://cache.nixos.org'...
copying path '/nix/store/gkai7kzm5dsxi1i71sdxvkz121h4pcqz-python3.6-docker-pycreds-0.3.0' from 'https://cache.nixos.org'...
copying path '/nix/store/1wz64if1cxrxnbcf3gh0dnyx8w56vd0l-python3.6-dockerpty-0.4.1' from 'https://cache.nixos.org'...
copying path '/nix/store/g6xqhicfarlzj4y4bycq2bfh6zh1vwrj-python3.6-jsonschema-2.6.0' from 'https://cache.nixos.org'...
copying path '/nix/store/x2w76lx0zq347i940wkjnss61p3kgklc-python3.6-texttable-1.5.0' from 'https://cache.nixos.org'...
copying path '/nix/store/c8isydh4ibqsi5n6nhzg02v9ilcn0s1v-python3.6-websocket_client-0.51.0' from 'https://cache.nixos.org'...
copying path '/nix/store/439cf7b1gy3qcrfzcwg646p4rqc5k5aw-python3.6-docker-3.5.0' from 'https://cache.nixos.org'...
copying path '/nix/store/smbrk4l8m7hwr2dc172lyh571imhhjwh-docker-compose-1.23.1' from 'https://cache.nixos.org'...
/nix/store/smbrk4l8m7hwr2dc172lyh571imhhjwh-docker-compose-1.23.1

@Mic92 Mic92 merged commit 92c478b into NixOS:master Nov 12, 2018
@Mic92 Mic92 deleted the docker-componse branch November 12, 2018 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants