Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] speedtest-cli: Remove upstream-abandoned package.
@ 2025-02-04  5:23 klardotsh
  2025-02-08 17:35 ` classabbyamp
  2025-02-12  0:27 ` klardotsh
  0 siblings, 2 replies; 3+ messages in thread
From: klardotsh @ 2025-02-04  5:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

There is a new pull request by klardotsh against master on the void-packages repository

https://github.com/klardotsh/void-packages klardotsh/remove-unmaintained-speedtest-cli
https://github.com/void-linux/void-packages/pull/54209

speedtest-cli: Remove upstream-abandoned package.
This package [hasn't received an update upstream in 4+ years](https://github.com/sivel/speedtest-cli) and judging by the pull requests outstanding, is liable to start bitrotting imminently (namely: it depends on deprecated methods in the standard library, and I've had issues recently with it not always being able to pull a server list from speedtest.net).

I suppose there's a case for keeping this package until it truly just no longer runs, but with `librespeed-cli` packaged, we already have a viable and maintained alternative, and I'd argue we should spare ourselves this ticking timebomb of future breakage.

Not sure if we want to remove [this rename](https://github.com/void-linux/void-packages/blob/42c71ea4878992ce8150135e1926ecc453f3195c/srcpkgs/librespeed-cli/template#L23-L26) in `librespeed-cli` in light of this, so I didn't change that for now.


A patch file from https://github.com/void-linux/void-packages/pull/54209.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-klardotsh/remove-unmaintained-speedtest-cli-54209.patch --]
[-- Type: text/x-diff, Size: 4847 bytes --]

From f0b296d6bcd012e79600afac13d723f1dd1888da Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Mon, 3 Feb 2025 21:03:31 -0800
Subject: [PATCH 1/3] speedtest-cli: remove

---
 srcpkgs/speedtest-cli/template | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 srcpkgs/speedtest-cli/template

diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template
deleted file mode 100644
index 025cc24bbecf43..00000000000000
--- a/srcpkgs/speedtest-cli/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'speedtest-cli'
-pkgname=speedtest-cli
-version=2.1.3
-revision=5
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3"
-short_desc="Command line bandwidth test using speedtest.net"
-maintainer="Aaron Marcher <info@nulltime.net>"
-license="Apache-2.0"
-homepage="https://github.com/sivel/speedtest-cli"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=45e3ca21c3ce3c339646100de18db8a26a27d240c29f1c9e07b6c13995a969be
-
-post_install() {
-	vman speedtest-cli.1
-}

From 176146c2ac7964f3bbcdf37f359c6a65130b0453 Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Mon, 3 Feb 2025 21:04:21 -0800
Subject: [PATCH 2/3] removed-packages: add speedtest-cli.

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a5ca51952f9741..11599d4f946dfb 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20250110
+version=0.1.20250203
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -815,6 +815,7 @@ replaces="
  slmenu<=0.1_1
  soulseekqt<=20160117_2
  spacefm-ng<=1.0.6_3
+ speedtest-cli<=2.1.3_5
  spotify-adblock-linux<=1.1_1
  sqlite-replication<=3.32.3_2
  srw<=0.7_1

From 99c06f6d48f1b7a1126cb6012e4b6a23171e12bb Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Mon, 3 Feb 2025 21:12:45 -0800
Subject: [PATCH 3/3] nutty: Revert to using vendored speedtest-cli.

The speedtest-cli packaged in our repos no longer works and is
unmaintained upstream, and so has been removed. Nutty [fixed][upstream]
their vendored speedtest-cli to be Py3-compatible as of v1.2.0, so
revert to using it instead.

[upstream]: https://github.com/babluboy/nutty/commit/8c23031d04bd30d12c1438855848ce5a8dae116a
---
 .../patches/use-system-speedtestcli.patch     | 27 -------------------
 srcpkgs/nutty/template                        |  5 ++--
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/nutty/patches/use-system-speedtestcli.patch

diff --git a/srcpkgs/nutty/patches/use-system-speedtestcli.patch b/srcpkgs/nutty/patches/use-system-speedtestcli.patch
deleted file mode 100644
index b707a0cadb3dfb..00000000000000
--- a/srcpkgs/nutty/patches/use-system-speedtestcli.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-nutty vendors an old and broken python2-only version of speedtest-cli.
-Since it is already packaged (and python3 already), we can rely on it instead.
-
---
-
---- a/src/nutty.vala
-+++ b/src/nutty.vala
-@@ -1682,9 +1682,6 @@
- 			speedtest_list_store.clear();
- 			TreeIter iter;
- 			if(shouldExecute){
--				if(! COMMAND_FOR_SPEED_TEST[0].contains(Constants.NUTTY_SCRIPT_PATH)){
--					COMMAND_FOR_SPEED_TEST[0] = Constants.NUTTY_SCRIPT_PATH+ "/" + COMMAND_FOR_SPEED_TEST[0];
--				}
- 				execute_sync_multiarg_command_pipes(COMMAND_FOR_SPEED_TEST);
- 				//handle unsucessfull command execution and raise error on infobar
- 				if(!Utils.isExpectedOutputPresent(
---- a/data/scripts/meson.build
-+++ b/data/scripts/meson.build
-@@ -23,7 +23,6 @@
-     'nutty_vnstat_script.sh',
-     'nutty_traceroute_script.sh',
-     'nutty_ports_script.sh',
--    'speedtest-cli'
- ]
- foreach a_script : script_names
-     install_data(
diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index 8a27637d60ef70..224e57694b38f7 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -1,12 +1,11 @@
 # Template file for 'nutty'
 pkgname=nutty
 version=1.1.1
-revision=3
+revision=4
 build_style=meson
 hostmakedepends="pkg-config gettext vala glib-devel"
 makedepends="gtk+3-devel libgee08-devel libnotify-devel granite-devel
  sqlite-devel"
-depends="speedtest-cli"
 short_desc="Network Utility"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
@@ -14,6 +13,8 @@ homepage="https://github.com/babluboy/nutty"
 distfiles="https://github.com/babluboy/nutty/archive/${version}.tar.gz"
 checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
 
+python_version="3"
+
 post_install() {
 	vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications
 }

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: speedtest-cli: Remove upstream-abandoned package.
  2025-02-04  5:23 [PR PATCH] speedtest-cli: Remove upstream-abandoned package klardotsh
@ 2025-02-08 17:35 ` classabbyamp
  2025-02-12  0:27 ` klardotsh
  1 sibling, 0 replies; 3+ messages in thread
From: classabbyamp @ 2025-02-08 17:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/54209#issuecomment-2645866477

Comment:
1. could we have nutty use librespeed-cli (non-vendored)? it has the flags `--simple --bytes` just like `speedtest-cli`
2. we could have a symlink `librespeed-cli -> speedtest-cli` in the librespeed package, and have speedtest-cli be a transitional package attached to librespeed

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: speedtest-cli: Remove upstream-abandoned package.
  2025-02-04  5:23 [PR PATCH] speedtest-cli: Remove upstream-abandoned package klardotsh
  2025-02-08 17:35 ` classabbyamp
@ 2025-02-12  0:27 ` klardotsh
  1 sibling, 0 replies; 3+ messages in thread
From: klardotsh @ 2025-02-12  0:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

New comment by klardotsh on void-packages repository

https://github.com/void-linux/void-packages/pull/54209#issuecomment-2652358995

Comment:
1. I don't know much about `nutty` to give it all that great of a regression test (I only learned it existed by grepping for references to speedtest in the packages tree), but I can give that a whirl. ETA unknown, life is busy recently.
2. Seems reasonable to me.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-02-12  0:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-04  5:23 [PR PATCH] speedtest-cli: Remove upstream-abandoned package klardotsh
2025-02-08 17:35 ` classabbyamp
2025-02-12  0:27 ` klardotsh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).