Merge remote-tracking branch 'upstream/master' into staging

2018-07-09 11:58:38 -04:00
parent 98b5258955 ef2ac673a1
commit 6eb508a3e8
441 changed files with 11813 additions and 9152 deletions
@@ -20,12 +20,12 @@ let newPython = python.override {
 };

 in newPython.pkgs.buildPythonApplication rec {
-  version = "1.4.5";
+  version = "1.5.1";
  pname = "conan";

  src = newPython.pkgs.fetchPypi {
    inherit pname version;
-    sha256 = "1mjakrv1d7la3lrxsv6jjqprqwmslpjmfxkw3z7pk56rzlp99nv2";
+    sha256 = "1b0iym41fpgv8vwbyys5hrh87pvh3hy2m9c01ybm72z2ki2pwxim";
  };

  postPatch = ''