summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers
diff options
context:
space:
mode:
authorTimo Kaufmann <timokau@zoho.com>2018-03-11 15:21:01 +0100
committerTimo Kaufmann <timokau@zoho.com>2018-03-13 11:36:45 +0100
commit5fdfe61b35945b287b084f22076fef34062f17d2 (patch)
treee4ad5b9f8c28736896e380210505a95545444c2b /pkgs/development/tools/build-managers
parent4443c5f740a9f5eae9a85ab29f2f8fa08933ce3b (diff)
downloadnixpkgs-5fdfe61b35945b287b084f22076fef34062f17d2.tar
nixpkgs-5fdfe61b35945b287b084f22076fef34062f17d2.tar.gz
nixpkgs-5fdfe61b35945b287b084f22076fef34062f17d2.tar.bz2
nixpkgs-5fdfe61b35945b287b084f22076fef34062f17d2.tar.lz
nixpkgs-5fdfe61b35945b287b084f22076fef34062f17d2.tar.xz
nixpkgs-5fdfe61b35945b287b084f22076fef34062f17d2.tar.zst
nixpkgs-5fdfe61b35945b287b084f22076fef34062f17d2.zip
conan: Fix build
conan has very strict requirements on the versions of its dependencies.
This patch adds downgraded versinos of node-semver and distro to
statisfy these requirements.
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r--pkgs/development/tools/build-managers/conan/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 4a2afbeedfe..6350798e108 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,26 +1,28 @@
 { lib, buildPythonApplication, fetchPypi
 , requests, fasteners, pyyaml, pyjwt, colorama, patch
-, bottle, pluginbase, six, distro, pylint, node-semver
+, bottle, pluginbase, six, distro11, pylint, node-semver2
 , future, pygments, mccabe
+, fetchpatch
 }:
 
 buildPythonApplication rec {
-  version = "0.28.1";
+  version = "1.1.1";
   pname = "conan";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zf564iqh0099yd779f9fgk21qyp87d7cmgfj34hmncf8y3qh32a";
+    sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl";
   };
 
   propagatedBuildInputs = [
     requests fasteners pyyaml pyjwt colorama patch
-    bottle pluginbase six distro pylint node-semver
+    bottle pluginbase six distro11 pylint node-semver2
     future pygments mccabe
   ];
 
   # enable tests once all of these pythonPackages available:
   # [ nose nose_parameterized mock webtest codecov ]
+  # update 2018-03-11: only nose_parameterized is missing
   doCheck = false;
 
   meta = with lib; {