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

sdrpp: 1.0.4 -> 1.1.0-unstable-2024-01-22 #282448

Merged
merged 1 commit into from
Jan 24, 2024

Conversation

hzeller
Copy link
Contributor

@hzeller hzeller commented Jan 21, 2024

sdrpp switched to a rolling release, so take a git hash from head.

  • Remove pinning to gcc12, as this will break plug-ins that link against a newer version of libc++ (e.g. audio sink).
  • Organize the built options by category and sort within.
  • Add new build options that have been added since last 1.0.4
  • Link against rtl-sdr-osmocom which is a newer superset of rtl-sdr (e.g. works better with rtl-sdr V4).

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@hzeller
Copy link
Contributor Author

hzeller commented Jan 21, 2024

Looks like the pkgs/by-name check did get confused because the line in all-packages.nix was modified. But the package was not in by-name/... before.

@ofborg ofborg bot requested a review from sikmir January 21, 2024 02:01
@hzeller hzeller force-pushed the 20240120-update-sdrp branch 2 times, most recently from bb829fd to b99e41e Compare January 22, 2024 01:30
@hzeller hzeller changed the title sdrpp: 1.0.4 -> 1.1.0-20240116 sdrpp: 1.0.4 -> 1.1.0-20240121 Jan 22, 2024
@hzeller hzeller force-pushed the 20240120-update-sdrp branch 3 times, most recently from dc98857 to ea66b97 Compare January 22, 2024 02:43
@sikmir
Copy link
Member

sikmir commented Jan 22, 2024

Result of nixpkgs-review pr 282448 run on x86_64-darwin 1

1 package built:
  • sdrpp

@infinisil
Copy link
Member

infinisil commented Jan 22, 2024

Oh this is an interesting failure of the new pkgs/by-name check, I think it needs some adjustment. I'll look into it, but you can ignore this CI failure, merging the PR won't cause problems.

Edit: CI fix in #283017

@hzeller hzeller changed the title sdrpp: 1.0.4 -> 1.1.0-20240121 sdrpp: 1.0.4 -> 1.1.0-2024-01-22 Jan 22, 2024
sdrpp switched to a rolling release, so take a git hash from head.
@hzeller hzeller changed the title sdrpp: 1.0.4 -> 1.1.0-2024-01-22 sdrpp: 1.0.4 -> 1.1.0-unstable-2024-01-22 Jan 22, 2024
@hzeller
Copy link
Contributor Author

hzeller commented Jan 24, 2024

Anyone on this PR with the power to Approve/merge ?

@kirillrdy
Copy link
Member

I can merge, @sikmir is this formally approved ?

inherit (darwin.apple_sdk.frameworks) AppKit;
});
};
Copy link
Member

Choose a reason for hiding this comment

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

Maybe move it here:

Suggested change
};
rtl-sdr = rtl-sdr-osmocom; # osmocom better w/ rtlsdr v4
};

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 think moving that configuration there is probably better done in a separate change.

@kirillrdy kirillrdy merged commit 75c29d4 into NixOS:master Jan 24, 2024
25 of 26 checks passed
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.

5 participants