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

Add Darwin as platform to various "broken" packages that actually build #25066

Merged
merged 33 commits into from Apr 24, 2017

Conversation

matthewbauer
Copy link
Member

Motivation for this change

Adds Darwin as platform to various "broken" packages that actually build.

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

@matthewbauer, thanks for your PR! By analyzing the history of the files in this pull request, we identified @abbradar, @pSub and @edolstra to be potential reviewers.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Apr 21, 2017
@matthewbauer
Copy link
Member Author

@LnL7 got any advice for this? I could definitely split this up if it's too much. They're all good changes though and I hate clogging up the pr with 30+ minor fixes.

@@ -81,6 +83,6 @@ stdenv.mkDerivation rec {
homepage = http://opencv.org/;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [viric flosse];
platforms = with stdenv.lib.platforms; linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure what's going on here, but it seems like the darwin variable here is shadowed by the function argument for some reason.

error: value is a set while a list was expected, at pkgs/development/libraries/opencv/default.nix:86:44

@matthewbauer
Copy link
Member Author

Tesseract, wordnet, anti word and libdvdread will probably have the same issue.

@LnL7
Copy link
Member

LnL7 commented Apr 23, 2017

I only checked the packages with actual changes, I'll add everything to the list to make sure.
I think it's mainly personal preference, but I think bringing the licenses or platforms into scope is usually not really worth it since those are only used once or twice.

@LnL7
Copy link
Member

LnL7 commented Apr 23, 2017

Can you fix these?

in job ‘pkgs.corn’:
value is null while a set was expected, at �[1m/nix/store/b3h0q1r7lja6a4c1yp9lfch15hjjsax2-git-export/lib/attrsets.nix�[0m:199:76

in job ‘pkgs.vte’:
value is null while a set was expected, at �[1m/nix/store/b3h0q1r7lja6a4c1yp9lfch15hjjsax2-git-export/lib/attrsets.nix�[0m:199:76

in job ‘pkgs.fbida.x86_64-darwin’:
Package ‘sane-backends-1.0.25’ in ‘/nix/store/b3h0q1r7lja6a4c1yp9lfch15hjjsax2-git-export/pkgs/applications/graphics/sane/backends/generic.nix:62’ is not supported on ‘x86_64-darwin’, refusing to evaluate.

@matthewbauer
Copy link
Member Author

Yeah I can get them. Interestingly, "miniupnpc" was already doing the same thing: https://github.com/ndowens/nixpkgs/blob/9d30abf7b201b6144883815fccf904e83555334b/pkgs/tools/networking/miniupnpc/default.nix#L21

I wonder if that was causing an error?

@LnL7
Copy link
Member

LnL7 commented Apr 23, 2017

It's only a problem for expressions that use pkgs.darwin as an argument. That's why it usually works.

@matthewbauer
Copy link
Member Author

Ok so a rundown on those 3:

  • fbida doesn't seem to ever have worked. I'm not sure why I had it in there. I just reverted it.
  • pkgs.corn should be pkgs.cron, I messed up the name in the commit message, I can rework it if you want but I've been trying not to rebase unless absolutely necessary
  • pkgs.vte should be pkgs.gnome3.vte

I can also squash the 2 reverted commits if you want but again I'm trying to avoid modifying commit hashes just in case you were working off of them.

@LnL7
Copy link
Member

LnL7 commented Apr 23, 2017

Looks good now, you can rebase/squash.

ps. having a list of attribute paths for a batch pr like this would be pretty useful for me, I have some hydra configuration that I usually use to build a set of packages for a pr.

@matthewbauer
Copy link
Member Author

Ok everything looks good!

@LnL7 LnL7 merged commit 8082842 into NixOS:master Apr 24, 2017
@matthewbauer matthewbauer deleted the less-darwin-eval-errors branch February 22, 2019 04:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants