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

journaldriver: 1.0.0 -> 1.1.0 #48106

Merged
merged 1 commit into from Oct 9, 2018
Merged

journaldriver: 1.0.0 -> 1.1.0 #48106

merged 1 commit into from Oct 9, 2018

Conversation

tazjin
Copy link
Member

@tazjin tazjin commented Oct 9, 2018 •
edited

Motivation for this change
  • new upstream release
  • upstream repository has moved, URLs changed accordingly

The new release includes an important workaround/fix for an issue that could cause log-forwarding to fail after service restarts due to invalid journal cursors being persisted.

Journaldriver was included in 18.09 - is it possible to get this version bump backported for that fix?

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.

@tazjin
journaldriver: 1.0.0 -> 1.1.0
d761c9b 
Included changes:

* upstream repository has moved, URLs changed accordingly
* journaldriver bumped to new upstream release

The new release includes an important workaround for an issue that
could cause log-forwarding to fail after service restarts due to
invalid journal cursors being persisted.
@tazjin
Copy link
Member Author

tazjin commented Oct 9, 2018

Update: rustc is now cached and I actually ran the build on top of master, everything works fine! 👌

@xeji
Copy link
Contributor

xeji commented Oct 9, 2018

@GrahamcOfBorg build journaldriver

@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: journaldriver

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 aarch64-linux (full log)

Attempted: journaldriver

Partial log (click to expand)


installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/g520p44plv3r0xczhwky4c08xbh8v5h8-journaldriver-1.1.0
shrinking /nix/store/g520p44plv3r0xczhwky4c08xbh8v5h8-journaldriver-1.1.0/bin/journaldriver
strip is /nix/store/428gs2z4b8f9byvghzlpbjwjb3a7jwxx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/g520p44plv3r0xczhwky4c08xbh8v5h8-journaldriver-1.1.0/bin
patching script interpreter paths in /nix/store/g520p44plv3r0xczhwky4c08xbh8v5h8-journaldriver-1.1.0
checking for references to /build in /nix/store/g520p44plv3r0xczhwky4c08xbh8v5h8-journaldriver-1.1.0...
/nix/store/g520p44plv3r0xczhwky4c08xbh8v5h8-journaldriver-1.1.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: journaldriver

Partial log (click to expand)


installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/nxj1pgykadc4wipn4xj8xywfjz76l833-journaldriver-1.1.0
shrinking /nix/store/nxj1pgykadc4wipn4xj8xywfjz76l833-journaldriver-1.1.0/bin/journaldriver
strip is /nix/store/dxf1m7dhc4qb655bdljc1fsd74v1nag3-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/nxj1pgykadc4wipn4xj8xywfjz76l833-journaldriver-1.1.0/bin
patching script interpreter paths in /nix/store/nxj1pgykadc4wipn4xj8xywfjz76l833-journaldriver-1.1.0
checking for references to /build in /nix/store/nxj1pgykadc4wipn4xj8xywfjz76l833-journaldriver-1.1.0...
/nix/store/nxj1pgykadc4wipn4xj8xywfjz76l833-journaldriver-1.1.0

@xeji xeji merged commit 5ead273 into NixOS:master Oct 9, 2018
xeji pushed a commit that referenced this pull request Oct 9, 2018
@xeji
journaldriver: 1.0.0 -> 1.1.0 (#48106)
59fe4c7 
Included changes:

* upstream repository has moved, URLs changed accordingly
* journaldriver bumped to new upstream release

The new release includes an important workaround for an issue that
could cause log-forwarding to fail after service restarts due to
invalid journal cursors being persisted.

(cherry picked from commit 5ead273)

backported because of moved upstream repo
@xeji
Copy link
Contributor

xeji commented Oct 9, 2018

backported in 18.09 because of moved upstream repo: 59fe4c7

@tazjin
Copy link
Member Author

tazjin commented Oct 9, 2018

Thanks a ton @xeji!

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
6.topic: nixos 8.has: module (update) 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
@tazjin @xeji @GrahamcOfBorg