Skip to content

sdrpp: 1.1.0-unstable-2024-01-22 -> 1.2.1-unstable-2025-10-09#450737

Merged
vcunat merged 2 commits intoNixOS:masterfrom
SchweGELBin:sdrpp-1.2.1-unstable-2025-10-09
Oct 27, 2025
Merged

sdrpp: 1.1.0-unstable-2024-01-22 -> 1.2.1-unstable-2025-10-09#450737
vcunat merged 2 commits intoNixOS:masterfrom
SchweGELBin:sdrpp-1.2.1-unstable-2025-10-09

Conversation

@SchweGELBin
Copy link
Member

@SchweGELBin SchweGELBin commented Oct 10, 2025 •
edited
Loading

Things done

Resolves #450446
See #445447

Depends on 5ea500c431ef0136bddb8e5fd6282dbe7b5e9794 from #449871 (airspyhf update)

Hey, I've updated SDRPlusPlus to the newest unsable version and fixed the cmake build issue.
I wanted to create a pull request upstream, bet they do not allow code changes in their pull requests, so I added the patch here.
I've bumped the minimum cmake version to 3.13 as this is, what upstream uses.

I've cherry picked a commit of #449871. I don't know, what happens when this gets merged (regarding merge conflicts etc.).

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Oct 10, 2025
@nix-owners nix-owners bot requested a review from sikmir October 10, 2025 17:09
@SchweGELBin SchweGELBin force-pushed the sdrpp-1.2.1-unstable-2025-10-09 branch from 76b59e9 to 5a754b6 Compare October 10, 2025 17:09
@SchweGELBin
Copy link
Member Author

SchweGELBin commented Oct 10, 2025 •
edited
Loading

I've removed the cherry-picked commit.

I'm marking this as draft until #449871 gets merged.

The build will fail until #449871 gets merged. This shouldn't be a blocker as these pull requests don't collide.

@SchweGELBin SchweGELBin marked this pull request as draft October 10, 2025 17:10
@SchweGELBin SchweGELBin marked this pull request as ready for review October 10, 2025 17:12
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Oct 10, 2025
@SchweGELBin SchweGELBin mentioned this pull request Oct 10, 2025
Closed
3 tasks
@Sigmanificient Sigmanificient mentioned this pull request Oct 12, 2025
Merged
13 tasks
@Noderyos
Copy link
Contributor

Noderyos commented Oct 16, 2025

Hey, you updated git hash but forgot to change the nix hash, keeping old files instead of new ones,
which can be seen in particular during patchPhase, as core/src/version.h still contains 1.1.0

substituteStream() in derivation sdrpp-1.2.1-unstable-2025-10-09: WARNING: '--replace' is deprecated, use --replace-{fail,warn,quiet}. (file 'CMakeLists.txt')
substituteStream() in derivation sdrpp-1.2.1-unstable-2025-10-09: WARNING: pattern /usr/share doesn't match anything in file 'CMakeLists.txt'
substituteStream() in derivation sdrpp-1.2.1-unstable-2025-10-09: WARNING: pattern 1.2.1 doesn't match anything in file 'core/src/version.h'

You can also take a look at #420930

@SchweGELBin SchweGELBin force-pushed the sdrpp-1.2.1-unstable-2025-10-09 branch from 5a754b6 to 67b4fb0 Compare October 16, 2025 12:34
@SchweGELBin
Copy link
Member Author

SchweGELBin commented Oct 16, 2025

Thank you for mentioning this!

I've updated the hash and cleaned it up a bit.

@rafaelrc7
Copy link
Member

rafaelrc7 commented Oct 17, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 450737
Commit: 67b4fb02ab376d670bfb4b1cc91cce08d02bcb51

x86_64-linux

✅ 1 package built:
  • sdrpp

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Oct 17, 2025
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Oct 22, 2025
@vcunat vcunat added this pull request to the merge queue Oct 27, 2025
Merged via the queue into NixOS:master with commit 06363cc Oct 27, 2025
27 checks passed
@SchweGELBin SchweGELBin deleted the sdrpp-1.2.1-unstable-2025-10-09 branch October 27, 2025 08:56
@zaninime zaninime mentioned this pull request Oct 30, 2025
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sikmir sikmir Awaiting requested review from sikmir

2 more reviewers

@rafaelrc7 rafaelrc7 rafaelrc7 approved these changes

@dani0854 dani0854 dani0854 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

sdrpp: cmake build failure

5 participants

@SchweGELBin @Noderyos @rafaelrc7 @dani0854 @vcunat