-
-
Notifications
You must be signed in to change notification settings - Fork 14.2k
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 #35602
consul: 0.9.3 -> 1.0.6 #35602
Conversation
Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin/bin/consul -h` got 0 exit code - ran `/nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin/bin/consul --help` got 0 exit code - ran `/nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin/bin/consul -v` and found version 1.0.6 - ran `/nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin/bin/consul --version` and found version 1.0.6 - ran `/nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin/bin/consul version` and found version 1.0.6 - found 1.0.6 with grep in /nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin - found 1.0.6 in filename of file in /nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin
@GrahamcOfBorg build consul |
Success on x86_64-darwin (full log) Partial log (click to expand)
|
Success on aarch64-linux (full log) Partial log (click to expand)
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
Worth noting that upgrading to Consul 1.0+ means a collection of breaking changes. |
I also think it's not a trivial update. @pradeepchhetri @nh2 what is your point of view? |
In my own nixpkgs I am already using this (because it promises to fix big issues that take Consul down until restart, like this one), and it's working fine. It does break some things, espeially the strict enforcement of HTTP verbs (e.g. We may want to do the same in nixpkgs, switching to the version in the PR until it's merged upstream. Here's my commit: commit e38b5292a3def39c044fffd33bac28792a3f13a8 (origin/nixos-17.09-benaco)
Author: Niklas Hambüchen <mail@nh2.me>
Date: Wed Feb 14 18:45:34 2018 +0100
consul: 0.9.3 -> 1.0.6; also upgrade python-consul to a PR that can handle Consul >= 1.0
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index d2ad5d0bd8..7230233908 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "consul-${version}";
- version = "0.9.3";
+ version = "1.0.6";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/consul";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "consul";
inherit rev;
- sha256 = "1176frp7kimpycsmz9wrbizf46jgxr8jq7hz5w4q1x90lswvrxv3";
+ sha256 = "06isx7y6nc3305d9bw61738jfmyyh0czshgfdn8dvhdhvxjs5pp2";
};
# Keep consul.ui for backward compatability
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4bf6d17f2c..0189ab7c6d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3078,11 +3078,12 @@ in {
consul = buildPythonPackage (rec {
- name = "python-consul-0.7.0";
+ name = "python-consul-0.7.0-custom-consul-1.0";
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/python-consul/${name}.tar.gz";
- sha256 = "18gs5myk9wkkq5zvj0n0s68ngj3mrbdcifshxfj1j0bgb1km0wpm";
+ src = pkgs.fetchgit {
+ url = "https://github.com/matusvalo/python-consul.git";
+ rev = "6e30e947725fdf88afa0a0a58b7cd8d7d29485f5";
+ sha256 = "1ipazwafw418a6gclzayzzdhyjlkrscj4fjmvjrp04zpb4y4v1pr";
};
buildInputs = with self; [ requests six pytest ]; I didn't have to adjust the consul service in nixpkgs, that one worked out of the box (at least with the settings I use). I haven't checked other languages' bindings in nixpkgs yet. I think it makes sense to ping the maintainers / people involved in other consul bindings and give them a week. In general I'm very much in favour of doing this upgrade, but let's ping all involved binding users and give them a week to respond. I'll do that in a moment. |
The following packages depending on Consul have to be checked for compatibility with Consul 1.0: Let's wait a week for the projects persons pinged here to respond before we go ahead with the upgrade.
Also
|
the terraform plugin is stuck to 0.6.3 on upstream: https://github.com/terraform-providers/terraform-provider-consul/blob/master/vendor/vendor.json#L251 |
I think the older version will have to be kept around for b/c |
Any progress on this? |
I've ticked off the projects that have confirmed compatibility. A big remaining problem for me is python-consul/python-consul#182. I'd be fine to go ahead without more info from the other ones. Would you be OK with using a patched version of |
@nh2 I'm not currently using nixpkgs with Consul or python-consul anymore (but I would most probably be OK with that). |
@nh2 yep, as long as it is documented. |
FYI Consul 1.0.7 was released in the meantime, with another breaking change: hashicorp/consul#3890 Perhaps nixpkgs should list multiple consul versions? |
python-consul/python-consul#182 was merged, we just have to upgrade it in nixpkgs now. With that, my personal blockers would be gone.
I use that but I use nixpkgs stable releases, with fixes cherry-picked on top, not |
#41239 (comment) explains how to update the Ruby dependencies, which is apparently necessary on current nixpkgs |
... 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.
Closing in favor of #44192 |
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>
Semi-automatic update. These checks were performed:
/nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin/bin/consul -h
got 0 exit code/nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin/bin/consul --help
got 0 exit code/nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin/bin/consul -v
and found version 1.0.6/nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin/bin/consul --version
and found version 1.0.6/nix/store/xf97nh84m71qq46s1mqgra1gspszfamb-consul-1.0.6-bin/bin/consul version
and found version 1.0.6