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

[20.03] conan: unbreak by backporting from master #87203

Merged
merged 9 commits into from May 7, 2020
Merged

[20.03] conan: unbreak by backporting from master #87203

merged 9 commits into from May 7, 2020

Conversation

bjornfor
Copy link
Contributor

@bjornfor bjornfor commented May 7, 2020

Motivation for this change

Fix conan on release-20.03 branch.

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 and others added 9 commits May 7, 2020 19:18
@nh2 @bjornfor
conan: Reformat inputs list
9304d90 
(cherry picked from commit 3a158da)
@nh2 @bjornfor
conan: Remove unnecessary patching.
7dc1626 
The pluginbase dependency is now pinned further up with commit

    244fcfc - conan: pin pluginbase to 0.7

(cherry picked from commit 03d5611)
@nh2 @bjornfor
pythonPackages.patch-ng: Init at 1.17.2.
622fc43 
Newer versions of `conan` need it.

Adding @HaoZeke as maintainer (is Conan maintainer).

(cherry picked from commit 3e60781)
@nh2 @bjornfor
conan: 1.12.3 -> 1.23.0
218c483 
* 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

(cherry picked from commit f460e62)
@r-ryantm @bjornfor
python27Packages.patch-ng: 1.17.2 -> 1.17.4
c27ecc2 
(cherry picked from commit b914c28)
@jonringer @bjornfor
conan: 1.23.0 -> 1.24.0
3f5c19d 
(cherry picked from commit 3583757)
@drewrisinger @bjornfor
conan: unbreak with deprecation>=2.1
c8d7420 
(cherry picked from commit cae48cc)
@drewrisinger @bjornfor
conan: 1.24.0 -> 1.25.0
9f93985 
(cherry picked from commit 4454ca4)
@bjornfor
conan: unmark as broken
074c067
@ofborg ofborg bot requested a review from HaoZeke May 7, 2020 17:31
jonringer
jonringer approved these changes May 7, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM
backport conventions followed
shows usage

https://github.com/NixOS/nixpkgs/pull/87203
4 package built:
conan python27Packages.patch-ng python37Packages.patch-ng python38Packages.patch-ng

@jonringer jonringer merged commit 3cb7a1c into NixOS:release-20.03 May 7, 2020
@bjornfor bjornfor deleted the backport-conan branch May 9, 2020 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

@HaoZeke HaoZeke Awaiting requested review from HaoZeke

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 8.has: package (update) 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
5 participants
@bjornfor @jonringer @nh2 @r-ryantm @drewrisinger