diff options
author | Cabia Rangris <me@cab404.ru> | 2023-10-02 06:45:16 +0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-02 06:45:16 +0400 |
commit | 6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5 (patch) | |
tree | 0d86a146db9dc6f51eeaf236a8e7c7b478a28a91 | |
parent | fe0b3b663e98c85db7f08ab3a4ac318c523c0684 (diff) | |
parent | 5edabf7c0b904e62b65027e2bc4dbed4e98788d1 (diff) | |
download | nixlib-6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5.tar nixlib-6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5.tar.gz nixlib-6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5.tar.bz2 nixlib-6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5.tar.lz nixlib-6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5.tar.xz nixlib-6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5.tar.zst nixlib-6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5.zip |
Merge pull request #237404 from cab404/cab/moonraker-gpiod
moonraker: add useGpiod
-rw-r--r-- | nixos/modules/services/misc/moonraker.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/moonraker/default.nix | 39 |
2 files changed, 30 insertions, 19 deletions
diff --git a/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix index 7e306d718e08..797e145c47a6 100644 --- a/nixos/modules/services/misc/moonraker.nix +++ b/nixos/modules/services/misc/moonraker.nix @@ -1,8 +1,8 @@ { config, lib, options, pkgs, ... }: with lib; let - pkg = pkgs.moonraker; cfg = config.services.moonraker; + pkg = cfg.package; opt = options.services.moonraker; format = pkgs.formats.ini { # https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996 @@ -18,6 +18,14 @@ in { services.moonraker = { enable = mkEnableOption (lib.mdDoc "Moonraker, an API web server for Klipper"); + package = mkOption { + type = with types; nullOr package; + default = pkgs.moonraker; + defaultText = literalExpression "pkgs.moonraker"; + example = literalExpression "pkgs.moonraker.override { useGpiod = true; }"; + description = lib.mdDoc "Moonraker package to use"; + }; + klipperSocket = mkOption { type = types.path; default = config.services.klipper.apiSocket; diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index ed2e988d8a66..8d33402d7d34 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -1,23 +1,26 @@ -{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests }: +{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests, useGpiod ? false }: let - pythonEnv = python3.withPackages (packages: with packages; [ - tornado - pyserial-asyncio - pillow - lmdb - streaming-form-data - distro - inotify-simple - libnacl - paho-mqtt - pycurl - zeroconf - preprocess-cancellation - jinja2 - dbus-next - apprise - ]); + pythonEnv = python3.withPackages (packages: + with packages; [ + tornado + pyserial-asyncio + pillow + lmdb + streaming-form-data + distro + inotify-simple + libnacl + paho-mqtt + pycurl + zeroconf + preprocess-cancellation + jinja2 + dbus-next + apprise + ] + ++ (lib.optionals useGpiod [ libgpiod ]) + ); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; version = "unstable-2023-08-03"; |