diff --git a/pkgs/applications/radio/pat/default.nix b/pkgs/by-name/pa/pat/package.nix similarity index 53% rename from pkgs/applications/radio/pat/default.nix rename to pkgs/by-name/pa/pat/package.nix index 1f1140e5fd4b0..0352ef2c6cd98 100644 --- a/pkgs/applications/radio/pat/default.nix +++ b/pkgs/by-name/pa/pat/package.nix @@ -1,30 +1,42 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, libax25 -, installShellFiles +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + libax25, + installShellFiles, + fetchpatch, }: buildGoModule rec { pname = "pat"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "la5nta"; repo = "pat"; rev = "v${version}"; - hash = "sha256-wNWqqGc4mf3z0ejMpU+jWhqCbjNJ2b6+pbBjDYKwKK8="; + hash = "sha256-JlqYdsAXs3pS5i59tiel+gxQsTrn5mUs0qLzjHxGZU0="; }; - vendorHash = "sha256-m5yb6+TfRApw0ZROx9ZA3RPiKV+1DHo/73CNQpIfMlU="; + # Remove upon next release since upstream is fixed + # https://github.com/la5nta/pat/pull/449 + patches = [ + (fetchpatch { + url = "https://github.com/la5nta/pat/commit/5604eac8853216d96d49d7d9947bdc514e195538.patch"; + sha256 = "sha256-Z9uoZLlhdCslULUxGkc4ao4ptC4ImWzSrfabSA5S/PE="; + }) + ]; - ldflags = [ "-s" "-w" ]; + vendorHash = "sha256-Z6p0wiOY5l++nch64BJWGXleBgUNecTDm+yVCnmXvtU="; - nativeBuildInputs = [ - installShellFiles + ldflags = [ + "-s" + "-w" ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optional stdenv.hostPlatform.isLinux [ libax25 ]; # Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25. @@ -39,7 +51,10 @@ buildGoModule rec { description = "Pat is a cross platform Winlink client written in Go"; homepage = "https://getpat.io/"; license = licenses.mit; - maintainers = with maintainers; [ dotemup sarcasticadmin ]; + maintainers = with maintainers; [ + dotemup + sarcasticadmin + ]; platforms = platforms.unix; mainProgram = "pat"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index deb1734470781..0894150116066 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29823,8 +29823,6 @@ with pkgs; passky-desktop = callPackage ../applications/misc/passky-desktop { }; - pat = callPackage ../applications/radio/pat { }; - pinboard = with python3Packages; toPythonApplication pinboard; pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup;