diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2019-11-18 08:37:24 -0800 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2019-11-19 09:05:12 -0800 |
commit | 542af6df876aeba2c8993383daeb0ec27bb16653 (patch) | |
tree | 8dc6a0eb0d2f8a67e94be1f7d8fce84b665b7749 /pkgs/development/tools/build-managers | |
parent | 68e1a78368eb1d2a3fe58e342df996125bd1144c (diff) | |
download | nixlib-542af6df876aeba2c8993383daeb0ec27bb16653.tar nixlib-542af6df876aeba2c8993383daeb0ec27bb16653.tar.gz nixlib-542af6df876aeba2c8993383daeb0ec27bb16653.tar.bz2 nixlib-542af6df876aeba2c8993383daeb0ec27bb16653.tar.lz nixlib-542af6df876aeba2c8993383daeb0ec27bb16653.tar.xz nixlib-542af6df876aeba2c8993383daeb0ec27bb16653.tar.zst nixlib-542af6df876aeba2c8993383daeb0ec27bb16653.zip |
conan: 1.12.0 -> 1.12.3
Remove PyYAML_3
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index ce7b08710441..59b1b14ac5fa 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, git }: +{ lib, python3, git, pkgconfig }: let newPython = python3.override { packageOverrides = self: super: { @@ -37,43 +37,48 @@ let newPython = python3.override { sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; }; }); - pyyaml = super.pyyaml_3; }; }; in newPython.pkgs.buildPythonApplication rec { - version = "1.12.0"; + version = "1.12.3"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "0hgy3wfy96likdchz42h9mawfjw4dxx7k2iinrrlhph7128kji1j"; + sha256 = "1cnfy9b57apps4bfai6r67g0mrvgnqa154z9idv0kf93k1nvx53g"; }; + + propagatedBuildInputs = with newPython.pkgs; [ + colorama deprecation distro fasteners bottle + future node-semver patch pygments pluginbase + pyjwt pylint pyyaml requests six tqdm + ]; + checkInputs = [ + pkgconfig git ] ++ (with newPython.pkgs; [ codecov mock + pytest node-semver nose parameterized webtest ]); - propagatedBuildInputs = with newPython.pkgs; [ - colorama deprecation distro fasteners bottle - future node-semver patch pygments pluginbase - pyjwt pylint pyyaml requests six tqdm - ]; - checkPhase = '' - export HOME="$TMP/conan-home" - mkdir -p "$HOME" + export HOME=$TMPDIR + pytest conans/test/{utils,unittests} \ + -k 'not SVN and not ToolsNetTest' ''; postPatch = '' substituteInPlace conans/requirements_server.txt \ --replace "pluginbase>=0.5, < 1.0" "pluginbase>=0.5" + substituteInPlace conans/requirements.txt \ + --replace "PyYAML>=3.11, <3.14.0" "PyYAML" ''; meta = with lib; { |