Merge pull request #190885 from hexagonal-sun/sdrangel-update

This commit is contained in:
Sandro 2022-09-21 11:34:02 +02:00 committed by GitHub
commit a904ff1f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 149 additions and 2 deletions

View File

@ -603,6 +603,12 @@
githubId = 782180;
name = "Alex Vorobiev";
};
alexwinter = {
email = "git@alexwinter.net";
github = "lxwntr";
githubId = 50754358;
name = "Alex Winter";
};
alexeyre = {
email = "A.Eyre@sms.ed.ac.uk";
github = "alexeyre";

View File

@ -1,12 +1,18 @@
{ airspy
, airspyhf
, aptdec
, boost
, cm256cc
, cmake
, codec2
, dab_lib
, dsdcc
, faad2
, fetchFromGitHub
, fftwFloat
, glew
, hackrf
, hidapi
, lib
, ffmpeg
, libiio
@ -15,6 +21,7 @@
, libusb1
, limesuite
, libbladeRF
, mbelib
, mkDerivation
, ocl-icd
, opencv3
@ -25,21 +32,23 @@
, qtserialport
, qtspeech
, qtwebsockets
, qtwebengine
, rtl-sdr
, serialdv
, sgp4
, soapysdr-with-plugins
, uhd
}:
mkDerivation rec {
pname = "sdrangel";
version = "6.18.1";
version = "7.6.3";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
sha256 = "sha256-gf+RUOcki0pi3UH4NHFsmbTV04HUG16UC4jcUjyeip4=";
sha256 = "sha256-4o91vZnW5+wAKw4o3RrsS4gGVG0TyQCBcKg4GuE3n5s=";
fetchSubmodules = false;
};
@ -47,19 +56,26 @@ mkDerivation rec {
buildInputs = [
airspy
airspyhf
aptdec
boost
cm256cc
codec2
dab_lib
dsdcc
faad2
ffmpeg
fftwFloat
glew
hackrf
hidapi
libbladeRF
libiio
libopus
libpulseaudio
libusb1
limesuite
mbelib
opencv3
qtcharts
qtlocation
@ -67,16 +83,21 @@ mkDerivation rec {
qtserialport
qtspeech
qtwebsockets
qtwebengine
rtl-sdr
serialdv
sgp4
soapysdr-with-plugins
uhd
];
cmakeFlags = [
"-DAPT_DIR=${aptdec}"
"-DDAB_LIB=${dab_lib}"
"-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
"-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"
"-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so"
"-DSGP4_DIR=${sgp4}"
"-DSOAPYSDR_DIR=${soapysdr-with-plugins}"
];

View File

@ -0,0 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, libpng, libsndfile
}:
stdenv.mkDerivation {
pname = "aptdec";
version = "unstable-2022-05-18";
src = fetchFromGitHub {
owner = "Xerbo";
repo = "aptdec";
rev = "b1cc7480732349a7c772124f984b58f4c734c91b";
sha256 = "sha256-Fi9IkZcvqxpmHzqucpCr++37bmTtMy18P4LPznoaYIY=";
};
# fixes https://github.com/Xerbo/aptdec/issues/15
postPatch = ''
substituteInPlace CMakeLists.txt --replace "-Werror" ""
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libpng libsndfile ];
meta = with lib; {
description = "NOAA APT satellite imagery decoding library";
homepage = "https://github.com/Xerbo/aptdec";
license = licenses.gpl2;
maintainers = with maintainers; [ alexwinter ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, faad2, fftwFloat, zlib
}:
stdenv.mkDerivation {
pname = "dab_lib";
version = "unstable-2021-12-28";
src = fetchFromGitHub {
owner = "JvanKatwijk";
repo = "dab-cmdline";
rev = "d23adb3616bb11d98a909aceecb5a3b9507a674c";
sha256 = "sha256-n/mgsldgXEOLHZEL1cmsqXgFXByWoMeNXNoDWqPpipA=";
};
sourceRoot = "source/library/";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ faad2 fftwFloat zlib ];
meta = with lib; {
description = "DAB/DAB+ decoding library";
homepage = "https://github.com/JvanKatwijk/dab-cmdline";
license = licenses.gpl2;
maintainers = with maintainers; [ alexwinter ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,30 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, mbelib, serialdv
}:
stdenv.mkDerivation rec {
pname = "dsdcc";
version = "1.9.3";
src = fetchFromGitHub {
owner = "f4exb";
repo = "dsdcc";
rev = "v${version}";
sha256 = "sha256-8lO2c4fkQCaVO8IM05+Rdpo6oMxoEIObBm0y08i+/0k=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ mbelib serialdv ];
cmakeFlags = [
"-DUSE_MBELIB=ON"
];
meta = with lib; {
description = "Digital Speech Decoder (DSD) rewritten as a C++ library";
homepage = "https://github.com/f4exb/dsdcc";
license = licenses.gpl3;
maintainers = with maintainers; [ alexwinter ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,23 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
stdenv.mkDerivation {
pname = "sgp4";
version = "unstable-2021-01-11";
src = fetchFromGitHub {
owner = "dnwrnr";
repo = "sgp4";
rev = "ca9d4d97af4ee62461de6f13e0c85d1dc6000040";
sha256 = "sha256-56It/71R10U+Hnhw2tC16e5fZdyfQ8DLx6LVq65Rjvc=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "Simplified perturbations models library";
homepage = "https://github.com/dnwrnr/sgp4";
license = licenses.asl20;
maintainers = with maintainers; [ alexwinter ];
platforms = platforms.linux;
};
}

View File

@ -2858,6 +2858,8 @@ with pkgs;
apprise = with python3Packages; toPythonApplication apprise;
aptdec = callPackage ../development/libraries/aptdec {};
aria2 = callPackage ../tools/networking/aria2 {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -3554,6 +3556,8 @@ with pkgs;
cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { };
dab_lib = callPackage ../development/libraries/dab_lib {};
dabet = callPackage ../tools/misc/dabet { };
dabtools = callPackage ../applications/radio/dabtools { };
@ -3720,6 +3724,8 @@ with pkgs;
dpic = callPackage ../tools/graphics/dpic { };
dsdcc = callPackage ../development/libraries/dsdcc {};
dstp = callPackage ../development/tools/dstp { };
dsvpn = callPackage ../applications/networking/dsvpn { };
@ -4633,6 +4639,8 @@ with pkgs;
sfz = callPackage ../tools/misc/sfz { };
sgp4 = callPackage ../development/libraries/sgp4 {};
shab = callPackage ../tools/text/shab { };
sheldon = callPackage ../tools/misc/sheldon { };