consul: 0.9.3 -> 1.0.6; also upgrade python-consul... #41243
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
... 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.
|
Hmm I get an error with the |
|
In addition, #41268 created some merge conflicts. |
|
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
added
the
2.status: merge conflict
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
|
Closing in favor of #48714 |
9 tasks
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 <mail@nh2.me>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
... 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
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)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.