openwebrx: migrate to by-name

openwebrx: refactor package definitions
This commit is contained in:
Guy Chronister 2025-08-08 13:18:07 +00:00
parent a0832edc5d
commit 19931713bb
2 changed files with 38 additions and 48 deletions

View File

@ -1,19 +1,15 @@
{ {
stdenv, stdenv,
lib, lib,
buildPythonPackage, python3Packages,
buildPythonApplication,
fetchFromGitHub, fetchFromGitHub,
pkg-config, pkg-config,
cmake, cmake,
setuptools,
libsamplerate, libsamplerate,
fftwFloat, fftwFloat,
rtl-sdr, rtl-sdr,
soapysdr-with-plugins, soapysdr-with-plugins,
csdr, csdr,
pycsdr,
pydigiham,
direwolf, direwolf,
sox, sox,
wsjtx, wsjtx,
@ -22,16 +18,16 @@
let let
js8py = buildPythonPackage rec { js8py = python3Packages.buildPythonPackage rec {
pname = "js8py"; pname = "js8py";
version = "0.1.1"; version = "0.1.1";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jketterl"; owner = "jketterl";
repo = pname; repo = "js8py";
rev = version; tag = version;
sha256 = "1j80zclg1cl5clqd00qqa16prz7cyc32bvxqz2mh540cirygq24w"; hash = "sha256-nAj8fI4MkAKr+LjvJQbz7Px8TVAYA9AwZYWy8Cj7AMk=";
}; };
pythonImportsCheck = [ pythonImportsCheck = [
@ -39,11 +35,11 @@ let
"test" "test"
]; ];
meta = with lib; { meta = {
homepage = "https://github.com/jketterl/js8py"; homepage = "https://github.com/jketterl/js8py";
description = "Library to decode the output of the js8 binary of JS8Call"; description = "Library to decode the output of the js8 binary of JS8Call";
license = licenses.gpl3Only; license = lib.licenses.gpl3Only;
teams = [ teams.c3d2 ]; teams = with lib.teams; [ c3d2 ];
}; };
}; };
@ -53,9 +49,9 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jketterl"; owner = "jketterl";
repo = pname; repo = "owrx_connector";
rev = version; tag = version;
sha256 = "sha256-1H0TJ8QN3b6Lof5TWvyokhCeN+dN7ITwzRvEo2X8OWc="; hash = "sha256-1H0TJ8QN3b6Lof5TWvyokhCeN+dN7ITwzRvEo2X8OWc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -71,41 +67,45 @@ let
soapysdr-with-plugins soapysdr-with-plugins
]; ];
meta = with lib; { meta = {
homepage = "https://github.com/jketterl/owrx_connector"; homepage = "https://github.com/jketterl/owrx_connector";
description = "Set of connectors that are used by OpenWebRX to interface with SDR hardware"; description = "Set of connectors that are used by OpenWebRX to interface with SDR hardware";
license = licenses.gpl3Only; license = lib.licenses.gpl3Only;
platforms = platforms.unix; platforms = lib.platforms.unix;
teams = [ teams.c3d2 ]; teams = with lib.teams; [ c3d2 ];
}; };
}; };
in in
buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "openwebrx"; pname = "openwebrx";
version = "1.2.2"; version = "1.2.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jketterl"; owner = "jketterl";
repo = pname; repo = "openwebrx";
rev = version; tag = version;
hash = "sha256-i3Znp5Sxs/KtJazHh2v9/2P+3cEocWB5wIpF7E4pK9s="; hash = "sha256-i3Znp5Sxs/KtJazHh2v9/2P+3cEocWB5wIpF7E4pK9s=";
}; };
propagatedBuildInputs = [ dependencies =
setuptools with python3Packages;
csdr [
pycsdr setuptools
pydigiham csdr
js8py pycsdr
soapysdr-with-plugins pydigiham
owrx_connector ]
direwolf ++ [
sox js8py
wsjtx soapysdr-with-plugins
codecserver owrx_connector
]; direwolf
sox
wsjtx
codecserver
];
pythonImportsCheck = [ pythonImportsCheck = [
"csdr" "csdr"
@ -117,11 +117,11 @@ buildPythonApplication rec {
inherit js8py owrx_connector; inherit js8py owrx_connector;
}; };
meta = with lib; { meta = {
homepage = "https://github.com/jketterl/openwebrx"; homepage = "https://github.com/jketterl/openwebrx";
description = "Simple DSP library and command-line tool for Software Defined Radio"; description = "Simple DSP library and command-line tool for Software Defined Radio";
mainProgram = "openwebrx"; mainProgram = "openwebrx";
license = licenses.gpl3Only; license = lib.licenses.gpl3Only;
teams = [ teams.c3d2 ]; teams = with lib.teams; [ c3d2 ];
}; };
} }

View File

@ -9015,16 +9015,6 @@ with pkgs;
openssl_3_5 openssl_3_5
; ;
openwebrx = callPackage ../applications/radio/openwebrx {
inherit (python3Packages)
buildPythonPackage
buildPythonApplication
setuptools
pycsdr
pydigiham
;
};
pcre = callPackage ../development/libraries/pcre { }; pcre = callPackage ../development/libraries/pcre { };
# pcre32 seems unused # pcre32 seems unused
pcre-cpp = res.pcre.override { variant = "cpp"; }; pcre-cpp = res.pcre.override { variant = "cpp"; };