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

prometheus: correctly set version information #40617

Merged
merged 1 commit into from May 16, 2018
Merged

prometheus: correctly set version information #40617

merged 1 commit into from May 16, 2018

Conversation

bachp
Copy link
Member

@bachp bachp commented May 16, 2018

Motivation for this change

The way prometheus expects the version to be set is not what was currently set.

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.

@bachp
prometheus: correctly set version information
5edfe31 
The way prometheus expects the version to be set is not what was currently set.
@xeji
Copy link
Contributor

xeji commented May 16, 2018

@GrahamcOfBorg build prometheus

@xeji
Copy link
Contributor

xeji commented May 16, 2018

@GrahamcOfBorg build prometheus_2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: prometheus

Partial log (click to expand)

checking for references to /build in /nix/store/fsi46ndgwj8p05pgywkdma6pvnpbibzv-prometheus-1.8.1-bin...
shrinking RPATHs of ELF executables and libraries in /nix/store/nxnz4zjm8h31i4fzpawqk15c487b90h4-prometheus-1.8.1
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/nxnz4zjm8h31i4fzpawqk15c487b90h4-prometheus-1.8.1
/nix/store/nxnz4zjm8h31i4fzpawqk15c487b90h4-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/scripts/check_license.sh: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/nxnz4zjm8h31i4fzpawqk15c487b90h4-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkall.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/nxnz4zjm8h31i4fzpawqk15c487b90h4-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkerrors.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/nxnz4zjm8h31i4fzpawqk15c487b90h4-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/appengine/internal/regen.sh: interpreter directive changed from "/bin/bash -e" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash -e"
checking for references to /build in /nix/store/nxnz4zjm8h31i4fzpawqk15c487b90h4-prometheus-1.8.1...
/nix/store/fsi46ndgwj8p05pgywkdma6pvnpbibzv-prometheus-1.8.1-bin

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: prometheus

Partial log (click to expand)

strip is /nix/store/kdff2gim6417493yha769kh00n63lnrw-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/9vpkjch4ivfh0rmi6pp29vb9irpasn0x-prometheus-1.8.1-bin/bin
patching script interpreter paths in /nix/store/9vpkjch4ivfh0rmi6pp29vb9irpasn0x-prometheus-1.8.1-bin
strip is /nix/store/kdff2gim6417493yha769kh00n63lnrw-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/x47fz5lq069gpz8zshjxm832ryhxh9dq-prometheus-1.8.1
/nix/store/x47fz5lq069gpz8zshjxm832ryhxh9dq-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/scripts/check_license.sh: interpreter directive changed from "/bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/x47fz5lq069gpz8zshjxm832ryhxh9dq-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkall.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/bash"
/nix/store/x47fz5lq069gpz8zshjxm832ryhxh9dq-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkerrors.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/bash"
/nix/store/x47fz5lq069gpz8zshjxm832ryhxh9dq-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/appengine/internal/regen.sh: interpreter directive changed from "/bin/bash -e" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/bash -e"
/nix/store/9vpkjch4ivfh0rmi6pp29vb9irpasn0x-prometheus-1.8.1-bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: prometheus

Partial log (click to expand)

checking for references to /build in /nix/store/py459walsjsb22ywcxyc1i5rs08a50l2-prometheus-1.8.1-bin...
shrinking RPATHs of ELF executables and libraries in /nix/store/529q0j1rzcip6gblwwfbkva764bp5x5p-prometheus-1.8.1
strip is /nix/store/jk6j4lh9v5mvjdbdc35sj0zffhhf6s56-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/529q0j1rzcip6gblwwfbkva764bp5x5p-prometheus-1.8.1
/nix/store/529q0j1rzcip6gblwwfbkva764bp5x5p-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/scripts/check_license.sh: interpreter directive changed from "/bin/sh" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/sh"
/nix/store/529q0j1rzcip6gblwwfbkva764bp5x5p-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkall.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/529q0j1rzcip6gblwwfbkva764bp5x5p-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkerrors.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/529q0j1rzcip6gblwwfbkva764bp5x5p-prometheus-1.8.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/appengine/internal/regen.sh: interpreter directive changed from "/bin/bash -e" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash -e"
checking for references to /build in /nix/store/529q0j1rzcip6gblwwfbkva764bp5x5p-prometheus-1.8.1...
/nix/store/py459walsjsb22ywcxyc1i5rs08a50l2-prometheus-1.8.1-bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: prometheus_2

