diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-11-13 19:08:07 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-11-13 19:12:08 +0000 |
commit | 3ff2a789c233c871c82672a8f240d016602d368b (patch) | |
tree | 0287b668b64442985e9fb607c9f5779de813fb3f /pkgs/development/tools | |
parent | 0975c4b77c12efbeafe021fd1920777652d9591b (diff) | |
download | nixlib-3ff2a789c233c871c82672a8f240d016602d368b.tar nixlib-3ff2a789c233c871c82672a8f240d016602d368b.tar.gz nixlib-3ff2a789c233c871c82672a8f240d016602d368b.tar.bz2 nixlib-3ff2a789c233c871c82672a8f240d016602d368b.tar.lz nixlib-3ff2a789c233c871c82672a8f240d016602d368b.tar.xz nixlib-3ff2a789c233c871c82672a8f240d016602d368b.tar.zst nixlib-3ff2a789c233c871c82672a8f240d016602d368b.zip |
conan: 0.26.1 -> 0.28.1
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 1558772ed601..4a2afbeedfe6 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,48 +1,29 @@ -{ stdenv, python }: +{ lib, buildPythonApplication, fetchPypi +, requests, fasteners, pyyaml, pyjwt, colorama, patch +, bottle, pluginbase, six, distro, pylint, node-semver +, future, pygments, mccabe +}: -let - p = python.override { - packageOverrides = self: super: { - astroid = super.astroid.overridePythonAttrs (oldAttrs: rec { - version = "1.4.9"; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "a483e7891ce3a06dadfc6cb9095b0938aca58940d43576d72e4502b480c085d7"; - }; - }); - pylint = super.pylint.overridePythonAttrs (oldAttrs: rec { - version = "1.6.5"; - name = "${oldAttrs.pname}-${version}"; - src = oldAttrs.src.override { - inherit version; - sha256 = "a673984a8dd78e4a8b8cfdee5359a1309d833cf38405008f4a249994a8456719"; - }; - }); - }; - }; - -in p.pkgs.buildPythonApplication rec { - name = "${pname}-${version}"; - version = "0.26.1"; +buildPythonApplication rec { + version = "0.28.1"; pname = "conan"; - src = p.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "2da5a140a74d912d5561698b8cc5a5e5583b9dbe36623c59b4ce4be586476e7c"; + sha256 = "0zf564iqh0099yd779f9fgk21qyp87d7cmgfj34hmncf8y3qh32a"; }; - propagatedBuildInputs = with p.pkgs; [ + propagatedBuildInputs = [ requests fasteners pyyaml pyjwt colorama patch bottle pluginbase six distro pylint node-semver future pygments mccabe ]; # enable tests once all of these pythonPackages available: - # [ nose nose_parameterized mock WebTest codecov ] + # [ nose nose_parameterized mock webtest codecov ] doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://conan.io; description = "Decentralized and portable C/C++ package manager"; license = licenses.mit; |