commit 6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5 · pyrox.dev/nixpkgs

+9 -1

nixos/modules/services/misc/moonraker.nix

···

       1
       1
        
       { config, lib, options, pkgs, ... }:

     

       2
       2
        
       with lib;

     

       3
       3
        
       let

     

       4
       4
       -
         pkg = pkgs.moonraker;

     

       5
       4
        
         cfg = config.services.moonraker;

     

       5
       5
       +
         pkg = cfg.package;

     

       6
       6
        
         opt = options.services.moonraker;

     

       7
       7
        
         format = pkgs.formats.ini {

     

       8
       8
        
           # https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996

     
···

       17
       17
        
         options = {

     

       18
       18
        
           services.moonraker = {

     

       19
       19
        
             enable = mkEnableOption (lib.mdDoc "Moonraker, an API web server for Klipper");

     

       20
       20
       +
       

     

       21
       21
       +
             package = mkOption {

     

       22
       22
       +
               type = with types; nullOr package;

     

       23
       23
       +
               default = pkgs.moonraker;

     

       24
       24
       +
               defaultText = literalExpression "pkgs.moonraker";

     

       25
       25
       +
               example = literalExpression "pkgs.moonraker.override { useGpiod = true; }";

     

       26
       26
       +
               description = lib.mdDoc "Moonraker package to use";

     

       27
       27
       +
             };

     

       20
       28
        
       

     

       21
       29
        
             klipperSocket = mkOption {

     

       22
       30
        
               type = types.path;

+21 -18

pkgs/servers/moonraker/default.nix

···

       1
       1
       -
       { lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests }:

     

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

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

     

       5
       5
       -
           tornado

     

       6
       6
       -
           pyserial-asyncio

     

       7
       7
       -
           pillow

     

       8
       8
       -
           lmdb

     

       9
       9
       -
           streaming-form-data

     

       10
       10
       -
           distro

     

       11
       11
       -
           inotify-simple

     

       12
       12
       -
           libnacl

     

       13
       13
       -
           paho-mqtt

     

       14
       14
       -
           pycurl

     

       15
       15
       -
           zeroconf

     

       16
       16
       -
           preprocess-cancellation

     

       17
       17
       -
           jinja2

     

       18
       18
       -
           dbus-next

     

       19
       19
       -
           apprise

     

       20
       20
       -
         ]);

     

       4
       4
       +
         pythonEnv = python3.withPackages (packages:

     

       5
       5
       +
           with packages; [

     

       6
       6
       +
             tornado

     

       7
       7
       +
             pyserial-asyncio

     

       8
       8
       +
             pillow

     

       9
       9
       +
             lmdb

     

       10
       10
       +
             streaming-form-data

     

       11
       11
       +
             distro

     

       12
       12
       +
             inotify-simple

     

       13
       13
       +
             libnacl

     

       14
       14
       +
             paho-mqtt

     

       15
       15
       +
             pycurl

     

       16
       16
       +
             zeroconf

     

       17
       17
       +
             preprocess-cancellation

     

       18
       18
       +
             jinja2

     

       19
       19
       +
             dbus-next

     

       20
       20
       +
             apprise

     

       21
       21
       +
           ]

     

       22
       22
       +
           ++ (lib.optionals useGpiod [ libgpiod ])

     

       23
       23
       +
         );

     

       21
       24
        
       in stdenvNoCC.mkDerivation rec {

     

       22
       25
        
         pname = "moonraker";

     

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