From eb5258213edb874d9f31ee1b5a8069d94dc0bfcf Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Sat, 8 Oct 2022 00:25:48 +0200 Subject: [PATCH 1/5] maintainers: add oxapentane --- maintainers/maintainer-list.nix | 9 +++++++++ maintainers/team-list.nix | 1 + 2 files changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 697cb475dc1b..d9d7970c751c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10181,6 +10181,15 @@ fingerprint = "F90F FD6D 585C 2BA1 F13D E8A9 7571 654C F88E 31C2"; }]; }; + oxapentane = { + email = "blame@oxapentane.com"; + github = "oxapentane"; + githubId = 1297357; + name = "Grigory Shipunov"; + keys = [{ + fingerprint = "DD09 98E6 CDF2 9453 7FC6 04F9 91FA 5E5B F9AA 901C"; + }]; + }; oxij = { email = "oxij@oxij.org"; github = "oxij"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index a8e66897a683..35e184b43991 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -110,6 +110,7 @@ with lib.maintainers; { astro SuperSandro2000 revol-xut + oxapentane ]; scope = "Maintain packages used in the C3D2 hackspace"; shortName = "c3d2"; From 846c75400ecf5e43c333496844443891ac31a826 Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Sat, 8 Oct 2022 02:27:18 +0200 Subject: [PATCH 2/5] suwidgets: init at unstable-2022-04-03 --- pkgs/applications/radio/suwidgets/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/radio/suwidgets/default.nix diff --git a/pkgs/applications/radio/suwidgets/default.nix b/pkgs/applications/radio/suwidgets/default.nix new file mode 100644 index 000000000000..05f6cf12d6cd --- /dev/null +++ b/pkgs/applications/radio/suwidgets/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, qtbase +, pkg-config +, sigutils +, fftwSinglePrec +}: + +stdenv.mkDerivation rec { + pname = "suwidgets"; + version = "unstable-2022-04-03"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "SuWidgets"; + rev = "826b3eeae5b682dc063f53b427caa9c7c48131ea"; + sha256 = "sha256-cyFLsP+8GbALdlgEnVX4201Qq/KAxb/Vv+sJqbFpvUk="; + }; + + dontWrapQtApps = true; + + postPatch = '' + substituteInPlace SuWidgets.pri \ + --replace "PKGCONFIG += sigutils fftw3" "PKGCONFIG += sigutils fftw3f" + ''; + + nativeBuildInputs = [ + qmake + pkg-config + ]; + + buildInputs = [ + qtbase + sigutils + fftwSinglePrec + ]; + + qmakeFlags = [ + "SuWidgetsLib.pro" + ]; + + meta = with lib; { + description = "Sigutils-related widgets"; + homepage = "https://github.com/BatchDrake/SuWidgets"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d965021201e2..8adfd9374461 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22051,6 +22051,8 @@ with pkgs; splat = callPackage ../applications/radio/splat { }; + suwidgets = libsForQt5.callPackage ../applications/radio/suwidgets { }; + sratom = callPackage ../development/libraries/audio/sratom { }; srm = callPackage ../tools/security/srm { }; From e53592866269bf2bddc2bd13e82759e432b9776a Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Sat, 8 Oct 2022 02:28:24 +0200 Subject: [PATCH 3/5] sigutils: init at unstable-2022-07-05 --- pkgs/applications/radio/sigutils/default.nix | 40 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/radio/sigutils/default.nix diff --git a/pkgs/applications/radio/sigutils/default.nix b/pkgs/applications/radio/sigutils/default.nix new file mode 100644 index 000000000000..8b384af02270 --- /dev/null +++ b/pkgs/applications/radio/sigutils/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, fftwSinglePrec +, libsndfile +, volk +}: + +stdenv.mkDerivation rec { + pname = "sigutils"; + version = "unstable-2022-07-05"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "sigutils"; + rev = "1d7559d427aadd253dd825eef26bf15e54860c5f"; + sha256 = "sha256-wvd6sixwGmR9R4x+swLVqXre4Dqnj10jZIXUfaJcmBw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + fftwSinglePrec + libsndfile + volk + ]; + + meta = with lib; { + description = "Small signal processing utility library"; + homepage = "https://github.com/BatchDrake/sigutils"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8adfd9374461..2e552b3bf569 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21819,6 +21819,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + sigutils = callPackage ../applications/radio/sigutils { }; + sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { }; From 49584052fedc12ce54c988402978aced61acfbf0 Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Sat, 8 Oct 2022 02:29:07 +0200 Subject: [PATCH 4/5] suscan: init at unstable-2022-07-05 --- pkgs/applications/radio/suscan/default.nix | 50 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/radio/suscan/default.nix diff --git a/pkgs/applications/radio/suscan/default.nix b/pkgs/applications/radio/suscan/default.nix new file mode 100644 index 000000000000..d2b13784a72c --- /dev/null +++ b/pkgs/applications/radio/suscan/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, fftwSinglePrec +, libsndfile +, sigutils +, soapysdr-with-plugins +, libxml2 +, volk +}: + +stdenv.mkDerivation rec { + pname = "suscan"; + version = "unstable-2022-07-05"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "suscan"; + rev = "37dad542b97aff24654f0bb80fb8e85af7cb84ab"; + sha256 = "sha256-h1ogtYjkqiHb1/NAJfJ0HQIvGnZM2K/PSP5nqLXUf9M="; + }; + + postPatch = '' + sed -i 's/fftw3 >= 3.0/fftw3f >= 3.0/' suscan.pc.in + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + fftwSinglePrec + libsndfile + sigutils + soapysdr-with-plugins + libxml2 + volk + ]; + + meta = with lib; { + description = "Channel scanner based on sigutils library"; + homepage = "https://github.com/BatchDrake/suscan"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e552b3bf569..47c234f60049 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22053,6 +22053,8 @@ with pkgs; splat = callPackage ../applications/radio/splat { }; + suscan = callPackage ../applications/radio/suscan { }; + suwidgets = libsForQt5.callPackage ../applications/radio/suwidgets { }; sratom = callPackage ../development/libraries/audio/sratom { }; From b9e2097a74316083c1a21e472ba0cc57fc269e30 Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Sat, 8 Oct 2022 02:29:46 +0200 Subject: [PATCH 5/5] sigdigger: init at 0.3.0 --- pkgs/applications/radio/sigdigger/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/applications/radio/sigdigger/default.nix diff --git a/pkgs/applications/radio/sigdigger/default.nix b/pkgs/applications/radio/sigdigger/default.nix new file mode 100644 index 000000000000..4273d148ce28 --- /dev/null +++ b/pkgs/applications/radio/sigdigger/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, qtbase +, pkg-config +, sigutils +, fftwSinglePrec +, suwidgets +, wrapQtAppsHook +, suscan +, libsndfile +, soapysdr-with-plugins +, libxml2 +, volk +}: + +stdenv.mkDerivation rec { + pname = "sigdigger"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "BatchDrake"; + repo = "SigDigger"; + rev = "v${version}"; + sha256 = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE="; + }; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + sigutils + fftwSinglePrec + suwidgets + suscan + libsndfile + libxml2 + volk + soapysdr-with-plugins + ]; + + qmakeFlags = [ + "SUWIDGETS_PREFIX=${suwidgets}" + "SigDigger.pro" + ]; + + meta = with lib; { + description = "Qt-based digital signal analyzer, using Suscan core and Sigutils DSP library"; + homepage = "https://github.com/BatchDrake/SigDigger"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ polygon oxapentane ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47c234f60049..8a38f163d6b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21819,6 +21819,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { }; + sigutils = callPackage ../applications/radio/sigutils { }; sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {};