Merge master into staging-next

2019-08-27 16:36:47 +02:00
parent 70c1c856d4 b40ee82685
commit 98640fd482
271 changed files with 5293 additions and 2782 deletions
@@ -146,7 +146,7 @@ in stdenv.mkDerivation rec {
    # build-time dependencies
    DateManip DBI DBDmysql LWP SysMmap
    # run-time dependencies not checked at build-time
-    ClassStdFast DataDump JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
+    ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
  ]);

  nativeBuildInputs = [ cmake makeWrapper pkgconfig ];