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: 2017.7.2 -> 2017.7.4, fix msgpack dependency #35891

Merged
merged 2 commits into from Apr 15, 2018
Merged

salt: 2017.7.2 -> 2017.7.4, fix msgpack dependency #35891

merged 2 commits into from Apr 15, 2018

Conversation

aneeshusa
Copy link
Contributor

Motivation for this change

Fix Salt build. Bump Salt to the latest release.

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.

It looks like this package was missed in #34809; the latest (2017.7.3) still seems to require msgpack-python.
cc @danbst and @PierreR as Salt users: I won't be able to test this thoroughly for a bit, could you give this branch a spin and report how it goes?

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

wrapping `/nix/store/ihq32lyyy8lmpwv38v6qb3v1yswkrqgv-salt-2017.7.3/bin/salt-cp'...
wrapping `/nix/store/ihq32lyyy8lmpwv38v6qb3v1yswkrqgv-salt-2017.7.3/bin/salt-key'...
wrapping `/nix/store/ihq32lyyy8lmpwv38v6qb3v1yswkrqgv-salt-2017.7.3/bin/salt-master'...
wrapping `/nix/store/ihq32lyyy8lmpwv38v6qb3v1yswkrqgv-salt-2017.7.3/bin/salt-minion'...
wrapping `/nix/store/ihq32lyyy8lmpwv38v6qb3v1yswkrqgv-salt-2017.7.3/bin/salt-proxy'...
wrapping `/nix/store/ihq32lyyy8lmpwv38v6qb3v1yswkrqgv-salt-2017.7.3/bin/salt-run'...
wrapping `/nix/store/ihq32lyyy8lmpwv38v6qb3v1yswkrqgv-salt-2017.7.3/bin/salt-ssh'...
wrapping `/nix/store/ihq32lyyy8lmpwv38v6qb3v1yswkrqgv-salt-2017.7.3/bin/salt-syndic'...
wrapping `/nix/store/ihq32lyyy8lmpwv38v6qb3v1yswkrqgv-salt-2017.7.3/bin/salt-unity'...
wrapping `/nix/store/ihq32lyyy8lmpwv38v6qb3v1yswkrqgv-salt-2017.7.3/bin/spm'...

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

wrapping `/nix/store/aqc01da8hwjhnaqh8zfnpbgxgnqw3p65-salt-2017.7.3/bin/salt-key'...
wrapping `/nix/store/aqc01da8hwjhnaqh8zfnpbgxgnqw3p65-salt-2017.7.3/bin/salt-proxy'...
wrapping `/nix/store/aqc01da8hwjhnaqh8zfnpbgxgnqw3p65-salt-2017.7.3/bin/salt-syndic'...
wrapping `/nix/store/aqc01da8hwjhnaqh8zfnpbgxgnqw3p65-salt-2017.7.3/bin/salt-cp'...
wrapping `/nix/store/aqc01da8hwjhnaqh8zfnpbgxgnqw3p65-salt-2017.7.3/bin/salt-cloud'...
wrapping `/nix/store/aqc01da8hwjhnaqh8zfnpbgxgnqw3p65-salt-2017.7.3/bin/salt-unity'...
wrapping `/nix/store/aqc01da8hwjhnaqh8zfnpbgxgnqw3p65-salt-2017.7.3/bin/spm'...
wrapping `/nix/store/aqc01da8hwjhnaqh8zfnpbgxgnqw3p65-salt-2017.7.3/bin/salt-minion'...
wrapping `/nix/store/aqc01da8hwjhnaqh8zfnpbgxgnqw3p65-salt-2017.7.3/bin/salt-api'...
wrapping `/nix/store/aqc01da8hwjhnaqh8zfnpbgxgnqw3p65-salt-2017.7.3/bin/salt-call'...

dotlambda
dotlambda requested changes Feb 27, 2018
View reviewed changes
pkgs/tools/admin/salt/default.nix Outdated
@@ -8,19 +8,19 @@

