diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 3f16677ead654..14f371d1c1457 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -20,6 +20,8 @@ - [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood). +- [QGroundControl], a ground station support and configuration manager for the PX4 and APM Flight Stacks. Available as [programs.qgroundcontrol](options.html#opt-programs.qgroundcontrol.enable). + - [Eintopf](https://eintopf.info), community event and calendar web application. Available as [services.eintopf](options.html#opt-services.eintopf). - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fc62e9db1785c..5b8be7a969ba8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -258,6 +258,7 @@ ./programs/projecteur.nix ./programs/proxychains.nix ./programs/qdmr.nix + ./programs/qgroundcontrol.nix ./programs/qt5ct.nix ./programs/quark-goldleaf.nix ./programs/regreet.nix diff --git a/nixos/modules/programs/qgroundcontrol.nix b/nixos/modules/programs/qgroundcontrol.nix new file mode 100644 index 0000000000000..4534d79f25dd8 --- /dev/null +++ b/nixos/modules/programs/qgroundcontrol.nix @@ -0,0 +1,53 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.qgroundcontrol; +in +{ + + options = { + programs.qgroundcontrol = { + enable = lib.mkEnableOption "qgroundcontrol"; + + package = lib.mkPackageOption pkgs "qgroundcontrol" {}; + + blacklistModemManagerFromTTYUSB = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Disallow ModemManager from interfering with serial connections that QGroundControl might use. + + Note that if you use a modem that's connected via USB, you might want to disable this option. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + # ModemManager is known to interfere with serial connections; + # QGC recommends disabling it, but we don't want to if we can avoid it + # Instead, we blacklist tty devices using udev rules, which is a more targeted approach + services.udev = lib.mkIf cfg.blacklistModemManagerFromTTYUSB { + enable = true; + extraRules = '' + # nixos/qgroundcontrol: Blacklist ttyUSB devices from ModemManager + SUBSYSTEM=="tty", KERNEL=="ttyUSB*", ENV{ID_MM_DEVICE_IGNORE}="1" + ''; + }; + + # Security wrapper + security.wrappers.qgroundcontrol = { + source = lib.getExe cfg.package; + owner = "root"; # Sensible default; not setuid so this is not a security risk + group = "tty"; + setgid = true; + }; + }; + + meta.maintainers = pkgs.qgroundcontrol.meta.maintainers; +} diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index a999a719e2e40..02849d098dd22 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "http://qgroundcontrol.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ lopsided98 ]; + maintainers = with maintainers; [ lopsided98 pandapip1 ]; mainProgram = "QGroundControl"; }; }