From a19f1accc30d970aa47bed76d3f9955ec2871431 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 23 Sep 2023 20:54:30 +1000 Subject: [PATCH 1/3] transmission, transmission_4: set mainProgram --- pkgs/applications/networking/p2p/transmission/4.nix | 1 + pkgs/applications/networking/p2p/transmission/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 05d757d53a2c..9a185fa94dae 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -143,6 +143,7 @@ stdenv.mkDerivation rec { 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. diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index cc82c5038083..1cfa057a73ee 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -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. From e1cab4915c82fb1d54c32481ff51ad0c790f6fa2 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 23 Sep 2023 20:56:23 +1000 Subject: [PATCH 2/3] transmission_4: restore nixosTests --- pkgs/applications/networking/p2p/transmission/4.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 9a185fa94dae..c0c5e22ae77d 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -141,6 +141,11 @@ stdenv.mkDerivation rec { EOF ''; + passthru.tests = { + apparmor = nixosTests.transmission; # 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"; From ea9254a5a58911e9d1d108aa2923ebbb6a78e1d9 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 23 Sep 2023 21:27:17 +1000 Subject: [PATCH 3/3] nixosTests.tranmission_4: init --- nixos/tests/all-tests.nix | 3 ++- nixos/tests/transmission.nix | 3 ++- pkgs/applications/networking/p2p/transmission/4.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0574c1db8754..be41183b2868 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -816,7 +816,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 {}; diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix index b69ddd84d009..03fc9a421510 100644 --- a/nixos/tests/transmission.nix +++ b/nixos/tests/transmission.nix @@ -1,4 +1,4 @@ -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 = diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index c0c5e22ae77d..07cdbcd25d57 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - apparmor = nixosTests.transmission; # starts the service with apparmor enabled + apparmor = nixosTests.transmission_4; # starts the service with apparmor enabled smoke-test = nixosTests.bittorrent; };