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

nix: fix conditional so brotli is used w/2.0 builds, needed for logs! #36360

Merged
merged 1 commit into from Mar 6, 2018
Merged

nix: fix conditional so brotli is used w/2.0 builds, needed for logs! #36360

merged 1 commit into from Mar 6, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 5, 2018

cc NixOS/nix#1951

Pretty sure this was always intended for use w/2.0.

Without this, Nix can't view logs from our builders!

(it supports trying to find 'bro' runtime dependency,
but that's messier and has been deprecated as the name
of the brotli utility as of 1.0.0 in Sept 2017)

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

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

running test tests/fetchGit.sh... [SKIP]
running test tests/fetchMercurial.sh... [SKIP]
running test tests/signing.sh... [PASS]
running test tests/run.sh... [PASS]
running test tests/brotli.sh... [PASS]
running test tests/pure-eval.sh... [PASS]
running test tests/check.sh... [PASS]
running test tests/plugins.sh... [PASS]
All tests succeeded
/nix/store/1s3jpakndgah5ac82xazzzysvv7zr6r4-nix-2.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

running test tests/fetchGit.sh... [SKIP]
running test tests/fetchMercurial.sh... [SKIP]
running test tests/signing.sh... [PASS]
running test tests/run.sh... [PASS]
running test tests/brotli.sh... [PASS]
running test tests/pure-eval.sh... [PASS]
running test tests/check.sh... [PASS]
running test tests/plugins.sh... [PASS]
All tests succeeded
/nix/store/v65fnrq64gjkiijb6bjj8h0dx55f01kf-nix-2.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

running test tests/fetchGit.sh... [SKIP]
running test tests/fetchMercurial.sh... [SKIP]
running test tests/signing.sh... [PASS]
running test tests/run.sh... [PASS]
running test tests/brotli.sh... [PASS]
running test tests/pure-eval.sh... [PASS]
running test tests/check.sh... [PASS]
running test tests/plugins.sh... [PASS]
All tests succeeded
/nix/store/2wbmi3qmbs8nsarnyf9vx6yib6h7h9bn-nix-2.0

@dtzWill
Copy link
Member Author

dtzWill commented Mar 5, 2018

cc @vcunat @edolstra -- a)I think changes to Nix package warrant a reviewer beyond the submitter, and b)inclusion in 18.03 please? :)

@edolstra edolstra merged commit 40f9a3e into NixOS:master Mar 6, 2018
vcunat pushed a commit that referenced this pull request Mar 6, 2018
@edolstra @vcunat
Merge pull request #36360 from dtzWill/fix/nix-use-brotli-for-sanity
66a621d 
nix: fix conditional so brotli is used w/2.0 builds, needed for logs!
(cherry picked from commit 40f9a3e)
@vcunat
Copy link
Member

vcunat commented Mar 6, 2018

Picked.

@dtzWill dtzWill mentioned this pull request Mar 22, 2018
Closed
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: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dtzWill @GrahamcOfBorg @vcunat @edolstra