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

direwolf: 1.2 -> 1.3 #24105

Closed
wants to merge 1 commit into from
Closed

direwolf: 1.2 -> 1.3 #24105

wants to merge 1 commit into from

Conversation

ndowens
Copy link
Contributor

@ndowens ndowens commented Mar 20, 2017

Motivation for this change

Update

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

@mention-bot
Copy link

@ndowens, thanks for your PR! By analyzing the history of the files in this pull request, we identified @the-kenny and @zimbatm to be potential reviewers.

@ndowens
Copy link
Contributor Author

ndowens commented Mar 20, 2017

@LnL7 Can you see if this works on Darwin? Patched the makefiles for correct output and changed to unix, in hopes it will work; Don't want to merge until I know :)

};

buildInputs = [
unzip alsaLib
alsaLib espeak perl python
Copy link
Member

Choose a reason for hiding this comment

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

alsaLib is a linux only dependency. But it should work fine on other platforms without it, using something like this:

] ++ stdenv.lib.optional stdenv.isLinux alsaLib;

alaLib as optional

Remove extra stdenv.lib
@ndowens
Copy link
Contributor Author

ndowens commented Mar 20, 2017

There is only one binary that doesn't run; it needs adafruit_ads1x15 i believe; So if any one of you want to package that, this will work; otherwise I believe this one works more than what is in the repo; Maybe

unzip alsaLib
];
espeak perl python
] optional stdenv.isLinux alsaLib;
Copy link
Member

Choose a reason for hiding this comment

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

Does the updated version evaluate? Looks like a typo (missed ++ and I would probably put parentheses around optional call)

@ndowens
Copy link
Contributor Author

ndowens commented Mar 24, 2017 via email

@7c6f434c
Copy link
Member

After the small edit in response to @LnL7 the expression stopped evaluating, I think

@ndowens
Copy link
Contributor Author

ndowens commented Mar 24, 2017 via email

7c6f434c pushed a commit to 7c6f434c/nixpkgs that referenced this pull request Mar 24, 2017
alaLib as optional

Remove extra stdenv.lib

(@7c6f434c) fixed a typo - pushing instead of NixOS#24105
@7c6f434c
Copy link
Member

Pushed a fixed-typo version

@7c6f434c 7c6f434c closed this Mar 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants