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

asio: 1.12 -> 1.16 #90098

Merged
merged 1 commit into from Jun 19, 2020
Merged

asio: 1.12 -> 1.16 #90098

merged 1 commit into from Jun 19, 2020

Conversation

siriobalmelli
Copy link
Contributor

1.16 will now build on Darwin, properly mark it as such.

Keep asio_1_10 and asio_1_12 for applications which cannot easily upgrade.

Signed-off-by: Sirio Balmelli sirio@b-ad.ch

Motivation for this change

Another package dependency on asio broken in Darwin (will not compile).
The latest version will compile: upgraded.

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 (Ubuntu 18.04)
  • 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 rev 931cd746"
  • [n/a] Tested execution of all binary files (usually in ./result/bin/)
  • [n/a] Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@siriobalmelli siriobalmelli mentioned this pull request Jun 11, 2020
Merged
10 tasks
@jonringer
Copy link
Contributor

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the commits.

This can be done with:

git reset HEAD~1
git add -- pkgs/
git commit --amend --no-edit
git push ... ... --force

@siriobalmelli siriobalmelli force-pushed the fix/asio branch 2 times, most recently from 5ef5ccf to f8cb62d Compare June 13, 2020 15:29
@veprbl
Copy link
Member

veprbl commented Jun 18, 2020

Commit description should read: "asio: 1.12 -> 1.16". The asio_12 is not referenced within the nixpkgs, the policy is to delete such packages.

@siriobalmelli
Copy link
Contributor Author

Commit description should read: "asio: 1.12 -> 1.16". The asio_12 is not referenced within the nixpkgs, the policy is to delete such packages.

Thank you, review much appreciated.

  • rebased on top of latest master
  • removed asio 1.12
  • edited commit message

@veprbl
Copy link
Member

veprbl commented Jun 18, 2020

Still missing a colon. We can change this in squash merge, but that will break your gpg signature.

@siriobalmelli siriobalmelli changed the title asio 1.12 -> 1.16 asio: 1.12 -> 1.16 Jun 18, 2020
@siriobalmelli @veprbl
asio: 1.12 -> 1.16
a9a0e64 
1.16 will now build on Darwin, properly mark it as such.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
@veprbl veprbl merged commit 96c4c0c into NixOS:master Jun 19, 2020
@veprbl
Copy link
Member

veprbl commented Jun 19, 2020

Thank you!

@siriobalmelli siriobalmelli deleted the fix/asio branch June 20, 2020 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@veprbl veprbl veprbl approved these changes

@Anton-Latukha Anton-Latukha Anton-Latukha approved these changes

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 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
4 participants
@siriobalmelli @jonringer @veprbl @Anton-Latukha