movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

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

Browse source 
moonraker: add useGpiod
This commit is contained in:
Cabia Rangris 2023-10-02 06:45:16 +04:00 • committed by GitHub
commit 6f7933059d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/services/misc/moonraker.nix
View file

@ -1,8 +1,8 @@
{ config, lib, options, pkgs, ... }: { config, lib, options, pkgs, ... }:
with lib; with lib;
let let
pkg = pkgs.moonraker;
cfg = config.services.moonraker; cfg = config.services.moonraker;
pkg = cfg.package;
opt = options.services.moonraker; opt = options.services.moonraker;
format = pkgs.formats.ini { format = pkgs.formats.ini {
# https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996 # https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996
@ -18,6 +18,14 @@ in {
services.moonraker = { services.moonraker = {
enable = mkEnableOption (lib.mdDoc "Moonraker, an API web server for Klipper"); 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 { klipperSocket = mkOption {
type = types.path; type = types.path;
default = config.services.klipper.apiSocket; default = config.services.klipper.apiSocket;

39
pkgs/servers/moonraker/default.nix
View file

@ -1,23 +1,26 @@
{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests }: { lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests, useGpiod ? false }:
let let
pythonEnv = python3.withPackages (packages: with packages; [ pythonEnv = python3.withPackages (packages:
tornado with packages; [
pyserial-asyncio tornado
pillow pyserial-asyncio
lmdb pillow
streaming-form-data lmdb
distro streaming-form-data
inotify-simple distro
libnacl inotify-simple
paho-mqtt libnacl
pycurl paho-mqtt
zeroconf pycurl
preprocess-cancellation zeroconf
jinja2 preprocess-cancellation
dbus-next jinja2
apprise dbus-next
]); apprise
]
++ (lib.optionals useGpiod [ libgpiod ])
);
in stdenvNoCC.mkDerivation rec { in stdenvNoCC.mkDerivation rec {
pname = "moonraker"; pname = "moonraker";
version = "unstable-2023-08-03"; version = "unstable-2023-08-03";