From b1504b444bc72db3414b0ca095d76789f68ebcd3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Sep 2017 17:28:57 +0200
Subject: [PATCH] conan: 0.21.2 -> 0.26.2, and fix build

---
 .../tools/build-managers/conan/default.nix    | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 69cc2db3ff28..1558772ed601 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,18 +1,41 @@
-{ stdenv, pythonPackages }:
+{ stdenv, python }:
 
-pythonPackages.buildPythonApplication rec {
-  name = "${pname}-${version}";
-  version = "0.21.2";
-  pname = "conan";
-
-  src = pythonPackages.fetchPypi {
-    inherit pname version;
-    sha256 = "0x9s5h81d885xdrjw5x99q18lhmj11kalrs6xnjy2phrr8qzil8c";
+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";
+        };
+      });
+    };
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+in p.pkgs.buildPythonApplication rec {
+  name = "${pname}-${version}";
+  version = "0.26.1";
+  pname = "conan";
+
+  src = p.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "2da5a140a74d912d5561698b8cc5a5e5583b9dbe36623c59b4ce4be586476e7c";
+  };
+
+  propagatedBuildInputs = with p.pkgs; [
     requests fasteners pyyaml pyjwt colorama patch
     bottle pluginbase six distro pylint node-semver
+    future pygments mccabe
   ];
 
   # enable tests once all of these pythonPackages available: