Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1548439

pkgs/development/python-modules/bokeh/default.nix

@@ -8,6 +8,7 @@
 , mock
 , numpy
 , nodejs
+, packaging
 , pillow
 , pytest
 , python
@@ -48,6 +49,7 @@ buildPythonPackage rec {
     pyyaml
     tornado
     numpy
+    packaging
   ]
   ++ lib.optionals ( !isPy3k ) [ futures ];
 

pkgs/development/python-modules/credstash/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "credstash";
-  version = "1.15.0";
+  version = "1.16.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "814560f99ae2409e2c6d906d878f9dadada5d1d0a950aafb6b2c0d535291bdfb";
+    sha256 = "019wviz3hx0pkh3mgqr3prg55njyhzvhjqcpndgrfmkykjkcj435";
   };
 
   # The install phase puts an executable and a copy of the library it imports in

pkgs/development/python-modules/ed25519/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "ed25519";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
+    sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182";
   };
 
   meta = with stdenv.lib; {

pkgs/development/python-modules/glances/default.nix

@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchFromGitHub, isPyPy, lib
+{ buildPythonPackage, fetchFromGitHub, fetchpatch, isPyPy, lib
 , psutil, setuptools, bottle, batinfo, pysnmp
 , hddtemp, future
 # Optional dependencies:
@@ -9,18 +9,23 @@
 
 buildPythonPackage rec {
   pname = "glances";
-  version = "3.1.2";
+  version = "3.1.3";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "v${version}";
-    sha256 = "1z9sq0chhm8m4gq98yfknxj408cj017h7j375blngjk2zvhw39qd";
+    sha256 = "15yz8sbw3k3n0729g2zcwsxc5iyhkyrhqza6fnipxxpsskwgqbwp";
   };
 
   # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
-  patches = lib.optional doCheck ./skip-failing-tests.patch;
+  patches = lib.optional doCheck ./skip-failing-tests.patch
+    ++ [ (fetchpatch {
+      # Correct unitest
+      url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch";
+      sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1";
+    }) ];
 
   doCheck = true;
   checkInputs = [ unittest2 ];

pkgs/development/python-modules/misaka/default.nix

@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A CFFI binding for Hoedown, a markdown parsing library";
-    homepage = "http://misaka.61924.nl/";
+    homepage = "https://misaka.61924.nl";
     license = licenses.mit;
     maintainers = with maintainers; [ fgaz ];
   };

pkgs/development/python-modules/poetry/default.nix

@@ -87,6 +87,5 @@ in buildPythonPackage rec {
     description = "Python dependency management and packaging made easy";
     license = licenses.mit;
     maintainers = with maintainers; [ jakewaksbaum ];
-    broken = true;
   };
 }

pkgs/development/python-modules/solo-python/default.nix

@@ -0,0 +1,37 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, click, ecdsa, fido2, intelhex, pyserial, pyusb, requests}:
+
+ buildPythonPackage rec {
+  pname = "solo-python";
+  version = "0.0.15";
+  format = "flit";
+
+  src = fetchFromGitHub {
+    owner = "solokeys";
+    repo = pname;
+    rev = version;
+    sha256 = "14na9s65hxzx141bdv0j7rx1wi3cv85jzpdivsq1rwp6hdhiazr1";
+  };
+
+  # TODO: remove ASAP
+  patchPhase = ''
+    substituteInPlace pyproject.toml --replace "fido2 == 0.7.0" "fido2 >= 0.7.0"
+  '';
+
+  propagatedBuildInputs = [
+    click
+    ecdsa
+    fido2
+    intelhex
+    pyserial
+    pyusb
+    requests
+  ];
+
+  meta = with lib; {
+    description = "Python tool and library for SoloKeys";
+    homepage = "https://github.com/solokeys/solo-python";
+    maintainers = with maintainers; [ wucke13 ];
+    license = with licenses; [ asl20 mit ];
+  };
+}