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

consul: 0.9.3 -> 1.2.2 #44192

Closed
wants to merge 1 commit into from
Closed

consul: 0.9.3 -> 1.2.2 #44192

wants to merge 1 commit into from

Conversation

erincandescent
Copy link
Contributor

0.8.3 is ~a year out of date

This doesn't touch the web UI; I'm going to look into into
packaging the new webUI in the near future. The existing webUI
package fails to build on 18.03 anyhow. (The Consul Web UI has
been completely rewritten between 0.8.3 and 1.2.1)

  • 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
  • T ested 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.

Mic92
Mic92 reviewed Jul 30, 2018
View reviewed changes
pkgs/servers/consul/default.nix Outdated
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, consul-ui, fetchFromGitHub }:
{ stdenv, buildGo110Package, consul-ui, fetchFromGitHub }:
Copy link
Member

Choose a reason for hiding this comment

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

buildGoPackage is the same as buildGo110Package in master.

@Mic92
Copy link
Member

Mic92 commented Jul 30, 2018

cc @offlinehacker

offlinehacker
offlinehacker reviewed Jul 30, 2018
View reviewed changes
Copy link
Contributor

@offlinehacker offlinehacker left a comment

Choose a reason for hiding this comment

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

Does nixos module work with update?

@erincandescent
Copy link
Contributor Author

The NixOS module works (that's how I tested it). I presume I should amend this commit to switch back to buildGoPackage?

@Mic92
Copy link
Member

Mic92 commented Jul 30, 2018

Yes. Please revert the buildGoPackage thing. Otherwise upgrading go becomes harder.

@xeji xeji changed the title consul: 0.8.3 -> 1.2.1 consul: 0.9.3 -> 1.2.1 Aug 5, 2018
@xeji
Copy link
Contributor

xeji commented Aug 5, 2018

(modified the title because we currently have 0.9.3)

@erincandescent erincandescent changed the title consul: 0.9.3 -> 1.2.1 consul: 0.9.3 -> 1.2.2 Aug 19, 2018
@xeji
Copy link
Contributor

xeji commented Aug 19, 2018

@GrahamcOfBorg build consul

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: consul

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/dwwikf9ww7zycwmlfw3d8a1nrjdrnldd-consul-1.2.2-bin
shrinking /nix/store/dwwikf9ww7zycwmlfw3d8a1nrjdrnldd-consul-1.2.2-bin/bin/certgen
shrinking /nix/store/dwwikf9ww7zycwmlfw3d8a1nrjdrnldd-consul-1.2.2-bin/bin/consul
strip is /nix/store/4md2i310zklkkl5j41yw70gcwgn4kav5-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/dwwikf9ww7zycwmlfw3d8a1nrjdrnldd-consul-1.2.2-bin/bin
patching script interpreter paths in /nix/store/dwwikf9ww7zycwmlfw3d8a1nrjdrnldd-consul-1.2.2-bin
checking for references to /build in /nix/store/dwwikf9ww7zycwmlfw3d8a1nrjdrnldd-consul-1.2.2-bin...
strip is /nix/store/4md2i310zklkkl5j41yw70gcwgn4kav5-binutils-2.30/bin/strip
/nix/store/dwwikf9ww7zycwmlfw3d8a1nrjdrnldd-consul-1.2.2-bin

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: consul

Partial log (click to expand)

find: '/nix/store/4h2big7qgnb3cqpmj6zfp44ifncd9mjk-consul-1.2.2': No such file or directory
find: '/nix/store/4h2big7qgnb3cqpmj6zfp44ifncd9mjk-consul-1.2.2': No such file or directory
find: '/nix/store/4h2big7qgnb3cqpmj6zfp44ifncd9mjk-consul-1.2.2': No such file or directory
find: '/nix/store/4h2big7qgnb3cqpmj6zfp44ifncd9mjk-consul-1.2.2': No such file or directory
find: '/nix/store/4h2big7qgnb3cqpmj6zfp44ifncd9mjk-consul-1.2.2': No such file or directory
find: '/nix/store/4h2big7qgnb3cqpmj6zfp44ifncd9mjk-consul-1.2.2': No such file or directory
find: '/nix/store/4h2big7qgnb3cqpmj6zfp44ifncd9mjk-consul-1.2.2': No such file or directory
find: '/nix/store/4h2big7qgnb3cqpmj6zfp44ifncd9mjk-consul-1.2.2': No such file or directory
find: '/nix/store/4h2big7qgnb3cqpmj6zfp44ifncd9mjk-consul-1.2.2': No such file or directory
/nix/store/7qspigjmxi263a1sg0abbyhqbml4zh47-consul-1.2.2-bin

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: consul

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/0sxkvhvr33kqzw8s4kn7p45vwhfpfhd3-consul-1.2.2-bin
shrinking /nix/store/0sxkvhvr33kqzw8s4kn7p45vwhfpfhd3-consul-1.2.2-bin/bin/certgen
shrinking /nix/store/0sxkvhvr33kqzw8s4kn7p45vwhfpfhd3-consul-1.2.2-bin/bin/consul
strip is /nix/store/553rihc190vsyy8b22iqcq25a6489h8y-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/0sxkvhvr33kqzw8s4kn7p45vwhfpfhd3-consul-1.2.2-bin/bin
patching script interpreter paths in /nix/store/0sxkvhvr33kqzw8s4kn7p45vwhfpfhd3-consul-1.2.2-bin
checking for references to /build in /nix/store/0sxkvhvr33kqzw8s4kn7p45vwhfpfhd3-consul-1.2.2-bin...
strip is /nix/store/553rihc190vsyy8b22iqcq25a6489h8y-binutils-2.30/bin/strip
/nix/store/0sxkvhvr33kqzw8s4kn7p45vwhfpfhd3-consul-1.2.2-bin

@xeji
Copy link
Contributor

xeji commented Aug 19, 2018

See also #35602 and #41243 and the comments there. cc @nh2

@xeji xeji mentioned this pull request Aug 28, 2018
Closed
@jbboehr
Copy link
Contributor

jbboehr commented Aug 28, 2018

#41268 should've fixed the UI, unless it's failing again

@c0bw3b c0bw3b mentioned this pull request Oct 19, 2018
Closed
9 tasks
@c0bw3b
Copy link
Contributor

c0bw3b commented Oct 19, 2018

Let's close this one for now, new effort with v1.3.0 in #48714

@c0bw3b c0bw3b closed this Oct 19, 2018
@nh2 nh2 mentioned this pull request Oct 26, 2018
Merged
9 tasks
nh2 added a commit to nh2/nixpkgs that referenced this pull request Nov 3, 2018
@nh2
consul: 0.9.3 -> 1.3.0.
2cb7f5f 
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
Reviewers

@Mic92 Mic92 Mic92 left review comments

@offlinehacker offlinehacker offlinehacker left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@erincandescent @Mic92 @xeji @GrahamcOfBorg @jbboehr @c0bw3b @offlinehacker @Janik-Haag