From 0a7b18c226ae3f9be2b22dcbaf327b0baaf5e307 Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 18 Jun 2026 15:38:54 +0200 Subject: [PATCH 1/6] sdrangel: 7.22.9 -> 7.27.1 --- pkgs/by-name/sd/sdrangel/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 203ac01b72c9..0f1c5c85557a 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -12,7 +12,6 @@ dsdcc, faad2, fetchFromGitHub, - fetchpatch, fftwFloat, flac, glew, @@ -43,23 +42,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.22.9"; + version = "7.27.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; tag = "v${finalAttrs.version}"; - hash = "sha256-VYSM9ldzx/8tWKQb++qGROSXdeEXIDhGqnnHUmkW4+k="; + hash = "sha256-rdPXqA0ySnqh/rlMlfcDLyAd6egbggWHrRQRnXeQPFM="; }; - patches = [ - # Fix build with Qt 6.10, remove when the commit reaches a release - (fetchpatch { - url = "https://github.com/f4exb/sdrangel/commit/fd6a8d51f8c39fd31b4e864f528bf1921ebd4260.patch"; - hash = "sha256-S8LQbCTEgyEt1wByDsDMqqyQjK5HALtvUIODgQ1skSA="; - }) - ]; - nativeBuildInputs = [ cmake ninja From 9e5da930fd1d65ada7bf1f645355d74be1814bdd Mon Sep 17 00:00:00 2001 From: winston Date: Thu, 18 Jun 2026 15:39:38 +0200 Subject: [PATCH 2/6] ggmorse: init at 0.1.0-unstable-2024-05-31 --- pkgs/by-name/gg/ggmorse/package.nix | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/gg/ggmorse/package.nix diff --git a/pkgs/by-name/gg/ggmorse/package.nix b/pkgs/by-name/gg/ggmorse/package.nix new file mode 100644 index 000000000000..51a4ce819e28 --- /dev/null +++ b/pkgs/by-name/gg/ggmorse/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation { + pname = "ggmorse"; + version = "0.1.0-unstable-2024-05-31"; + + src = fetchFromGitHub { + owner = "ggerganov"; + repo = "ggmorse"; + rev = "8fb433d6cd6a71940f51b5724663ec0c75bf0b62"; + hash = "sha256-6GhyPhzNNAx1DSomfIfejbnLTckKa7/+VUZhSaGvGtI="; + }; + + postPatch = '' + substituteInPlace ./CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 3.0)" \ + "cmake_minimum_required (VERSION 3.5)" + ''; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "GGMORSE_BUILD_EXAMPLES" false) + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Morse code decoding library"; + homepage = "https://github.com/ggerganov/ggmorse"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nekowinston ]; + platforms = lib.platforms.unix; + }; +} From dded642635658d66aef7c0e9ba6064625de1875d Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 6 Jul 2026 17:03:50 +0100 Subject: [PATCH 3/6] inmarsatc: init at 0-unstable-2023-07-10 --- pkgs/by-name/in/inmarsatc/package.nix | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/in/inmarsatc/package.nix diff --git a/pkgs/by-name/in/inmarsatc/package.nix b/pkgs/by-name/in/inmarsatc/package.nix new file mode 100644 index 000000000000..c1ff54c4e6b3 --- /dev/null +++ b/pkgs/by-name/in/inmarsatc/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation { + pname = "inmarsatc"; + version = "0-unstable-2023-07-10"; + + src = fetchFromGitHub { + owner = "cropinghigh"; + repo = "inmarsatc"; + rev = "cda1242e79981d71cd8608e971c8dbc691942b10"; + hash = "sha256-UCmdHR9bSr1x4G0OP7n+o6pdS1thTl9hzH7YMykSiGw="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "C++ library with functions to receive Inmarsat-C signals"; + homepage = "https://github.com/cropinghigh/inmarsatc"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.nekowinston ]; + platforms = lib.platforms.linux; + }; +} From 561238d5e8f17dbbff399ce7d2a874b73b61beb6 Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 6 Jul 2026 16:37:01 +0100 Subject: [PATCH 4/6] sdrangel: add more optional dependencies --- pkgs/by-name/sd/sdrangel/package.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 0f1c5c85557a..b7556ca17be5 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -14,13 +14,17 @@ fetchFromGitHub, fftwFloat, flac, + ggmorse, glew, hackrf, hidapi, ffmpeg, + inmarsatc, libiio, + libogg, libopus, libpulseaudio, + libunwind, libusb1, limesuite, libbladeRF, @@ -30,6 +34,7 @@ pkg-config, qt6, qt6Packages, + rnnoise, rtl-sdr, serialdv, sdrplay, @@ -71,13 +76,16 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg fftwFloat flac + ggmorse glew hackrf hidapi libbladeRF libiio + libogg libopus libpulseaudio + libunwind libusb1 limesuite mbelib @@ -93,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.qttools qt6Packages.qtwebsockets qt6Packages.qtwebengine + rnnoise rtl-sdr serialdv sgp4 @@ -100,7 +109,10 @@ stdenv.mkDerivation (finalAttrs: { uhd zlib ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + inmarsatc + qt6Packages.qtwayland + ] ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ From 836c3d1d225cfff4936b0ebc7d64ca79927b277e Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 6 Jul 2026 16:38:49 +0100 Subject: [PATCH 5/6] sdrangel: various refactors - enable `__structuredAttrs` && `strictDeps` - use `lib.cmake{Bool,Feature}` in `cmakeFlags` - add `nix-update-script`, --- pkgs/by-name/sd/sdrangel/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index b7556ca17be5..a93b8ddab524 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -43,6 +43,7 @@ uhd, zlib, withSDRplay ? false, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -56,6 +57,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-rdPXqA0ySnqh/rlMlfcDLyAd6egbggWHrRQRnXeQPFM="; }; + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ cmake ninja @@ -116,14 +120,16 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ - "-DAPT_DIR=${aptdec}" - "-DDAB_DIR=${dab_lib}" - "-DSGP4_DIR=${sgp4}" - "-DSOAPYSDR_DIR=${soapysdr-with-plugins}" + (lib.cmakeFeature "APT_DIR" aptdec.outPath) + (lib.cmakeFeature "DAB_DIR" dab_lib.outPath) + (lib.cmakeFeature "SGP4_DIR" sgp4.outPath) + (lib.cmakeFeature "SOAPYSDR_DIR" soapysdr-with-plugins.outPath) + (lib.cmakeBool "ENABLE_QT6" true) "-Wno-dev" - "-DENABLE_QT6=ON" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Software defined radio (SDR) software"; homepage = "https://github.com/f4exb/sdrangel"; From 679bd0b4a6f30d900ddb92c330b26f3d8cf52f8c Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 6 Jul 2026 22:55:57 +0100 Subject: [PATCH 6/6] sdrangel: fix macOS build by disabling qtwebengine & libunwind --- pkgs/by-name/sd/sdrangel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index a93b8ddab524..4322a0d654e4 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: { libogg libopus libpulseaudio - libunwind libusb1 limesuite mbelib @@ -104,7 +103,6 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.qtspeech qt6Packages.qttools qt6Packages.qtwebsockets - qt6Packages.qtwebengine rnnoise rtl-sdr serialdv @@ -115,7 +113,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inmarsatc + libunwind qt6Packages.qtwayland + qt6Packages.qtwebengine ] ++ lib.optionals withSDRplay [ sdrplay ];