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

grafana: 5.3.2 -> 5.3.4 #50311

Merged
merged 1 commit into from Nov 13, 2018
Merged

grafana: 5.3.2 -> 5.3.4 #50311

merged 1 commit into from Nov 13, 2018

Conversation

WilliButz
Copy link
Member

@WilliButz WilliButz commented Nov 13, 2018 •
edited

Motivation for this change

Includes a closed vulnerability in 5.3.3 and some bugfixes in 5.3.4.
(backported in #50312).

Things done
  • 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
  • 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: grafana

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: grafana

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/dbn76838ghkmdgnhcff2q6n7q5261f78-grafana-5.3.4-bin
shrinking /nix/store/dbn76838ghkmdgnhcff2q6n7q5261f78-grafana-5.3.4-bin/bin/build
shrinking /nix/store/dbn76838ghkmdgnhcff2q6n7q5261f78-grafana-5.3.4-bin/bin/grafana-cli
shrinking /nix/store/dbn76838ghkmdgnhcff2q6n7q5261f78-grafana-5.3.4-bin/bin/grafana-server
shrinking /nix/store/dbn76838ghkmdgnhcff2q6n7q5261f78-grafana-5.3.4-bin/bin/release_publisher
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/dbn76838ghkmdgnhcff2q6n7q5261f78-grafana-5.3.4-bin/bin
patching script interpreter paths in /nix/store/dbn76838ghkmdgnhcff2q6n7q5261f78-grafana-5.3.4-bin
checking for references to /build in /nix/store/dbn76838ghkmdgnhcff2q6n7q5261f78-grafana-5.3.4-bin...
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip

@WilliButz
Copy link
Member Author

@GrahamcOfBorg test grafana

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: tests.grafana

Partial log (click to expand)

Cannot nix-instantiate `tests.grafana' because:
error: while evaluating 'recursiveUpdate' at /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/lib/attrsets.nix:415:26, called from /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/lib/attrsets.nix:148:28:
while evaluating 'recursiveUpdateUntil' at /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/lib/attrsets.nix:384:37, called from /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/lib/attrsets.nix:416:5:
while evaluating 'zipAttrsWith' at /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/lib/attrsets.nix:347:21, called from /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/lib/attrsets.nix:394:8:
while evaluating 'zipAttrsWithNames' at /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/lib/attrsets.nix:332:33, called from /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/lib/attrsets.nix:347:27:
while evaluating the attribute 'grafana' at /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/nixos/tests/all-tests.nix:87:3:
while evaluating 'handleTest' at /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/nixos/tests/all-tests.nix:17:22, called from /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/nixos/tests/all-tests.nix:87:13:
while evaluating 'discoverTests' at /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/nixos/tests/all-tests.nix:13:19, called from /var/lib/gc-of-borg/nix-test-rs-15/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-15/nixos/tests/all-tests.nix:18:5:
access to path '/nix/store/b9rbnpf84xf6xzj403nn0h5pi1mwjysj-grahamc-aarch64-community-15' is forbidden in restricted mode

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: grafana

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/5836d80vsfrk6zh3i7q4vwa11ib3b8c2-grafana-5.3.4-bin
shrinking /nix/store/5836d80vsfrk6zh3i7q4vwa11ib3b8c2-grafana-5.3.4-bin/bin/release_publisher
shrinking /nix/store/5836d80vsfrk6zh3i7q4vwa11ib3b8c2-grafana-5.3.4-bin/bin/build
shrinking /nix/store/5836d80vsfrk6zh3i7q4vwa11ib3b8c2-grafana-5.3.4-bin/bin/grafana-cli
shrinking /nix/store/5836d80vsfrk6zh3i7q4vwa11ib3b8c2-grafana-5.3.4-bin/bin/grafana-server
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/5836d80vsfrk6zh3i7q4vwa11ib3b8c2-grafana-5.3.4-bin/bin
patching script interpreter paths in /nix/store/5836d80vsfrk6zh3i7q4vwa11ib3b8c2-grafana-5.3.4-bin
checking for references to /build in /nix/store/5836d80vsfrk6zh3i7q4vwa11ib3b8c2-grafana-5.3.4-bin...
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: tests.grafana

Partial log (click to expand)

error: while evaluating 'recursiveUpdate' at /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/lib/attrsets.nix:415:26, called from /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/lib/attrsets.nix:148:28:
while evaluating 'recursiveUpdateUntil' at /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/lib/attrsets.nix:384:37, called from /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/lib/attrsets.nix:416:5:
while evaluating 'zipAttrsWith' at /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/lib/attrsets.nix:347:21, called from /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/lib/attrsets.nix:394:8:
while evaluating 'zipAttrsWithNames' at /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/lib/attrsets.nix:332:33, called from /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/lib/attrsets.nix:347:27:
while evaluating anonymous function at /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/lib/lists.nix:113:41, called from /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/lib/attrsets.nix:347:46:
while evaluating the attribute 'grafana' at /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/nixos/tests/all-tests.nix:87:3:
while evaluating 'handleTest' at /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/nixos/tests/all-tests.nix:17:22, called from /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/nixos/tests/all-tests.nix:87:13:
while evaluating 'discoverTests' at /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/nixos/tests/all-tests.nix:13:19, called from /var/lib/gc-of-borg/nix-root/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/gleber-bastion/nixos/tests/all-tests.nix:18:5:
access to path '/nix/store/nsz6b1hs47qlgsphwxycq990xzpv1hgw-gleber-bastion' is forbidden in restricted mode

@WilliButz WilliButz mentioned this pull request Nov 13, 2018
Merged
9 tasks
@timokau timokau merged commit d837beb into NixOS:master Nov 13, 2018
@timokau
Copy link
Member

timokau commented Nov 13, 2018

Thanks for taking care of this!

@WilliButz WilliButz deleted the grafana-update branch November 13, 2018 15:52
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: 0 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
@WilliButz @GrahamcOfBorg @timokau