Partial log (click to expand)

patching script interpreter paths in /nix/store/lcjv77linw97aqz03i2d8vvbryaqsgqn-prometheus-2.2.1
/nix/store/lcjv77linw97aqz03i2d8vvbryaqsgqn-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/scripts/check_license.sh: interpreter directive changed from "/bin/sh" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/sh"
/nix/store/lcjv77linw97aqz03i2d8vvbryaqsgqn-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/scripts/genproto.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/lcjv77linw97aqz03i2d8vvbryaqsgqn-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkall.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/lcjv77linw97aqz03i2d8vvbryaqsgqn-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkerrors.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/lcjv77linw97aqz03i2d8vvbryaqsgqn-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/appengine/internal/regen.sh: interpreter directive changed from "/bin/bash -e" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash -e"
/nix/store/lcjv77linw97aqz03i2d8vvbryaqsgqn-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/grpc/codegen.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/lcjv77linw97aqz03i2d8vvbryaqsgqn-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/grpc/coverage.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
checking for references to /build in /nix/store/lcjv77linw97aqz03i2d8vvbryaqsgqn-prometheus-2.2.1...
/nix/store/5rs7ymz04l27p9kz1qylycdr7ic7rnmn-prometheus-2.2.1-bin

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: prometheus_2

Partial log (click to expand)

patching script interpreter paths in /nix/store/x1a8cy5lvkvb58f7p3cdy64362cfzypc-prometheus-2.2.1
/nix/store/x1a8cy5lvkvb58f7p3cdy64362cfzypc-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/scripts/check_license.sh: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
/nix/store/x1a8cy5lvkvb58f7p3cdy64362cfzypc-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/scripts/genproto.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/x1a8cy5lvkvb58f7p3cdy64362cfzypc-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkall.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/x1a8cy5lvkvb58f7p3cdy64362cfzypc-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkerrors.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/x1a8cy5lvkvb58f7p3cdy64362cfzypc-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/grpc/codegen.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/x1a8cy5lvkvb58f7p3cdy64362cfzypc-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/grpc/coverage.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/x1a8cy5lvkvb58f7p3cdy64362cfzypc-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/appengine/internal/regen.sh: interpreter directive changed from "/bin/bash -e" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash -e"
checking for references to /build in /nix/store/x1a8cy5lvkvb58f7p3cdy64362cfzypc-prometheus-2.2.1...
/nix/store/7rp38qfban62lxigamynxk2956z8zfdp-prometheus-2.2.1-bin

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: prometheus_2

Partial log (click to expand)

strip is /nix/store/kdff2gim6417493yha769kh00n63lnrw-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/0ikap5sgkf5wj4s09yhqdbsiigw3i78w-prometheus-2.2.1
/nix/store/0ikap5sgkf5wj4s09yhqdbsiigw3i78w-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/scripts/check_license.sh: interpreter directive changed from "/bin/sh" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/sh"
/nix/store/0ikap5sgkf5wj4s09yhqdbsiigw3i78w-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/scripts/genproto.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/bash"
/nix/store/0ikap5sgkf5wj4s09yhqdbsiigw3i78w-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkall.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/bash"
/nix/store/0ikap5sgkf5wj4s09yhqdbsiigw3i78w-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/golang.org/x/sys/unix/mkerrors.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/bash"
/nix/store/0ikap5sgkf5wj4s09yhqdbsiigw3i78w-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/appengine/internal/regen.sh: interpreter directive changed from "/bin/bash -e" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/bash -e"
/nix/store/0ikap5sgkf5wj4s09yhqdbsiigw3i78w-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/grpc/codegen.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/bash"
/nix/store/0ikap5sgkf5wj4s09yhqdbsiigw3i78w-prometheus-2.2.1/share/go/src/github.com/prometheus/prometheus/vendor/google.golang.org/grpc/coverage.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/r8bx3qf1bpncb14i9gzma4vr089pc3pv-bash-4.4-p19/bin/bash"
/nix/store/sfav8xc7d6gqgmqlgm36w4xi42j43zf0-prometheus-2.2.1-bin

@xeji xeji merged commit 13ceaf6 into NixOS:master May 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
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
@bachp @xeji @GrahamcOfBorg