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

release-cross.nix changes/fixes #61168

Merged
merged 6 commits into from Jun 4, 2019

Conversation

matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented May 9, 2019

Cleanup for the Hydra jobset that builds cross toolchains:

https://hydra.nixos.org/jobset/nixpkgs/cross-trunk

  • get rid of androidndk that is no longer available
  • provide more verbose error messages in androidenv
  • use platforms for mesa support
  • make valgrind optional in mesa and disabled on aarch32 platforms
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.

It is no longer provided
We don’t have android sdk available for aarch64, so this error happens
a lot. Adding some context on what is going on makes this clearer.
mesaPlatforms can be used in the platforms attr.
valgrind-light doesn’t appear to work correctly on aarch32. It’s also
not a required dependency on mesa, so in the future we may be able to
disable it for other platforms
causes on evaluation error on macOS otherwise
, libglvnd
, enableRadv ? true
, galliumDrivers ? null
, driDrivers ? null
, vulkanDrivers ? null
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
, OpenGL, Xplugin
, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
Copy link
Member

Choose a reason for hiding this comment

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

In which cases do we default the package to null when it's possible to disable via an option?
You didn't but the enableRadv option does.

Copy link
Member Author

Choose a reason for hiding this comment

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

I prefer to use with* flags as they are more obvious. I guess we can always do something like withValgrind ? valgrind != null, but it's a little awkward to go the other way with valgrind ? (if withValgrind then null else ?)

@globin
Copy link
Member

globin commented May 18, 2019

This PR is conflicting

@matthewbauer matthewbauer changed the base branch from staging to master May 18, 2019 19:57
@matthewbauer matthewbauer changed the base branch from master to staging May 18, 2019 19:57
@ofborg ofborg bot removed 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: haskell 6.topic: nixos labels May 18, 2019
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