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

Conan 1.23.0 #83144

Merged
merged 4 commits into from Mar 26, 2020
Merged

Conan 1.23.0 #83144

merged 4 commits into from Mar 26, 2020

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Mar 22, 2020

Motivation for this change

#80379 (Zero Hydra Failures for 20.03) -- conan fails there and on master because it does not support GCC >= 9. This newer version does (somehwere around this PR: conan-io/conan#5093).

I've added @HaoZeke as the maintainer of the newly added patch-ng dependency, also maintained by the Conan team.

I myself am not a user of Conan nor do I know how to run it.

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
  • 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 wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 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.

nh2 added 4 commits March 22, 2020 15:45
@nh2
conan: Reformat inputs list
3a158da
@nh2
conan: Remove unnecessary patching.
03d5611 
The pluginbase dependency is now pinned further up with commit

    244fcfc - conan: pin pluginbase to 0.7
@nh2
pythonPackages.patch-ng: Init at 1.17.2.
3e60781 
Newer versions of `conan` need it.

Adding @HaoZeke as maintainer (is Conan maintainer).
@nh2
conan: 1.12.3 -> 1.23.0
f460e62 
* remove pinned dependencies where nixpkgs provides a version
  in the acceptable range
* disable tests;
  they are no longer in the Pypi archive, see
  conan-io/conan#4563
@nh2 nh2 requested a review from FRidh as a code owner March 22, 2020 15:39
HaoZeke
HaoZeke approved these changes Mar 26, 2020
View reviewed changes
Copy link
Member

@HaoZeke HaoZeke left a comment

Choose a reason for hiding this comment

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

Looks fine!

@nh2 nh2 merged commit 0bc0823 into NixOS:master Mar 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HaoZeke HaoZeke HaoZeke approved these changes

@dotlambda dotlambda Awaiting requested review from dotlambda

@jonringer jonringer Awaiting requested review from jonringer

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@nh2 @HaoZeke