python2Packages.buildPythonApplication rec {
pname = "salt";
version = "2017.7.2";
version = "2017.7.3";
name = "${pname}-${version}";
Copy link
Member

Choose a reason for hiding this comment

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

Please remove name, it is not needed for buildPython*

@dotlambda
Copy link
Member

There is a 2017.7.4 version: https://pypi.org/project/salt/

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

wrapping `/nix/store/nmnr96s4im3h0c4gqbcxr0nskf4ypz51-salt-2017.7.3/bin/salt-cp'...
wrapping `/nix/store/nmnr96s4im3h0c4gqbcxr0nskf4ypz51-salt-2017.7.3/bin/salt-api'...
wrapping `/nix/store/nmnr96s4im3h0c4gqbcxr0nskf4ypz51-salt-2017.7.3/bin/salt-call'...
wrapping `/nix/store/nmnr96s4im3h0c4gqbcxr0nskf4ypz51-salt-2017.7.3/bin/salt-key'...
wrapping `/nix/store/nmnr96s4im3h0c4gqbcxr0nskf4ypz51-salt-2017.7.3/bin/salt-master'...
wrapping `/nix/store/nmnr96s4im3h0c4gqbcxr0nskf4ypz51-salt-2017.7.3/bin/salt-minion'...
wrapping `/nix/store/nmnr96s4im3h0c4gqbcxr0nskf4ypz51-salt-2017.7.3/bin/salt-unity'...
wrapping `/nix/store/nmnr96s4im3h0c4gqbcxr0nskf4ypz51-salt-2017.7.3/bin/salt-run'...
wrapping `/nix/store/nmnr96s4im3h0c4gqbcxr0nskf4ypz51-salt-2017.7.3/bin/salt-proxy'...
/nix/store/nmnr96s4im3h0c4gqbcxr0nskf4ypz51-salt-2017.7.3

@aneeshusa aneeshusa force-pushed the fix-salt-msgpack-dependency branch from 9e90c9b to e797e00 Compare March 4, 2018 07:53
@aneeshusa aneeshusa changed the title salt: 2017.7.2 -> 2017.7.3, fix msgpack dependency salt: 2017.7.2 -> 2017.7.4, fix msgpack dependency Mar 4, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

wrapping `/nix/store/7amh97g785ld6glca4ygzhghj4anwsq1-salt-2017.7.4/bin/salt-proxy'...
wrapping `/nix/store/7amh97g785ld6glca4ygzhghj4anwsq1-salt-2017.7.4/bin/salt-run'...
wrapping `/nix/store/7amh97g785ld6glca4ygzhghj4anwsq1-salt-2017.7.4/bin/salt-minion'...
wrapping `/nix/store/7amh97g785ld6glca4ygzhghj4anwsq1-salt-2017.7.4/bin/salt'...
wrapping `/nix/store/7amh97g785ld6glca4ygzhghj4anwsq1-salt-2017.7.4/bin/salt-master'...
wrapping `/nix/store/7amh97g785ld6glca4ygzhghj4anwsq1-salt-2017.7.4/bin/salt-syndic'...
wrapping `/nix/store/7amh97g785ld6glca4ygzhghj4anwsq1-salt-2017.7.4/bin/salt-call'...
wrapping `/nix/store/7amh97g785ld6glca4ygzhghj4anwsq1-salt-2017.7.4/bin/salt-cloud'...
wrapping `/nix/store/7amh97g785ld6glca4ygzhghj4anwsq1-salt-2017.7.4/bin/salt-key'...
wrapping `/nix/store/7amh97g785ld6glca4ygzhghj4anwsq1-salt-2017.7.4/bin/salt-cp'...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

wrapping `/nix/store/gwki1y18ak86qk3sr0cn9bc6hp3f38cy-salt-2017.7.4/bin/salt-cp'...
wrapping `/nix/store/gwki1y18ak86qk3sr0cn9bc6hp3f38cy-salt-2017.7.4/bin/salt-api'...
wrapping `/nix/store/gwki1y18ak86qk3sr0cn9bc6hp3f38cy-salt-2017.7.4/bin/salt-call'...
wrapping `/nix/store/gwki1y18ak86qk3sr0cn9bc6hp3f38cy-salt-2017.7.4/bin/salt-key'...
wrapping `/nix/store/gwki1y18ak86qk3sr0cn9bc6hp3f38cy-salt-2017.7.4/bin/salt-master'...
wrapping `/nix/store/gwki1y18ak86qk3sr0cn9bc6hp3f38cy-salt-2017.7.4/bin/salt-minion'...
wrapping `/nix/store/gwki1y18ak86qk3sr0cn9bc6hp3f38cy-salt-2017.7.4/bin/salt-unity'...
wrapping `/nix/store/gwki1y18ak86qk3sr0cn9bc6hp3f38cy-salt-2017.7.4/bin/salt-run'...
wrapping `/nix/store/gwki1y18ak86qk3sr0cn9bc6hp3f38cy-salt-2017.7.4/bin/salt-proxy'...
/nix/store/gwki1y18ak86qk3sr0cn9bc6hp3f38cy-salt-2017.7.4

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

wrapping `/nix/store/qr4jswpj3mzq6vdhj5zv1mbyd4gzirz9-salt-2017.7.4/bin/salt-master'...
wrapping `/nix/store/qr4jswpj3mzq6vdhj5zv1mbyd4gzirz9-salt-2017.7.4/bin/spm'...
wrapping `/nix/store/qr4jswpj3mzq6vdhj5zv1mbyd4gzirz9-salt-2017.7.4/bin/salt-call'...
wrapping `/nix/store/qr4jswpj3mzq6vdhj5zv1mbyd4gzirz9-salt-2017.7.4/bin/salt-proxy'...
wrapping `/nix/store/qr4jswpj3mzq6vdhj5zv1mbyd4gzirz9-salt-2017.7.4/bin/salt-syndic'...
wrapping `/nix/store/qr4jswpj3mzq6vdhj5zv1mbyd4gzirz9-salt-2017.7.4/bin/salt-cloud'...
wrapping `/nix/store/qr4jswpj3mzq6vdhj5zv1mbyd4gzirz9-salt-2017.7.4/bin/salt-key'...
wrapping `/nix/store/qr4jswpj3mzq6vdhj5zv1mbyd4gzirz9-salt-2017.7.4/bin/salt-cp'...
wrapping `/nix/store/qr4jswpj3mzq6vdhj5zv1mbyd4gzirz9-salt-2017.7.4/bin/salt'...
wrapping `/nix/store/qr4jswpj3mzq6vdhj5zv1mbyd4gzirz9-salt-2017.7.4/bin/salt-unity'...

@aneeshusa aneeshusa mentioned this pull request Mar 4, 2018
Merged
@aneeshusa
Copy link
Contributor Author

Thanks for the review @dotlambda, updated the PR. (I did build locally but still won't be able to test for a while.)

@xeji xeji mentioned this pull request Mar 8, 2018
Closed
8 tasks
@dotlambda
Copy link
Member

@aneeshusa Did you test yet?

@xeji xeji mentioned this pull request Apr 11, 2018
Closed
@dotlambda dotlambda merged commit d727108 into NixOS:master Apr 15, 2018
@dotlambda
Copy link
Member

dotlambda commented Apr 15, 2018 •
edited

salt is still broken on master due to saltstack/salt#45790

@dotlambda
Copy link
Member

backported in bd1583b and ad77137

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

@dotlambda dotlambda dotlambda requested changes

Assignees
No one assigned
Labels
6.topic: python 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
3 participants
@aneeshusa @GrahamcOfBorg @dotlambda