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

2018-03-30 08:14:35 +02:00
parent 01fb1af4f5 a7af5d4f88
commit 9d2ff98571
101 changed files with 1732 additions and 418 deletions
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -70,6 +70,7 @@ pythonPackages.buildPythonApplication {
    pygobject2
    reportlab
    usbutils
+    sip
  ] ++ stdenv.lib.optionals withQt5 [
    pyqt5
  ];