From 3cba6e60aacb4a39f56ac5a84da5f459f7d1b1df Mon Sep 17 00:00:00 2001 From: Alex Winter Date: Sun, 17 Apr 2022 13:12:00 +0200 Subject: [PATCH 1/5] dab_lib: init at 20211228 --- maintainers/maintainer-list.nix | 6 ++++ .../development/libraries/dab_lib/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/dab_lib/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7fc5f300bc64..6d2504466039 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -597,6 +597,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"; diff --git a/pkgs/development/libraries/dab_lib/default.nix b/pkgs/development/libraries/dab_lib/default.nix new file mode 100644 index 000000000000..7570d8aaca72 --- /dev/null +++ b/pkgs/development/libraries/dab_lib/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bb23af91755..dc398b0d6578 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3528,6 +3528,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 { }; From 3d0331112d1fd9a014b31c50542a5b1bdd59e0cf Mon Sep 17 00:00:00 2001 From: Alex Winter Date: Sun, 17 Apr 2022 13:27:49 +0200 Subject: [PATCH 2/5] dsdcc: init at 1.9.3 --- pkgs/development/libraries/dsdcc/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/dsdcc/default.nix diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/development/libraries/dsdcc/default.nix new file mode 100644 index 000000000000..5eb4c8dc4640 --- /dev/null +++ b/pkgs/development/libraries/dsdcc/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc398b0d6578..70fa0484119e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3696,6 +3696,8 @@ with pkgs; dpic = callPackage ../tools/graphics/dpic { }; + dsdcc = callPackage ../development/libraries/dsdcc {}; + dstp = callPackage ../development/tools/dstp { }; dsvpn = callPackage ../applications/networking/dsvpn { }; From 5de43b65386124be85314ba9464dc4f4f51075d9 Mon Sep 17 00:00:00 2001 From: Alex Winter Date: Sun, 17 Apr 2022 13:49:24 +0200 Subject: [PATCH 3/5] aptdec: init at 20220518 --- pkgs/development/libraries/aptdec/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/aptdec/default.nix diff --git a/pkgs/development/libraries/aptdec/default.nix b/pkgs/development/libraries/aptdec/default.nix new file mode 100644 index 000000000000..5f1db6d35593 --- /dev/null +++ b/pkgs/development/libraries/aptdec/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70fa0484119e..ad4e9fa64b3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2842,6 +2842,8 @@ with pkgs; apprise = with python3Packages; toPythonApplication apprise; + aptdec = callPackage ../development/libraries/aptdec {}; + aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; From 91aa25cc04b521422df261cf2c4835d839b89e49 Mon Sep 17 00:00:00 2001 From: Alex Winter Date: Sun, 17 Apr 2022 13:54:46 +0200 Subject: [PATCH 4/5] sgp4: init at 20210111 --- pkgs/development/libraries/sgp4/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/sgp4/default.nix diff --git a/pkgs/development/libraries/sgp4/default.nix b/pkgs/development/libraries/sgp4/default.nix new file mode 100644 index 000000000000..98c62f9cd345 --- /dev/null +++ b/pkgs/development/libraries/sgp4/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad4e9fa64b3d..121a1ac8b29b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4610,6 +4610,8 @@ with pkgs; sfz = callPackage ../tools/misc/sfz { }; + sgp4 = callPackage ../development/libraries/sgp4 {}; + shab = callPackage ../tools/text/shab { }; sheldon = callPackage ../tools/misc/sheldon { }; From 8f25e21f42327457ffd149704ae926b89b5c386b Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Sun, 11 Sep 2022 06:58:51 +0100 Subject: [PATCH 5/5] sdrangel: 6.18.1 -> 7.6.3 --- pkgs/applications/radio/sdrangel/default.nix | 25 ++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 2f66de63428c..7bf472cc7e36 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -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}" ];