Unverified Commit 34585a2b authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #256866 from kirillrdy/transmission 

transmission, transmission_4: set mainProgram and restore nixosTests
parents 41f6c3ff ea9254a5

nixos/tests/all-tests.nix

+2 −1
Original line number Diff line number Diff line
@@ -825,7 +825,8 @@ in { 
  tor = handleTest ./tor.nix {};

  traefik = handleTestOn ["aarch64-linux" "x86_64-linux"] ./traefik.nix {};

  trafficserver = handleTest ./trafficserver.nix {};

  transmission = handleTest ./transmission.nix {};

  transmission = handleTest ./transmission.nix { transmission = pkgs.transmission; };

  transmission_4 = handleTest ./transmission.nix { transmission = pkgs.transmission_4; };

  # tracee requires bpf

  tracee = handleTestOn ["x86_64-linux"] ./tracee.nix {};

  trezord = handleTest ./trezord.nix {};

nixos/tests/transmission.nix

+2 −1
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ pkgs, ...} : {

import ./make-test-python.nix ({ pkgs, transmission, ... }: {

  name = "transmission";

  meta = with pkgs.lib.maintainers; {

    maintainers = [ coconnor ];
@@ -12,6 +12,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { 
    security.apparmor.enable = true;



    services.transmission.enable = true;

    services.transmission.package = transmission;

  };



  testScript =

pkgs/applications/networking/p2p/transmission/4.nix

+6 −0
Original line number Diff line number Diff line
@@ -141,8 +141,14 @@ stdenv.mkDerivation rec { 
    EOF

  '';



  passthru.tests = {

    apparmor = nixosTests.transmission_4; # starts the service with apparmor enabled

    smoke-test = nixosTests.bittorrent;

  };



  meta = {

    description = "A fast, easy and free BitTorrent client";

    mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli";

    longDescription = ''

      Transmission is a BitTorrent client which features a simple interface

      on top of a cross-platform back-end.

pkgs/applications/networking/p2p/transmission/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ in stdenv.mkDerivation { 


  meta = {

    description = "A fast, easy and free BitTorrent client";

    mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli";

    longDescription = ''

      Transmission is a BitTorrent client which features a simple interface

      on top of a cross-platform back-end.