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

usbmuxd2: add a missing import of <algorithm> #369039

Merged
merged 1 commit into from
Dec 30, 2024
Merged

Conversation

paveloom
Copy link
Member

Closes #368973.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

Copy link
Contributor

@paparodeo paparodeo left a comment

Choose a reason for hiding this comment

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

LGTM -- built successfully on x64 linux

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 29, 2024
@ofborg ofborg bot requested a review from onny December 29, 2024 13:06
Copy link

@kuflierl kuflierl left a comment

Choose a reason for hiding this comment

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

LGTM, std::find is in <algorithms>

@onny
Copy link
Contributor

onny commented Dec 29, 2024

Please use fetchpatch together with tihmstar/usbmuxd2#43 and add a comment with link to the upstream PR

@paparodeo
Copy link
Contributor

paparodeo commented Dec 29, 2024

Please use fetchpatch together with tihmstar/usbmuxd2#43 and add a comment with link to the upstream PR

we don't fetch patch unmerged commits anymore as we realized they can get garbage collected, unfortunately. tho this one seems unlikely to require changes from upstream.

@paveloom
Copy link
Member Author

I'm fine either way, but do note that upstream development is... inactive.

@onny onny merged commit d6975bb into NixOS:master Dec 30, 2024
41 of 42 checks passed
@onny
Copy link
Contributor

onny commented Dec 30, 2024

Thank you!

@paveloom paveloom deleted the usbmuxd2 branch December 30, 2024 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: usbmuxd2 on unstable
4 participants