Merge pull request #256866 from kirillrdy/transmission

transmission, transmission_4: set mainProgram and restore nixosTests

authored by

Doron Behar and committed by
GitHub
34585a2b 41f6c3ff

+11 -2
+2 -1
nixos/tests/all-tests.nix
··· 825 825 tor = handleTest ./tor.nix {}; 826 826 traefik = handleTestOn ["aarch64-linux" "x86_64-linux"] ./traefik.nix {}; 827 827 trafficserver = handleTest ./trafficserver.nix {}; 828 - transmission = handleTest ./transmission.nix {}; 828 + transmission = handleTest ./transmission.nix { transmission = pkgs.transmission; }; 829 + transmission_4 = handleTest ./transmission.nix { transmission = pkgs.transmission_4; }; 829 830 # tracee requires bpf 830 831 tracee = handleTestOn ["x86_64-linux"] ./tracee.nix {}; 831 832 trezord = handleTest ./trezord.nix {};
+2 -1
nixos/tests/transmission.nix
··· 1 - import ./make-test-python.nix ({ pkgs, ...} : { 1 + import ./make-test-python.nix ({ pkgs, transmission, ... }: { 2 2 name = "transmission"; 3 3 meta = with pkgs.lib.maintainers; { 4 4 maintainers = [ coconnor ]; ··· 12 12 security.apparmor.enable = true; 13 13 14 14 services.transmission.enable = true; 15 + services.transmission.package = transmission; 15 16 }; 16 17 17 18 testScript =
+6
pkgs/applications/networking/p2p/transmission/4.nix
··· 141 141 EOF 142 142 ''; 143 143 144 + passthru.tests = { 145 + apparmor = nixosTests.transmission_4; # starts the service with apparmor enabled 146 + smoke-test = nixosTests.bittorrent; 147 + }; 148 + 144 149 meta = { 145 150 description = "A fast, easy and free BitTorrent client"; 151 + mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; 146 152 longDescription = '' 147 153 Transmission is a BitTorrent client which features a simple interface 148 154 on top of a cross-platform back-end.
+1
pkgs/applications/networking/p2p/transmission/default.nix
··· 129 129 130 130 meta = { 131 131 description = "A fast, easy and free BitTorrent client"; 132 + mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; 132 133 longDescription = '' 133 134 Transmission is a BitTorrent client which features a simple interface 134 135 on top of a cross-platform back-end.