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.

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

trinity: small clean up #62165

Merged
merged 1 commit into from Jun 4, 2019
Merged

trinity: small clean up #62165

merged 1 commit into from Jun 4, 2019

Conversation

infinisil
Copy link
Member

This also fixes the build with kernelslacker/trinity@a5f32b9

Ping @dezgeg

Motivation for this change
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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from dezgeg May 28, 2019 19:29
@Ma27
Copy link
Member

Ma27 commented Jun 4, 2019

Built and tested locally 👍
@infinisil can you rebase onto the latest master to resolve the current merge conflict?

@infinisil infinisil changed the title trinity: 1.8-git-2018-06-08 -> 1.9 trinity: small clean up Jun 4, 2019
@infinisil infinisil mentioned this pull request Jun 4, 2019
Merged
10 tasks
@infinisil
Copy link
Member Author

@Ma27 Done that

@Ma27 Ma27 merged commit 5940f6b into NixOS:master Jun 4, 2019
@Ma27
Copy link
Member

Ma27 commented Jun 4, 2019

@infinisil thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dezgeg dezgeg Awaiting requested review from dezgeg

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
2 participants
@infinisil @Ma27