Skip to content

Commit

Permalink
Merge pull request #209733 from Janik-Haag/master-qdmr
Browse files Browse the repository at this point in the history
qdmr: init at 0.11.2, added janik as maintainer
  • Loading branch information
0x4A6F authored Feb 2, 2023
2 parents fb50f92 + 5c80430 commit 3215888
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 0 deletions.
7 changes: 7 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6595,6 +6595,13 @@
githubId = 20176306;
name = "jammerful";
};
janik = {
name = "Janik";
email = "janik@aq0.de";
matrix = "@janik0:matrix.org";
github = "Janik-Haag";
githubId = 80165193;
};
jansol = {
email = "jan.solanti@paivola.fi";
github = "jansol";
Expand Down
8 changes: 8 additions & 0 deletions nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,14 @@
<link linkend="opt-services.mmsd.enable">services.mmsd</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://dm3mat.darc.de/qdmr/">QDMR</link>, a
gui application and command line tool for programming cheap
DMR radios
<link linkend="opt-programs.qdmr.enable">programs.qdmr</link>
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://v2raya.org">v2rayA</link>, a Linux
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2305.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ In addition to numerous new and upgraded packages, this release has the followin

- [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and recieves MMSes. Available as [services.mmsd](#opt-services.mmsd.enable).

- [QDMR](https://dm3mat.darc.de/qdmr/), a gui application and command line tool for programming cheap DMR radios [programs.qdmr](#opt-programs.qdmr.enable)

- [v2rayA](https://v2raya.org), a Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel. Available as [services.v2raya](options.html#opt-services.v2raya.enable).

- [ulogd](https://www.netfilter.org/projects/ulogd/index.html), a userspace logging daemon for netfilter/iptables related logging. Available as [services.ulogd](options.html#opt-services.ulogd.enable).
Expand Down
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@
./programs/partition-manager.nix
./programs/plotinus.nix
./programs/proxychains.nix
./programs/qdmr.nix
./programs/qt5ct.nix
./programs/rog-control-center.nix
./programs/rust-motd.nix
Expand Down
25 changes: 25 additions & 0 deletions nixos/modules/programs/qdmr.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
config,
lib,
pkgs,
...
}:

let
cfg = config.programs.qdmr;
in {
meta.maintainers = [ lib.maintainers.janik ];

options = {
programs.qdmr = {
enable = lib.mkEnableOption (lib.mdDoc "QDMR - a GUI application and command line tool for programming DMR radios");
package = lib.mkPackageOptionMD pkgs "qdmr" { };
};
};

config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
services.udev.packages = [ cfg.package ];
users.groups.wireshark = {};
};
}
70 changes: 70 additions & 0 deletions pkgs/applications/radio/qdmr/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
lib,
stdenv,
fetchFromGitHub,
installShellFiles,
writeText,
cmake,
libxslt,
docbook_xsl_ns,
wrapQtAppsHook,
libusb1,
libyamlcpp,
qtlocation,
qtserialport,
qttools,
qtbase,
}:

let
inherit (stdenv) isLinux;
in

stdenv.mkDerivation rec {
pname = "qdmr";
version = "0.11.2";

src = fetchFromGitHub {
owner = "hmatuschek";
repo = "qdmr";
rev = "v${version}";
sha256 = "sha256-zT31tzsm5OM99vz8DzGCdPmnemiwiJpKccYwECnUgOQ=";
};

nativeBuildInputs = [
cmake
libxslt
wrapQtAppsHook
installShellFiles
];

buildInputs = [
libyamlcpp
libusb1
qtlocation
qtserialport
qttools
qtbase
];

postPatch = lib.optionalString isLinux ''
substituteInPlace doc/docbook_man.debian.xsl \
--replace /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook\.xsl ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl
'';

cmakeFlags = [ "-DBUILD_MAN=ON" ];

postInstall = ''
installManPage doc/dmrconf.1 doc/qdmr.1
mkdir -p "$out/etc/udev/rules.d"
cp ${src}/dist/99-qdmr.rules $out/etc/udev/rules.d/
'';

meta = {
description = "A codeplug programming tool for DMR radios";
homepage = "https://dm3mat.darc.de/qdmr/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ janik _0x4A6F ];
platforms = lib.platforms.linux;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,8 @@ with pkgs;

ebook2cw = callPackage ../applications/radio/ebook2cw { };

qdmr = libsForQt5.callPackage ../applications/radio/qdmr { };

edwin = callPackage ../data/fonts/edwin { };

etBook = callPackage ../data/fonts/et-book { };
Expand Down

0 comments on commit 3215888

Please sign in to comment.