From 2e77af64e99fd00a7d21f45cd7e3bbe3bde89baa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Dec 2022 04:38:04 +0100 Subject: [PATCH] chirp: 20220823 -> unstable-2022-12-07 --- pkgs/applications/radio/chirp/default.nix | 37 ++++++++++++++++------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 95d33d6f1ee..e73f438f76b 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -1,24 +1,39 @@ { lib -, fetchurl -, python2 +, fetchFromGitHub +, python3 +, unstableGitUpdater }: -python2.pkgs.buildPythonApplication rec { - pname = "chirp-daily"; - version = "20220823"; - src = fetchurl { - url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-V+8HQAYU2XjOYeku0XEHqkY4m0XjiUBxM61QcupnlVM="; +python3.pkgs.buildPythonApplication rec { + pname = "chirp"; + version = "unstable-2022-12-07"; + + src = fetchFromGitHub { + owner = "kk7ds"; + repo = "chirp"; + rev = "dc0c98d22423b496faf0a86296a6ec0bb3b3e11a"; + hash = "sha256-z0xD11CB7Vt8k0dPXE+E5ZD9XAFwWNxjnUs25/Gd7zI="; }; - propagatedBuildInputs = with python2.pkgs; [ - pygtk pyserial libxml2 future + propagatedBuildInputs = with python3.pkgs; [ + future + pyserial + requests + six + wxPython_4_2 ]; + # "running build_ext" fails with no output + doCheck = false; + + passthru.updateScript = unstableGitUpdater { + branch = "py3"; + }; + meta = with lib; { description = "A free, open-source tool for programming your amateur radio"; homepage = "https://chirp.danplanet.com/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; }