conan: Fix build #36806
conan: Fix build #36806
Conversation
| @@ -317,7 +317,9 @@ stdenv.mkDerivation ({ | |||
|
|
|||
| NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; | |||
|
|
|||
| preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' | |||
| preConfigure = '' | |||
| patchShebangs configure | |||
There was a problem hiding this comment.
Why is this change to gcc6 necessary?
There was a problem hiding this comment.
Oh, its not. That was the fix for #36754 that I forgot to remove before commiting. Good catch.
I removed it and force pushed.
conan has very strict requirements on the versions of its dependencies. This patch adds downgraded versinos of node-semver and distro to statisfy these requirements.
GrahamcOfBorg
added
10.rebuild-darwin: 1-10
10.rebuild-linux: 1-10
and removed
10.rebuild-darwin: 11-100
10.rebuild-linux: 101-500
labels
|
@GrahamcOfBorg build conan |
|
No attempt on x86_64-darwin The following builds were skipped because they don't evaluate on x86_64-darwin: conan No log is available. |
|
Success on x86_64-linux (full log) Attempted: conan Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: conan Partial log (click to expand)
|
|
@timokau The dependencies' versions should be pinned in another way. We do not want to have multiple version inside the /cc @FRidh |
|
@timokau Regarding the tests: |
| { stdenv, fetchPypi, buildPythonPackage, pytest, tox }: | ||
|
|
||
| buildPythonPackage rec { | ||
| name = "${pname}-${version}"; |
There was a problem hiding this comment.
name should not be added to python packages anymore.
| { stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }: | ||
|
|
||
| buildPythonPackage rec { | ||
| name = "${pname}-${version}"; |
There was a problem hiding this comment.
name should not be added to python packages anymore.
|
@timokau Please be quick with the follow-up PR as this is hindering me from updating Home Assistant! (Some issue where a script of mine finds two versions of |
|
If you need it quick, its usually best you do it yourself. That said: #37094 |
conan has very strict requirements on the versions of its dependencies.
This patch adds downgraded versinos of node-semver and distro to
statisfy these requirements.
Motivation for this change
/cc ZHF #36453 (please backport)
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)