diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:01:49 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:01:49 +0100 |
commit | 65edeb8633de16792a84195f77a6b4ea408e2608 (patch) | |
tree | be3960fdb869c4d25b8128fb1080810e6ea22756 /pkgs/development/tools/build-managers | |
parent | 13bab298fc1ad49db5449b262125d25d849bc90e (diff) | |
parent | 648152fdbbdbb8a51335b94647ea9f959f42064d (diff) | |
download | nixlib-65edeb8633de16792a84195f77a6b4ea408e2608.tar nixlib-65edeb8633de16792a84195f77a6b4ea408e2608.tar.gz nixlib-65edeb8633de16792a84195f77a6b4ea408e2608.tar.bz2 nixlib-65edeb8633de16792a84195f77a6b4ea408e2608.tar.lz nixlib-65edeb8633de16792a84195f77a6b4ea408e2608.tar.xz nixlib-65edeb8633de16792a84195f77a6b4ea408e2608.tar.zst nixlib-65edeb8633de16792a84195f77a6b4ea408e2608.zip |
Merge master into staging-next
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; { |