conan: 1.5.2 -> 1.6.0

1 files changed, 30 insertions, 11 deletions

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index e77647b2fed44..3725760c1d6cc 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,6 +1,6 @@
-{ lib, python }:
+{ lib, python3, fetchpatch, git }:
 
-let newPython = python.override {
+let newPython = python3.override {
   packageOverrides = self: super: {
     distro = super.distro.overridePythonAttrs (oldAttrs: rec {
       version = "1.1.0";
@@ -16,30 +16,48 @@ let newPython = python.override {
         sha256 = "1080pdxrvnkr8i7b7bk0dfx6cwrkkzzfaranl7207q6rdybzqay3";
       };
     });
+    astroid = super.astroid.overridePythonAttrs (oldAttrs: rec {
+      version = "1.6.5";
+      src = oldAttrs.src.override {
+        inherit version;
+        sha256 = "fc9b582dba0366e63540982c3944a9230cbc6f303641c51483fa547dcc22393a";
+      };
+    });
+    pylint = super.pylint.overridePythonAttrs (oldAttrs: rec {
+      version = "1.8.4";
+      src = oldAttrs.src.override {
+        inherit version;
+        sha256 = "34738a82ab33cbd3bb6cd4cef823dbcabdd2b6b48a4e3a3054a2bbbf0c712be9";
+      };
+
+    });
   };
 };
 
 in newPython.pkgs.buildPythonApplication rec {
-  version = "1.5.2";
+  version = "1.6.0";
   pname = "conan";
 
   src = newPython.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "0r5ymq27j60py1fb396zshq7z6adda34a857lwrj3k8hqhs0ihpp";
+    sha256 = "386476d3af1fa390e4cd96e737876e7d1f1c0bca09519e51fd44c1bb45990caa";
   };
 
-  postPatch = ''
-    # Remove pylint constraint
-    substituteInPlace conans/requirements.txt --replace ", <1.9.0" ""
-  '';
+  # Bump PyYAML to 3.13
+  patches = fetchpatch {
+    url = https://github.com/conan-io/conan/commit/9d3d7a5c6e89b3aa321735557e5ad3397bb80568.patch;
+    sha256 = "1qdy6zj3ypl1bp9872mzaqg1gwigqldxb1glvrkq3p4za62p546k";
+  };
 
-  checkInputs = with newPython.pkgs; [
+  checkInputs = [
+    git
+  ] ++ (with newPython.pkgs; [
     nose
     parameterized
     mock
     webtest
     codecov
-  ];
+  ]);
 
   propagatedBuildInputs = with newPython.pkgs; [
     requests fasteners pyyaml pyjwt colorama patch
@@ -47,9 +65,10 @@ in newPython.pkgs.buildPythonApplication rec {
     future pygments mccabe deprecation
   ];
 
-  preCheck = ''
+  checkPhase = ''
     export HOME="$TMP/conan-home"
     mkdir -p "$HOME"
+    nosetests conans.test
   '';
 
   meta = with lib; {