conan: 0.26.1 -> 0.28.1

+13 -32
+12 -31
pkgs/development/tools/build-managers/conan/default.nix
··· 1 - { stdenv, python }: 1 + { lib, buildPythonApplication, fetchPypi 2 + , requests, fasteners, pyyaml, pyjwt, colorama, patch 3 + , bottle, pluginbase, six, distro, pylint, node-semver 4 + , future, pygments, mccabe 5 + }: 2 6 3 - let 4 - p = python.override { 5 - packageOverrides = self: super: { 6 - astroid = super.astroid.overridePythonAttrs (oldAttrs: rec { 7 - version = "1.4.9"; 8 - name = "${oldAttrs.pname}-${version}"; 9 - src = oldAttrs.src.override { 10 - inherit version; 11 - sha256 = "a483e7891ce3a06dadfc6cb9095b0938aca58940d43576d72e4502b480c085d7"; 12 - }; 13 - }); 14 - pylint = super.pylint.overridePythonAttrs (oldAttrs: rec { 15 - version = "1.6.5"; 16 - name = "${oldAttrs.pname}-${version}"; 17 - src = oldAttrs.src.override { 18 - inherit version; 19 - sha256 = "a673984a8dd78e4a8b8cfdee5359a1309d833cf38405008f4a249994a8456719"; 20 - }; 21 - }); 22 - }; 23 - }; 24 - 25 - in p.pkgs.buildPythonApplication rec { 26 - name = "${pname}-${version}"; 27 - version = "0.26.1"; 7 + buildPythonApplication rec { 8 + version = "0.28.1"; 28 9 pname = "conan"; 29 10 30 - src = p.pkgs.fetchPypi { 11 + src = fetchPypi { 31 12 inherit pname version; 32 - sha256 = "2da5a140a74d912d5561698b8cc5a5e5583b9dbe36623c59b4ce4be586476e7c"; 13 + sha256 = "0zf564iqh0099yd779f9fgk21qyp87d7cmgfj34hmncf8y3qh32a"; 33 14 }; 34 15 35 - propagatedBuildInputs = with p.pkgs; [ 16 + propagatedBuildInputs = [ 36 17 requests fasteners pyyaml pyjwt colorama patch 37 18 bottle pluginbase six distro pylint node-semver 38 19 future pygments mccabe 39 20 ]; 40 21 41 22 # enable tests once all of these pythonPackages available: 42 - # [ nose nose_parameterized mock WebTest codecov ] 23 + # [ nose nose_parameterized mock webtest codecov ] 43 24 doCheck = false; 44 25 45 - meta = with stdenv.lib; { 26 + meta = with lib; { 46 27 homepage = https://conan.io; 47 28 description = "Decentralized and portable C/C++ package manager"; 48 29 license = licenses.mit;
+1 -1
pkgs/top-level/all-packages.nix
··· 7055 7055 7056 7056 complexity = callPackage ../development/tools/misc/complexity { }; 7057 7057 7058 - conan = callPackage ../development/tools/build-managers/conan { }; 7058 + conan = pythonPackages.callPackage ../development/tools/build-managers/conan { }; 7059 7059 7060 7060 cookiecutter = pythonPackages.cookiecutter; 7061 7061