Unverified Commit 6f793305 authored by Cabia Rangris's avatar Cabia Rangris Committed by GitHub
Browse files

Merge pull request #237404 from cab404/cab/moonraker-gpiod 

moonraker: add useGpiod
parents fe0b3b66 5edabf7c

nixos/modules/services/misc/moonraker.nix

+9 −1
Original line number Diff line number Diff line 
{ 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;

pkgs/servers/moonraker/default.nix

+21 −18
Original line number Diff line number Diff line 
{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests }:

{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests, useGpiod ? false }:



let

  pythonEnv = python3.withPackages (packages: with packages; [

  pythonEnv = python3.withPackages (packages:

    with packages; [

      tornado

      pyserial-asyncio

      pillow
@@ -17,7 +18,9 @@ let 
      jinja2

      dbus-next

      apprise

  ]);

    ]

    ++ (lib.optionals useGpiod [ libgpiod ])

  );

in stdenvNoCC.mkDerivation rec {

  pname = "moonraker";

  version = "unstable-2023-08-03";