diff options
author | Nick Cao <nickcao@nichi.co> | 2023-02-07 10:09:49 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-07 10:09:49 +0800 |
commit | 3aee0744e8d1695e281dcaee2ed1404c95f808d0 (patch) | |
tree | 1011d3f8175a584bbadde0718a9de919bd09327e | |
parent | 8f3021c728633279fe7f644ad0656235f7886f2d (diff) | |
parent | e24028141f278590407dd5389330f23d01c89cff (diff) | |
download | nixpkgs-3aee0744e8d1695e281dcaee2ed1404c95f808d0.tar nixpkgs-3aee0744e8d1695e281dcaee2ed1404c95f808d0.tar.gz nixpkgs-3aee0744e8d1695e281dcaee2ed1404c95f808d0.tar.bz2 nixpkgs-3aee0744e8d1695e281dcaee2ed1404c95f808d0.tar.lz nixpkgs-3aee0744e8d1695e281dcaee2ed1404c95f808d0.tar.xz nixpkgs-3aee0744e8d1695e281dcaee2ed1404c95f808d0.tar.zst nixpkgs-3aee0744e8d1695e281dcaee2ed1404c95f808d0.zip |
Merge pull request #214982 from Janik-Haag/master
qdmr: fixup
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2305.section.xml | 4 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2305.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/programs/qdmr.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/radio/qdmr/default.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 24eae9d9c07..e0931abe341 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -116,8 +116,8 @@ <listitem> <para> <link xlink:href="https://dm3mat.darc.de/qdmr/">QDMR</link>, a - gui application and command line tool for programming cheap - DMR radios + GUI application and command line tool for programming DMR + radios <link linkend="opt-programs.qdmr.enable">programs.qdmr</link> </para> </listitem> diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 20e1423ca62..9cf42984714 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -38,7 +38,7 @@ 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) +- [QDMR](https://dm3mat.darc.de/qdmr/), a GUI application and command line tool for programming 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). diff --git a/nixos/modules/programs/qdmr.nix b/nixos/modules/programs/qdmr.nix index c0b1984eff9..1bb81317bda 100644 --- a/nixos/modules/programs/qdmr.nix +++ b/nixos/modules/programs/qdmr.nix @@ -20,6 +20,6 @@ in { config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; - users.groups.wireshark = {}; + users.groups.dialout = {}; }; } diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index 79a9fdb51ce..6d0d71e8673 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A codeplug programming tool for DMR radios"; + description = "GUI application and command line tool for programming DMR radios"; homepage = "https://dm3mat.darc.de/qdmr/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ janik _0x4A6F ]; |