Merge branch 'master' into staging-next

(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
parent 9f024e4c92 90c2fb1f2f
commit 5663b2b2d3
201 changed files with 2565 additions and 1560 deletions
@@ -17,6 +17,7 @@
 , wrapGAppsHook
 , enableQt ? false
 , qt5
+, nixosTests
 , enableSystemd ? stdenv.isLinux
 , enableDaemon ? true
 , enableCli ? true
@@ -101,6 +102,10 @@ in stdenv.mkDerivation {
    EOF
  '';

+  passthru.tests = {
+    smoke-test = nixosTests.bittorrent;
+  };
+
  meta = {
    description = "A fast, easy and free BitTorrent client";
    longDescription = ''