From 0c1e0622250897dc57e2857a87c85e70e37ed782 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 30 Dec 2023 22:45:51 +0100 Subject: [PATCH 1/6] bluetuith: 0.1.9 -> 0.2.0 --- pkgs/tools/bluetooth/bluetuith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix index d6fad23c1632..c5e123b74885 100644 --- a/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/pkgs/tools/bluetooth/bluetuith/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bluetuith"; - version = "0.1.9"; + version = "0.2.0"; src = fetchFromGitHub { owner = "darkhz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vdHnG0uQdy5PboIovtxl5i9xwFpjYLCZf2IGeiMcWe8="; + sha256 = "sha256-5Jn5qkCUj2ohpZU+XqR90Su2svcLqW+hW6kmeEVfrtI="; }; vendorHash = "sha256-pYVEFKLPfstWWO6ypgv7ntAaE1Wmq2XKuZC2ccMa8Vc="; From c1272bf843f5d9de8da4f833796fef1a6d95c124 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 30 Dec 2023 22:48:34 +0100 Subject: [PATCH 2/6] bluetuith: move to by-name --- .../bluetuith/default.nix => by-name/bl/bluetuith/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/bluetooth/bluetuith/default.nix => by-name/bl/bluetuith/package.nix} (100%) diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/by-name/bl/bluetuith/package.nix similarity index 100% rename from pkgs/tools/bluetooth/bluetuith/default.nix rename to pkgs/by-name/bl/bluetuith/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 056bada2b343..698d7ea7fea0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6723,8 +6723,6 @@ with pkgs; blueman = callPackage ../tools/bluetooth/blueman { }; - bluetuith = callPackage ../tools/bluetooth/bluetuith { }; - bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; bogofilter = callPackage ../tools/misc/bogofilter { }; From d85188a55098806926ae025f6facee61fa601080 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 30 Dec 2023 22:49:25 +0100 Subject: [PATCH 3/6] bluetuith: add katexochen as maintainer --- pkgs/by-name/bl/bluetuith/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix index c5e123b74885..20eacf1e6c75 100644 --- a/pkgs/by-name/bl/bluetuith/package.nix +++ b/pkgs/by-name/bl/bluetuith/package.nix @@ -21,6 +21,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.linux; mainProgram = "bluetuith"; - maintainers = with maintainers; [ thehedgeh0g ]; + maintainers = with maintainers; [ thehedgeh0g katexochen ]; }; } From 3a625a07bd6ab0b02bf825f044359451dcc05244 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sun, 31 Dec 2023 09:19:04 +0100 Subject: [PATCH 4/6] bluetuith: update meta --- pkgs/by-name/bl/bluetuith/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix index 20eacf1e6c75..2d27b90cbd11 100644 --- a/pkgs/by-name/bl/bluetuith/package.nix +++ b/pkgs/by-name/bl/bluetuith/package.nix @@ -17,7 +17,15 @@ buildGoModule rec { meta = with lib; { description = "TUI-based bluetooth connection manager"; + longDescription = '' + Bluetuith can transfer files via OBEX, perform authenticated pairing, + and (dis)connect different bluetooth devices. It interacts with bluetooth + adapters and can toogle their power and discovery state. Bluetuith can also + manage Bluetooth-based networking/tethering (PANU/DUN) and remote control + devices. The TUI has mouse support. + ''; homepage = "https://github.com/darkhz/bluetuith"; + changelog = "https://github.com/darkhz/bluetuith/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.linux; mainProgram = "bluetuith"; From b8063f4a25d0f55b28ca723a6173ee0ff7d0d404 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sun, 31 Dec 2023 09:39:46 +0100 Subject: [PATCH 5/6] bluetuith: fix version injection, disable CGO --- pkgs/by-name/bl/bluetuith/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix index 2d27b90cbd11..eb357e4e03d5 100644 --- a/pkgs/by-name/bl/bluetuith/package.nix +++ b/pkgs/by-name/bl/bluetuith/package.nix @@ -13,7 +13,13 @@ buildGoModule rec { vendorHash = "sha256-pYVEFKLPfstWWO6ypgv7ntAaE1Wmq2XKuZC2ccMa8Vc="; - ldflags = [ "-s" "-w" ]; + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X github.com/darkhz/bluetuith/cmd.Version=${version}@nixpkgs" + ]; meta = with lib; { description = "TUI-based bluetooth connection manager"; From ef5476448e0b77e8e96a756e15081bc7dead9f0b Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sun, 31 Dec 2023 09:40:40 +0100 Subject: [PATCH 6/6] bluetuith: add update script --- pkgs/by-name/bl/bluetuith/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix index eb357e4e03d5..3eaebf7cd5d4 100644 --- a/pkgs/by-name/bl/bluetuith/package.nix +++ b/pkgs/by-name/bl/bluetuith/package.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: buildGoModule rec { pname = "bluetuith"; @@ -21,6 +25,8 @@ buildGoModule rec { "-X github.com/darkhz/bluetuith/cmd.Version=${version}@nixpkgs" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "TUI-based bluetooth connection manager"; longDescription = ''