Skip to content

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

Merged
7c6f434c merged 25 commits intoNixOS:masterfrom
oxij:tree/move-defaults-to-package-trivial-leftovers
Feb 20, 2019
Merged

all-packages.nix: move defaults to package files continues^3#56088
7c6f434c merged 25 commits intoNixOS:masterfrom
oxij:tree/move-defaults-to-package-trivial-leftovers

Conversation

@oxij
Copy link
Copy Markdown
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

oxij added 25 commits February 3, 2019 15:33
@oxij
conky: move defaults to package file
0f4eb7f
@oxij
mpv: move defaults to package file
763dff1
@oxij
fetchsvn: move defaults to package file
8abaf8d
@oxij
opencv3, opencv4: move defaults to package file
8e92944
@oxij
qt3: move defaults to package file
04551d2
@oxij
guvcview: move defaults to package file
23cfa1d
@oxij
obs-studio: move defaults to package file
be40fe7
@oxij
blueman: move defaults to package file
1b2c28b
@oxij
wxGTK28, wxGTK29, wxGTK30: move defaults to package file
5cf90c3
@oxij
androidenv: move defaults to package file
32e854c
@oxij
lxcfs: move defaults to package file
dd5bcb3
@oxij
plex: move defaults to package file
15c52af
@oxij
oraclejdk8distro, oraclejdk8psu_distro: move defaults to package file
3a7f3a1
@oxij
radare2, r2-for-cutter: move defaults to package file
73b2c28
@oxij
gnutls, gnutls-kdh: move defaults to package file
0df915c
@oxij
libiodbc: move defaults to package file
be79fc5
@oxij
bind: move defaults to package file
a111b5f
@oxij
sc2-headless: move defaults to package file
c7675be
@oxij
steam: move defaults to package file
1a69c20
@oxij
openmpt123: move defaults to package file
f2ff985
@oxij
sox: move defaults to package file
5bcd73c
@oxij
ahoviewer: move defaults to package file
36a0ec6
@oxij
zathura: move defaults to package file
46107a6
@oxij
coreclr: move defaults to package file
9c1c9cb
@oxij
claws-mail: move defaults to package file
e856228
@7c6f434c
Copy link
Copy Markdown
Member

7c6f434c commented Feb 20, 2019

@GrahamcOfBorg eval

@GrahamcOfBorg GrahamcOfBorg added 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: steam Steam game store/launcher (store.steampowered.com) 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Feb 20, 2019
@dasJ
Copy link
Copy Markdown
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
Copy Markdown
Member

7c6f434c commented Feb 20, 2019

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
Copy Markdown
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
Copy Markdown
Member Author

oxij commented Feb 20, 2019

Thanks!

@dasJ
Copy link
Copy Markdown
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
Copy Markdown
Member

7c6f434c commented Feb 20, 2019

@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 mentioned this pull request Feb 21, 2019
Closed
@erictapen erictapen mentioned this pull request Mar 6, 2019
Merged
10 tasks
@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

Reviewers

No reviews

Assignees

No one assigned

Labels

6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: steam Steam game store/launcher (store.steampowered.com) 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@oxij @7c6f434c @dasJ @GrahamcOfBorg