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

Jump to bottom

libsidplayfp: 1.8.7 -> 2.0.4, sidplayfp: 1.4.4 -> 2.0.2, fix API options #82674

Merged
merged 2 commits into from Aug 4, 2020
Merged

libsidplayfp: 1.8.7 -> 2.0.4, sidplayfp: 1.4.4 -> 2.0.2, fix API options #82674

merged 2 commits into from Aug 4, 2020

Conversation

OPNA2608
Copy link
Contributor

@OPNA2608 OPNA2608 commented Mar 15, 2020 •
edited

Motivation for this change

New versions available.

sidplayfp would only try to use OSS for playback, fixed that.

cc @RamKromberg @dezgeg

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
    I haven't tested stilview in the sidplayfp package, don't know how to use that
  • Determined the impact on package closure size (by running nix path-info -S before and after)
    sidplayfp: 34679176 -> 74860048
    libsidplayfp: 34491888 -> 39865888
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from dezgeg March 15, 2020 19:06
@OPNA2608
Copy link
Contributor Author

PR updated to 2.0.2.

@OPNA2608 OPNA2608 changed the title libsidplayfp,sidplayfp: 1.8.7 -> 2.0.1, fix backend detection libsidplayfp,sidplayfp: 1.8.7 -> 2.0.2, fix backend detection Apr 28, 2020
@OPNA2608 OPNA2608 changed the title libsidplayfp,sidplayfp: 1.8.7 -> 2.0.2, fix backend detection libsidplayfp: 1.8.7 -> 2.0.3, sidplayfp: 1.8.7 -> 2.0.2 & fix backend detection Jun 1, 2020
@OPNA2608
Copy link
Contributor Author

OPNA2608 commented Jun 1, 2020

libsidplayfp bumped to 2.0.3. (no 2.0.3 for sidplayfp itself yet, but I tested compilation & playback and everything worked fine)

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/175

@OPNA2608 OPNA2608 changed the title libsidplayfp: 1.8.7 -> 2.0.3, sidplayfp: 1.8.7 -> 2.0.2 & fix backend detection libsidplayfp: 1.8.7 -> 2.0.4, sidplayfp: 1.8.7 -> 2.0.2 & fix backend detection Jul 20, 2020
@OPNA2608
Copy link
Contributor Author

libsidplayfp bumped to 2.0.4.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/238

jonringer
jonringer reviewed Aug 4, 2020
View reviewed changes
pkgs/applications/audio/sidplayfp/default.nix Outdated
version = "1.4.4";
let

opt = lib.optional;
Copy link
Contributor

Choose a reason for hiding this comment

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

i would like to keep this as consistent as possible with other derivations

Suggested change
opt = lib.optional;
optional = lib.optional;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll replace this and all the lib.s in the library with inherit (lib)s.

pkgs/applications/audio/sidplayfp/default.nix Outdated
Comment on lines 4 to 10
, alsaSupport ? stdenv.isLinux, alsaLib
, pulseSupport ? stdenv.isLinux, libpulseaudio
}:
Copy link
Contributor

Choose a reason for hiding this comment

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

not sure if this is needed in this instance, but it's common to do:

  assert alsaSupport -> alsaLib;
  assert alsaSupport -> libpulseaudio;

Copy link
Contributor Author

@OPNA2608 OPNA2608 Aug 4, 2020 •
edited

Choose a reason for hiding this comment

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

Why exactly is this common? I don't quite get the point of it, maybe I'm missing something. If it's e.g. to protect against alsaLib being unavailable for some platform wouldn't alsaSupport = false; be enough for that?

Edit: I'm trying to understand when and why I should incorporate this more into other derivations of mine as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

I usually see this in packages which reference the libraries in question. E.g:

 buildInputs = [ (some-lib.override{ enablePython=true; }) ]'

but it's not always guarenteed that python will be available.

Either way, I don't see a case where it will fail on linux, but might be useful for a darwin user that an assumption is broken.

@OPNA2608 OPNA2608 changed the title libsidplayfp: 1.8.7 -> 2.0.4, sidplayfp: 1.8.7 -> 2.0.2 & fix backend detection libsidplayfp: 1.8.7 -> 2.0.4, sidplayfp: 1.4.4 -> 2.0.2, fix API options Aug 4, 2020
jonringer
jonringer approved these changes Aug 4, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM
shows usage

[5 built, 377 copied (1425.6 MiB), 322.3 MiB DL]
https://github.com/NixOS/nixpkgs/pull/82674
4 packages built:
audacious gjay libsidplayfp sidplayfp

@jonringer jonringer merged commit e60a22b into NixOS:master Aug 4, 2020
@OPNA2608 OPNA2608 deleted the update-sidplayfp branch September 27, 2022 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@dezgeg dezgeg Awaiting requested review from dezgeg

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@OPNA2608 @nixos-discourse @jonringer