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.

Sign up for GitHub

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

Jump to bottom

salt: fix darwin build by specifying dependency on tornado 4 #46687

Merged
merged 1 commit into from Sep 15, 2018
Merged

salt: fix darwin build by specifying dependency on tornado 4 #46687

merged 1 commit into from Sep 15, 2018

Conversation

mbode
Copy link
Contributor

@mbode mbode commented Sep 15, 2018 •
edited

/cc ZHF #45961

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.

@mbode mbode requested a review from FRidh as a code owner September 15, 2018 08:10
@xeji
Copy link
Contributor

xeji commented Sep 15, 2018

@GrahamcOfBorg build python36Packages.tornado_4 python27Packages.tornado_4 salt

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python36Packages.tornado_4, python27Packages.tornado_4, salt

Partial log (click to expand)

wrapping `/nix/store/ns2nsx1yzxkpi4cx3wqcra9ifn74i0jb-salt-2018.3.2/bin/salt-run'...
wrapping `/nix/store/ns2nsx1yzxkpi4cx3wqcra9ifn74i0jb-salt-2018.3.2/bin/salt-ssh'...
wrapping `/nix/store/ns2nsx1yzxkpi4cx3wqcra9ifn74i0jb-salt-2018.3.2/bin/salt-master'...
wrapping `/nix/store/ns2nsx1yzxkpi4cx3wqcra9ifn74i0jb-salt-2018.3.2/bin/salt-api'...
wrapping `/nix/store/ns2nsx1yzxkpi4cx3wqcra9ifn74i0jb-salt-2018.3.2/bin/salt-syndic'...
wrapping `/nix/store/ns2nsx1yzxkpi4cx3wqcra9ifn74i0jb-salt-2018.3.2/bin/spm'...
wrapping `/nix/store/ns2nsx1yzxkpi4cx3wqcra9ifn74i0jb-salt-2018.3.2/bin/salt-unity'...
wrapping `/nix/store/ns2nsx1yzxkpi4cx3wqcra9ifn74i0jb-salt-2018.3.2/bin/salt-call'...
wrapping `/nix/store/ns2nsx1yzxkpi4cx3wqcra9ifn74i0jb-salt-2018.3.2/bin/salt-cloud'...
wrapping `/nix/store/ns2nsx1yzxkpi4cx3wqcra9ifn74i0jb-salt-2018.3.2/bin/salt-minion'...

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: python36Packages.tornado_4, python27Packages.tornado_4, salt

Partial log (click to expand)

wrapping `/nix/store/qf0vyl95f5in1d9p1bpinksb2kz0fdqa-salt-2018.3.2/bin/salt-proxy'...
wrapping `/nix/store/qf0vyl95f5in1d9p1bpinksb2kz0fdqa-salt-2018.3.2/bin/salt-run'...
wrapping `/nix/store/qf0vyl95f5in1d9p1bpinksb2kz0fdqa-salt-2018.3.2/bin/salt-minion'...
wrapping `/nix/store/qf0vyl95f5in1d9p1bpinksb2kz0fdqa-salt-2018.3.2/bin/salt'...
wrapping `/nix/store/qf0vyl95f5in1d9p1bpinksb2kz0fdqa-salt-2018.3.2/bin/salt-master'...
wrapping `/nix/store/qf0vyl95f5in1d9p1bpinksb2kz0fdqa-salt-2018.3.2/bin/salt-syndic'...
wrapping `/nix/store/qf0vyl95f5in1d9p1bpinksb2kz0fdqa-salt-2018.3.2/bin/salt-call'...
wrapping `/nix/store/qf0vyl95f5in1d9p1bpinksb2kz0fdqa-salt-2018.3.2/bin/salt-cloud'...
wrapping `/nix/store/qf0vyl95f5in1d9p1bpinksb2kz0fdqa-salt-2018.3.2/bin/salt-key'...
wrapping `/nix/store/qf0vyl95f5in1d9p1bpinksb2kz0fdqa-salt-2018.3.2/bin/salt-cp'...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python36Packages.tornado_4, python27Packages.tornado_4, salt

Partial log (click to expand)

wrapping `/nix/store/3vgm6fgif5rnw58f2p0wbpkx7nj3qd1z-salt-2018.3.2/bin/salt-call'...
wrapping `/nix/store/3vgm6fgif5rnw58f2p0wbpkx7nj3qd1z-salt-2018.3.2/bin/salt-key'...
wrapping `/nix/store/3vgm6fgif5rnw58f2p0wbpkx7nj3qd1z-salt-2018.3.2/bin/salt'...
wrapping `/nix/store/3vgm6fgif5rnw58f2p0wbpkx7nj3qd1z-salt-2018.3.2/bin/salt-minion'...
wrapping `/nix/store/3vgm6fgif5rnw58f2p0wbpkx7nj3qd1z-salt-2018.3.2/bin/salt-cloud'...
wrapping `/nix/store/3vgm6fgif5rnw58f2p0wbpkx7nj3qd1z-salt-2018.3.2/bin/salt-run'...
wrapping `/nix/store/3vgm6fgif5rnw58f2p0wbpkx7nj3qd1z-salt-2018.3.2/bin/salt-proxy'...
/nix/store/q7s3kyks69dmsj3ib0hyhc171g43db2w-python3.6-tornado-4.5.3
/nix/store/nxsbmpwr0ay8l0dqj1misry14jixamh2-python2.7-tornado-4.5.3
/nix/store/3vgm6fgif5rnw58f2p0wbpkx7nj3qd1z-salt-2018.3.2

@xeji xeji merged commit b78348d into NixOS:master Sep 15, 2018
@xeji
Copy link
Contributor

xeji commented Sep 15, 2018

backported: 14ccf33

@FRidh
Copy link
Member

FRidh commented Sep 15, 2018

Please move Tornado 4.5 into the salt expression.

@xeji
Copy link
Contributor

xeji commented Sep 15, 2018

Yes, that's better. Sorry I missed that.

@mbode mbode deleted the salt_darwin branch September 22, 2018 08:01
@dotlambda
Copy link
Member

Please move Tornado 4.5 into the salt expression.

Why hasn't this been done yet? It's now used by many more applications which all should use packageOverrides instead!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: python 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mbode @xeji @GrahamcOfBorg @FRidh @dotlambda