diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-03-13 13:16:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 13:16:21 +0000 |
| commit | 4b7219687427e4c273345b6bcf33e3b06cca2e7f (patch) | |
| tree | 41145e8afb0f234c0a7ca23e325ca4a1b8ad9014 /pkgs/development/tools | |
| parent | b6990edfb38f07818c9c366025a9220c74168ac8 (diff) | |
| parent | 5fdfe61b35945b287b084f22076fef34062f17d2 (diff) | |
| download | nixlib-4b7219687427e4c273345b6bcf33e3b06cca2e7f.tar nixlib-4b7219687427e4c273345b6bcf33e3b06cca2e7f.tar.gz nixlib-4b7219687427e4c273345b6bcf33e3b06cca2e7f.tar.bz2 nixlib-4b7219687427e4c273345b6bcf33e3b06cca2e7f.tar.lz nixlib-4b7219687427e4c273345b6bcf33e3b06cca2e7f.tar.xz nixlib-4b7219687427e4c273345b6bcf33e3b06cca2e7f.tar.zst nixlib-4b7219687427e4c273345b6bcf33e3b06cca2e7f.zip | |
Merge pull request #36806 from timokau/conan-fix
conan: Fix build
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 4a2afbeedfe6..6350798e1086 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,26 +1,28 @@ { lib, buildPythonApplication, fetchPypi , requests, fasteners, pyyaml, pyjwt, colorama, patch -, bottle, pluginbase, six, distro, pylint, node-semver +, bottle, pluginbase, six, distro11, pylint, node-semver2 , future, pygments, mccabe +, fetchpatch }: buildPythonApplication rec { - version = "0.28.1"; + version = "1.1.1"; pname = "conan"; src = fetchPypi { inherit pname version; - sha256 = "0zf564iqh0099yd779f9fgk21qyp87d7cmgfj34hmncf8y3qh32a"; + sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl"; }; propagatedBuildInputs = [ requests fasteners pyyaml pyjwt colorama patch - bottle pluginbase six distro pylint node-semver + bottle pluginbase six distro11 pylint node-semver2 future pygments mccabe ]; # enable tests once all of these pythonPackages available: # [ nose nose_parameterized mock webtest codecov ] + # update 2018-03-11: only nose_parameterized is missing doCheck = false; meta = with lib; { |