[staging-next] uhd: fix for boost187 #372087
Merged
+19
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nix-owners
bot
requested review from
tomberek,
doronbehar,
fpletz and
bjornfor
doronbehar
approved these changes
Jan 8, 2025
Comment on lines
+191
to
+192
| # The last two hunks in client.cc will fail without these substitutions | ||
| substitutions = [ |
There was a problem hiding this comment.
This shouldn't be a blocker, but next time I'd simply write my own backport patch.
bjornfor
approved these changes
Jan 8, 2025
wegank
added
12.approvals: 2
paparodeo
force-pushed
the
uhd-boost-fix
branch
from
ff6e1bc to
71733d1
Compare
paparodeo
changed the title
wegank
removed
the
12.approvals: 2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes: https://hydra.nixos.org/build/284398575
EttusResearch/uhd@adfe953
the last two hunks of client.cc will fail due to changes in from this commit EttusResearch/uhd@2dc7b3e#diff-50231ca4dc15fab04d2c68cf5176f914c9f22c9e9e4a707e65daa93cb92a42c9 so use a substitute to revert the change out of the diff.
pinning to boost_186 seems like a viable alternative given the size of the diff.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.