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

all-packages.nix: move defaults to package files continues^3 #56088

Merged

Conversation

oxij
Copy link
Member

@oxij oxij commented Feb 20, 2019

What? Why?

A continuation of #55129, #55732, and #56026. Yet another noop.

git log

  • *: move defaults to package file

A whole bunch of these.

nix-instantiate environment

  • Host OS: Linux 4.9, SLNOS 19.03
  • Nix: nix-env (Nix) 2.1.3
  • Multi-user: yes
  • Sandbox: yes
  • NIXPKGS_CONFIG:
{
  checkMeta = true;
  doCheckByDefault = true;
}

nix-env -qaP diffs

  • On x86_64-linux: noop
  • On aarch64-linux: noop
  • On x86_64-darwin: noop

/cc @7c6f434c from #55129 and @bendlas, @volth, @samueldr from #55732

@7c6f434c
Copy link
Member

@GrahamcOfBorg eval

@dasJ
Copy link
Member

dasJ commented Feb 20, 2019

Things that are also changed:

blueman: withPulseAudio ? config.pulseaudio or stdenv.isLinux instead of withPulseAudio = config.pulseaudio or true;
wxgtk: withMesa ? libGLSupported instead of withMesa = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
mpv: stdenv.isLinux instead of !stdenv.isDarwin;

All of this is probably okay, but I wanted to mention it

@7c6f434c
Copy link
Member

libGLSupported is defined to be precisely the mesaPlatforms check.

(The two other things seem to be changes; good ones, in my opinion).

@oxij
Copy link
Member Author

oxij commented Feb 20, 2019

@dasJ

wxgtk

libGLSupported is defined as lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms in all-packages.nix :)

blueman, mpv

Yes, these are fixes for systems not built by hydra and ofborg. Outside Linux (and emulation of Linux by FreeBSD and Illumos) people don't normally run PulseAudio and only Linux (and emulations) has ALSA. But these are a noop for stuff hydra builds.

@7c6f434c 7c6f434c merged commit 828759f into NixOS:master Feb 20, 2019
@oxij
Copy link
Member Author

oxij commented Feb 20, 2019

Thanks!

@dasJ
Copy link
Member

dasJ commented Feb 20, 2019

@oxij As I said I think the changes are probably okay, but I wanted to point that out to a potential merger

@7c6f434c
Copy link
Member

@dasJ yes, thanks for attentive checking — and I think it was only natural for @oxij to put the reasoning on record if the changes were mentioned.

@oxij oxij deleted the tree/move-defaults-to-package-trivial-leftovers branch August 12, 2023 09:06
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