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: add darwin to platforms #32842

Merged
merged 1 commit into from Dec 22, 2017

Conversation

mbode
Copy link
Contributor

@mbode mbode commented Dec 19, 2017

Motivation for this change

docker_compose should be available on darwin

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@mbode mbode requested a review from FRidh as a code owner December 19, 2017 12:40
@@ -41,7 +41,7 @@ buildPythonApplication rec {
homepage = https://docs.docker.com/compose/;
description = "Multi-container orchestration for Docker";
license = licenses.asl20;
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
Copy link
Member

Choose a reason for hiding this comment

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

the whole line should be removed instead as it is already set to this value by buildPythonPackage

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@FRidh FRidh merged commit e86e984 into NixOS:master Dec 22, 2017
@mbode mbode deleted the docker_compose_darwin branch December 22, 2017 12:27
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