Merge master into staging-next

pkgs/tools/X11/opentabletdriver/default.nix

@@ -17,6 +17,7 @@
 , copyDesktopItems
 , makeDesktopItem
 , makeWrapper
+, nixosTests
 , wrapGAppsHook
 }:
 
@@ -154,6 +155,10 @@ stdenv.mkDerivation rec {
   dontWrapGApps = true;
   dontStrip = true;
 
+  passthru.tests = {
+    otd-runs = nixosTests.opentabletdriver;
+  };
+
   meta = with lib; {
     description = "Open source, cross-platform, user-mode tablet driver";
     homepage = "https://github.com/InfinityGhost/OpenTabletDriver";