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.6.0 -> 1.11.2 #53380

Merged
merged 2 commits into from Jan 16, 2019
Merged

conan: 1.6.0 -> 1.11.2 #53380

merged 2 commits into from Jan 16, 2019

Conversation

HaoZeke
Copy link
Member

@HaoZeke HaoZeke commented Jan 4, 2019 •
edited

Motivation for this change

I needed a newer version of conan and was using this override for a while. For that matter the current version of conan is not working either and this fixes #45395.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

This was referenced Jan 4, 2019
Closed
Closed
dotlambda
dotlambda requested changes Jan 8, 2019
View reviewed changes
pkgs/development/tools/build-managers/conan/default.nix Outdated
];

checkPhase = ''
export HOME="$TMP/conan-home"
mkdir -p "$HOME"
nosetests conans.test
tox conans.test
Copy link
Member

Choose a reason for hiding this comment

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

Don't use tox. Tox is a tool for testing with different Python versions, which is of no use to us. You can look up which tool tox will run in tox.ini.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh ok, in that case the tests fail. This is mostly because they have requirements not related to this package, like cmake, pip, go and friends. I am removing the test phase entirely. It works on any reasonable system but not in isolation. In any case, the archlinux AUR builds also seem to skip the test phase without any repercussions.

pkgs/development/tools/build-managers/conan/default.nix Outdated Show resolved Hide resolved
dotlambda
dotlambda requested changes Jan 9, 2019
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment •
edited

Choose a reason for hiding this comment

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

You should squash your commits such that you only have two left where the first one adds yourself to maintainer-list.nix and the second one updates conan. Please also rebase on master.

pkgs/development/tools/build-managers/conan/default.nix
};

Copy link
Member

Choose a reason for hiding this comment

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

Nitpick: leave the whitespace here.

pkgs/development/tools/build-managers/conan/default.nix Outdated
@@ -57,24 +49,25 @@ in newPython.pkgs.buildPythonApplication rec {
mock
webtest
codecov
node-semver
]);

propagatedBuildInputs = with newPython.pkgs; [
requests fasteners pyyaml pyjwt colorama patch
bottle pluginbase six distro pylint node-semver
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
bottle pluginbase six distro pylint node-semver
six distro pylint node-semver

Copy link
Member Author

Choose a reason for hiding this comment

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

These are required for the build.

pkgs/development/tools/build-managers/conan/default.nix Outdated Show resolved Hide resolved
@Mic92
Copy link
Member

Mic92 commented Jan 9, 2019

I can also squash on merge, but resolving the merge conflict would be nice.

@HaoZeke
Copy link
Member Author

HaoZeke commented Jan 9, 2019

Fixed the conflicts.

@dotlambda dotlambda changed the title conan: 1.6.0 -> 1.9.1 conan: 1.6.0 -> 1.11.2 Jan 9, 2019
@dotlambda
Copy link
Member

Fixed the conflicts.

Seems like you didn't.

@dotlambda
Copy link
Member

Please rebase instead of merging.

@HaoZeke
Copy link
Member Author

HaoZeke commented Jan 9, 2019

Sorry, finally got it done.

@Mic92
Copy link
Member

Mic92 commented Jan 9, 2019

@GrahamcOfBorg build conan

@billksun
Copy link
Contributor

Can this be merged? It is blocking #53391.

@Mic92 Mic92 merged commit fd5b4ee into NixOS:master Jan 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@dotlambda dotlambda dotlambda requested changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

conan doesn't build since it was updated to 1.6.0
6 participants
@HaoZeke @Mic92 @dotlambda @billksun @GrahamcOfBorg @Janik-Haag