conan: 1.25.0 -> 1.27.0

Switch to fetching source from GitHub vs PyPi, which will enable running
packaging tests in the future.
This commit is contained in:
Drew Risinger 2020-07-01 15:11:14 -04:00 committed by Jon
parent ea5a79c4a3
commit 2396eb646d

View File

@ -1,4 +1,4 @@
{ lib, python3, git, pkgconfig }: { lib, python3, fetchFromGitHub, git, pkgconfig }:
# Note: # Note:
# Conan has specific dependency demands; check # Conan has specific dependency demands; check
@ -39,12 +39,14 @@ let newPython = python3.override {
}; };
in newPython.pkgs.buildPythonApplication rec { in newPython.pkgs.buildPythonApplication rec {
version = "1.25.0"; version = "1.27.0";
pname = "conan"; pname = "conan";
src = newPython.pkgs.fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "conan-io";
sha256 = "1wgmx6s4h5m6zixb3wlaicy56rsqcy2srzmvii80xdx9g5wvi9pv"; repo = "conan";
rev = version;
sha256 = "0ncqs1p4g23fmzgdmwppgxr8w275h38hgjdzs456cgivz8xs9rjl";
}; };
propagatedBuildInputs = with newPython.pkgs; [ propagatedBuildInputs = with newPython.pkgs; [
@ -75,17 +77,13 @@ in newPython.pkgs.buildPythonApplication rec {
] ++ (with newPython.pkgs; [ ] ++ (with newPython.pkgs; [
codecov codecov
mock mock
pytest
node-semver
nose nose
parameterized parameterized
webtest webtest
]); ]);
# Conan 1.14.0 has removed all tests from the Pypi source dist: # TODO: reenable tests now that we fetch tests w/ the source from GitHub.
# https://github.com/conan-io/conan/pull/4713 # Not enabled right now due to time constraints/failing tests that I didn't have time to track down
# We have recommended they be added back:
# https://github.com/conan-io/conan/issues/4563#issuecomment-602225083
doCheck = false; doCheck = false;
postPatch = '' postPatch = ''