conan: 0.26.1 -> 0.28.1

NixOS · Nov 13, 2017 · 3ff2a78 · 3ff2a78 · FRidh · Jan 7, 2018
1 parent 0975c4b
commit 3ff2a78
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 32 deletions.
diff --git 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;

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -7055,7 +7055,7 @@ with pkgs;
 
   complexity = callPackage ../development/tools/misc/complexity { };
 
-  conan = callPackage ../development/tools/build-managers/conan { };
+  conan = pythonPackages.callPackage ../development/tools/build-managers/conan { };
 
   cookiecutter = pythonPackages.cookiecutter;