From eb419c2f34533b1e2c7490c9a3b76f012318e785 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Sep 2026 16:15:14 +0200 Subject: [PATCH 1/2] termscp: mark it as linux-only --- pkgs/by-name/te/termscp/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix index 8190fa2ef87a..d9a0476064d2 100644 --- a/pkgs/by-name/te/termscp/package.nix +++ b/pkgs/by-name/te/termscp/package.nix @@ -50,16 +50,9 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=cli::remote::test::test_should_make_remote_args_from_two_remotes_and_local_dir" "--skip=system::auto_update::test::test_should_check_whether_github_api_is_reachable" "--skip=system::environment::tests::test_system_environment_get_config_dir_err" - ] - ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ - "--skip=system::watcher::test::should_poll_file_removed" - "--skip=system::watcher::test::should_poll_file_update" - "--skip=system::watcher::test::should_poll_nothing" ]; - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { changelog = "https://github.com/veeso/termscp/blob/v${finalAttrs.version}/CHANGELOG.md"; @@ -71,6 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: { fab gepbird ]; - platforms = with lib.platforms; linux ++ darwin; + platforms = lib.platforms.linux; }; }) From eca0315200a6c1f55c40fc93927973e6e2db4f26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Sep 2026 16:18:16 +0200 Subject: [PATCH 2/2] termscp: modernize --- pkgs/by-name/te/termscp/package.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix index d9a0476064d2..3bd6f4e46d99 100644 --- a/pkgs/by-name/te/termscp/package.nix +++ b/pkgs/by-name/te/termscp/package.nix @@ -24,9 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-Var5ZnwX9OyCh+G6/5JF1K/IJR7nQ5508+B1akfsito="; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus @@ -37,14 +35,14 @@ rustPlatform.buildRustPackage (finalAttrs: { # Needed to get openssl-sys to use pkg-config. env.OPENSSL_NO_VENDOR = 1; - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; checkFeatures = [ "isolated-tests" ]; + checkFlags = [ - # requires networking + # Tests require networking "--skip=cli::remote::test::test_should_make_remote_args_from_one_bookmark_and_one_remote_with_local_dir" "--skip=cli::remote::test::test_should_make_remote_args_from_two_bookmarks_and_local_dir" "--skip=cli::remote::test::test_should_make_remote_args_from_two_remotes_and_local_dir" @@ -55,15 +53,15 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { + description = "Terminal UI file transfer and explorer with support for SCP/SFTP/FTP/S3/SMB"; changelog = "https://github.com/veeso/termscp/blob/v${finalAttrs.version}/CHANGELOG.md"; - description = "Feature rich terminal UI file transfer and explorer with support for SCP/SFTP/FTP/S3/SMB"; homepage = "https://github.com/veeso/termscp"; license = lib.licenses.mit; - mainProgram = "termscp"; maintainers = with lib.maintainers; [ fab gepbird ]; + mainProgram = "termscp"; platforms = lib.platforms.linux; }; })