From 00e2b76589aa020b60539719498c2922a545723f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 27 Oct 2024 15:35:25 +0400 Subject: [PATCH 1/3] =?UTF-8?q?trayscale:=200.13.1=20=E2=86=92=200.13.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/trayscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index 7e8648c3bb0e3..5014db1cdc20f 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.13.1"; + version = "0.13.5"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-uOPTF6AD70POD1y0R5aXo7t9WtyFGbRrgL8U++nTRl0="; + hash = "sha256-SBt9bK2fjxIEANjw+Gs+lHiWplzNMfporj+ZVtt50pw="; }; - vendorHash = "sha256-8lrszfxTKLA3KRuuQ312s+1GfK63DwQEK8xDwb1JdrI="; + vendorHash = "sha256-PPKrtvW0fwzCO+OqJ7S/Kd6WOwN1DqQDhpeQUPCSpUU="; subPackages = [ "cmd/trayscale" ]; From 06b9d0a57e207b1edf79b6d6af0cd0339eabe91b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 27 Oct 2024 18:45:00 +0400 Subject: [PATCH 2/3] trayscale: adopt --- pkgs/applications/networking/trayscale/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index 5014db1cdc20f..9fa5c40e073fd 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -45,13 +45,13 @@ buildGoModule rec { gappsWrapperArgs+=(--prefix PATH : "${tailscale}/bin") ''; - meta = with lib; { + meta = { changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${src.rev}"; description = "Unofficial GUI wrapper around the Tailscale CLI client"; homepage = "https://github.com/DeedleFake/trayscale"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir ]; mainProgram = "trayscale"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 5a224867a810da86760de28cadb518c53e589a0c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 27 Oct 2024 18:49:10 +0400 Subject: [PATCH 3/3] trayscale: migrate to by-name --- .../trayscale/default.nix => by-name/tr/trayscale/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/trayscale/default.nix => by-name/tr/trayscale/package.nix} (100%) diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/by-name/tr/trayscale/package.nix similarity index 100% rename from pkgs/applications/networking/trayscale/default.nix rename to pkgs/by-name/tr/trayscale/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46bc008246332..086db44f191da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12935,8 +12935,6 @@ with pkgs; tran = callPackage ../tools/networking/tran { }; - trayscale = callPackage ../applications/networking/trayscale { }; - tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { }; tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };