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

nixos/infinoted: Abstract over libinfinity version #39478

Merged
merged 1 commit into from May 1, 2018
Merged

nixos/infinoted: Abstract over libinfinity version #39478

merged 1 commit into from May 1, 2018

Conversation

gkleen
Copy link
Contributor

@gkleen gkleen commented Apr 25, 2018

Motivation for this change

The NixOS service referred to infinoted-0.6 which broke with the bump to 0.7.1.

Things done

Instead of hardcoding 0.6 we now passthru the relevant version and use it to generate the name of the executable.

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

infinisil
infinisil approved these changes Apr 25, 2018
View reviewed changes
Copy link
Member

@infinisil infinisil left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, but why does this package use a different binary name for different versions?

Edit: You need to remove those 7 other commits though, they don't seem to do anything.

@gkleen
Copy link
Contributor Author

gkleen commented Apr 25, 2018 •
edited

@infinisil Upstream has the binary named differently every minor version (presumably so they can coexist in /usr/bin or something)

infinisil
infinisil requested changes Apr 26, 2018
View reviewed changes
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs to be a single commit

@gkleen
Copy link
Contributor Author

gkleen commented Apr 26, 2018 •
edited

@infinisil, did some aggressive squashing.

(The seven unnecessary commits came from commiting on the leftover branch of an older PR and then rebasing while not paying enough attention)

infinisil
infinisil approved these changes Apr 26, 2018
View reviewed changes
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the sound of that, LGTM :)

@matthewbauer matthewbauer merged commit 4e58e23 into NixOS:master May 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil infinisil approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 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
4 participants
@gkleen @infinisil @matthewbauer @GrahamcOfBorg