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

consul: 0.9.3 -> 1.0.6; also upgrade python-consul... #41243

Closed
wants to merge 1 commit into from

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented May 30, 2018

... to a version that can handle Consul >= 1.0.

See #35602 (comment)

Upgrading consul also requires upgrading the Ruby deps, see
#41239 (comment)

Also add instructions on how to do that, and a small patch
to improve the error message when it is forgotten.

Motivation for this change
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.

This is intended to replace and improve upon PRs #35602 and #41239.

First check with their corresponding authors that they agree, then merge this one.

... to a version that can handle Consul >= 1.0.

See NixOS#35602 (comment)

Upgrading consul also requires upgrading the Ruby deps, see
NixOS#41239 (comment)

Also add instructions on how to do that, and a small patch
to improve the error message when it is forgotten.

I had to manually bump the Ruby `json` dependency from the generated
`1.8.2` to `1.8.5` to work around the
  ‘rb_cFixnum’ undeclared
problem as shown on
https://community.bitnami.com/t/gem-file-dependencies/50552.
@nh2
Copy link
Contributor Author

nh2 commented May 30, 2018

Hmm I get an error with the json gem now. Hang on.

@xeji
Copy link
Contributor

xeji commented May 31, 2018

In addition, #41268 created some merge conflicts.

@xeji
Copy link
Contributor

xeji commented May 31, 2018

Closes #35602

andrew-d added a commit to andrew-d/nixpkgs that referenced this pull request Jun 10, 2018
This is a rollup of the following commits/PRs, in the listed order:
  ab557fc
  2c14093
  NixOS#41243
@xeji xeji added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 11, 2018
@xeji xeji mentioned this pull request Aug 19, 2018
9 tasks
andrew-d added a commit to andrew-d/nixpkgs that referenced this pull request Sep 22, 2018
This is a rollup of the following commits/PRs, in the listed order:
  ab557fc
  2c14093
  NixOS#41243
@c0bw3b c0bw3b mentioned this pull request Oct 19, 2018
9 tasks
@c0bw3b
Copy link
Contributor

c0bw3b commented Oct 19, 2018

Closing in favor of #48714

@c0bw3b c0bw3b closed this Oct 19, 2018
nh2 added a commit to nh2/nixpkgs that referenced this pull request Nov 3, 2018
Removes the old UI build tooling; it is no longer necessary
because as of 1.2.0 it's bundled into the server binary.
It doesn't even need to have JS built, because it's bundled into
the release commit's source tree (see NixOS#48714).

The UI is enabled by default, so the NixOS service is
updated to directly use `ui = webUi;` now.

Fixes NixOS#48714.
Fixes NixOS#44192.
Fixes NixOS#41243.
Fixes NixOS#35602.

Signed-off-by: Niklas Hambüchen <[email protected]>
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.

4 participants