commit 64a2790e99f9da70e078c78b933cfae035c95584 · pyrox.dev/nixpkgs

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

···

       149
        
                 <link linkend="opt-services.meshcentral.enable">services.meshcentral.enable</link>

     

       150
        
               </para>

     

       151
        
             </listitem>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       152
        
           </itemizedlist>

     

       153
        
         </section>

     

       154
        
         <section xml:id="sec-release-21.11-incompatibilities">

···

       149
        
                 <link linkend="opt-services.meshcentral.enable">services.meshcentral.enable</link>

     

       150
        
               </para>

     

       151
        
             </listitem>

     

       152
       +
             <listitem>

     

       153
       +
               <para>

     

       154
       +
                 <link xlink:href="https://github.com/Arksine/moonraker">moonraker</link>,

     

       155
       +
                 an API web server for Klipper. Available as

     

       156
       +
                 <link linkend="opt-services.moonraker.enable">moonraker</link>.

     

       157
       +
               </para>

     

       158
       +
             </listitem>

     

       159
        
           </itemizedlist>

     

       160
        
         </section>

     

       161
        
         <section xml:id="sec-release-21.11-incompatibilities">

nixos/doc/manual/release-notes/rl-2111.section.md

···

       45
        
       

     

       46
        
       - [MeshCentral](https://www.meshcommander.com/meshcentral2/overview), a remote administration service ("TeamViewer but self-hosted and with more features") is now available with a package and a module: [services.meshcentral.enable](#opt-services.meshcentral.enable)

     

       47
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       48
        
       ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}

     

       49
        
       

     

       50
        
       - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1

···

       45
        
       

     

       46
        
       - [MeshCentral](https://www.meshcommander.com/meshcentral2/overview), a remote administration service ("TeamViewer but self-hosted and with more features") is now available with a package and a module: [services.meshcentral.enable](#opt-services.meshcentral.enable)

     

       47
        
       

     

       48
       +
       - [moonraker](https://github.com/Arksine/moonraker), an API web server for Klipper.

     

       49
       +
         Available as [moonraker](#opt-services.moonraker.enable).

     

       50
       +
       

     

       51
        
       ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}

     

       52
        
       

     

       53
        
       - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1

nixos/modules/misc/ids.nix

···

       349
        
             zigbee2mqtt = 317;

     

       350
        
             # shadow = 318; # unused

     

       351
        
             hqplayer = 319;

     

       0
        
       
     

       352
        
       

     

       353
        
             # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

     

       354
        
       

     
···

       652
        
             zigbee2mqtt = 317;

     

       653
        
             shadow = 318;

     

       654
        
             hqplayer = 319;

     

       0
        
       
     

       655
        
       

     

       656
        
             # When adding a gid, make sure it doesn't match an existing

     

       657
        
             # uid. Users and groups with the same name should have equal

···

       349
        
             zigbee2mqtt = 317;

     

       350
        
             # shadow = 318; # unused

     

       351
        
             hqplayer = 319;

     

       352
       +
             moonraker = 320;

     

       353
        
       

     

       354
        
             # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

     

       355
        
       

     
···

       653
        
             zigbee2mqtt = 317;

     

       654
        
             shadow = 318;

     

       655
        
             hqplayer = 319;

     

       656
       +
             moonraker = 320;

     

       657
        
       

     

       658
        
             # When adding a gid, make sure it doesn't match an existing

     

       659
        
             # uid. Users and groups with the same name should have equal

nixos/modules/module-list.nix

···

       533
        
         ./services/misc/mbpfan.nix

     

       534
        
         ./services/misc/mediatomb.nix

     

       535
        
         ./services/misc/metabase.nix

     

       0
        
       
     

       536
        
         ./services/misc/mwlib.nix

     

       537
        
         ./services/misc/mx-puppet-discord.nix

     

       538
        
         ./services/misc/n8n.nix

···

       533
        
         ./services/misc/mbpfan.nix

     

       534
        
         ./services/misc/mediatomb.nix

     

       535
        
         ./services/misc/metabase.nix

     

       536
       +
         ./services/misc/moonraker.nix

     

       537
        
         ./services/misc/mwlib.nix

     

       538
        
         ./services/misc/mx-puppet-discord.nix

     

       539
        
         ./services/misc/n8n.nix

+1 -2

nixos/modules/services/misc/klipper.nix

···

       30
        
       

     

       31
        
             apiSocket = mkOption {

     

       32
        
               type = types.nullOr types.path;

     

       33
       -
               default = null;

     

       34
       -
               example = "/run/klipper/api";

     

       35
        
               description = "Path of the API socket to create.";

     

       36
        
             };

     

       37

···

       30
        
       

     

       31
        
             apiSocket = mkOption {

     

       32
        
               type = types.nullOr types.path;

     

       33
       +
               default = "/run/klipper/api";

     

       0
        
       
     

       34
        
               description = "Path of the API socket to create.";

     

       35
        
             };

     

       36

+135

nixos/modules/services/misc/moonraker.nix

···

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

     

       2
       +
       with lib;

     

       3
       +
       let

     

       4
       +
         pkg = pkgs.moonraker;

     

       5
       +
         cfg = config.services.moonraker;

     

       6
       +
         format = pkgs.formats.ini {

     

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

     

       8
       +
           listToValue = l:

     

       9
       +
             if builtins.length l == 1 then generators.mkValueStringDefault {} (head l)

     

       10
       +
             else lib.concatMapStrings (s: "\n  ${generators.mkValueStringDefault {} s}") l;

     

       11
       +
           mkKeyValue = generators.mkKeyValueDefault {} ":";

     

       12
       +
         };

     

       13
       +
       in {

     

       14
       +
         options = {

     

       15
       +
           services.moonraker = {

     

       16
       +
             enable = mkEnableOption "Moonraker, an API web server for Klipper";

     

       17
       +
       

     

       18
       +
             klipperSocket = mkOption {

     

       19
       +
               type = types.path;

     

       20
       +
               default = config.services.klipper.apiSocket;

     

       21
       +
               description = "Path to Klipper's API socket.";

     

       22
       +
             };

     

       23
       +
       

     

       24
       +
             stateDir = mkOption {

     

       25
       +
               type = types.path;

     

       26
       +
               default = "/var/lib/moonraker";

     

       27
       +
               description = "The directory containing the Moonraker databases.";

     

       28
       +
             };

     

       29
       +
       

     

       30
       +
             configDir = mkOption {

     

       31
       +
               type = types.path;

     

       32
       +
               default = cfg.stateDir + "/config";

     

       33
       +
               description = ''

     

       34
       +
                 The directory containing client-writable configuration files.

     

       35
       +
       

     

       36
       +
                 Clients will be able to edit files in this directory via the API. This directory must be writable.

     

       37
       +
               '';

     

       38
       +
             };

     

       39
       +
       

     

       40
       +
             user = mkOption {

     

       41
       +
               type = types.str;

     

       42
       +
               default = "moonraker";

     

       43
       +
               description = "User account under which Moonraker runs.";

     

       44
       +
             };

     

       45
       +
       

     

       46
       +
             group = mkOption {

     

       47
       +
               type = types.str;

     

       48
       +
               default = "moonraker";

     

       49
       +
               description = "Group account under which Moonraker runs.";

     

       50
       +
             };

     

       51
       +
       

     

       52
       +
             address = mkOption {

     

       53
       +
               type = types.str;

     

       54
       +
               default = "127.0.0.1";

     

       55
       +
               example = "0.0.0.0";

     

       56
       +
               description = "The IP or host to listen on.";

     

       57
       +
             };

     

       58
       +
       

     

       59
       +
             port = mkOption {

     

       60
       +
               type = types.ints.unsigned;

     

       61
       +
               default = 7125;

     

       62
       +
               description = "The port to listen on.";

     

       63
       +
             };

     

       64
       +
       

     

       65
       +
             settings = mkOption {

     

       66
       +
               type = format.type;

     

       67
       +
               default = { };

     

       68
       +
               example = {

     

       69
       +
                 authorization = {

     

       70
       +
                   trusted_clients = [ "10.0.0.0/24" ];

     

       71
       +
                   cors_domains = [ "https://app.fluidd.xyz" ];

     

       72
       +
                 };

     

       73
       +
               };

     

       74
       +
               description = ''

     

       75
       +
                 Configuration for Moonraker. See the <link xlink:href="https://moonraker.readthedocs.io/en/latest/configuration/">documentation</link>

     

       76
       +
                 for supported values.

     

       77
       +
               '';

     

       78
       +
             };

     

       79
       +
           };

     

       80
       +
         };

     

       81
       +
       

     

       82
       +
         config = mkIf cfg.enable {

     

       83
       +
           warnings = optional (cfg.settings ? update_manager)

     

       84
       +
             ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.'';

     

       85
       +
       

     

       86
       +
           users.users = optionalAttrs (cfg.user == "moonraker") {

     

       87
       +
             moonraker = {

     

       88
       +
               group = cfg.group;

     

       89
       +
               uid = config.ids.uids.moonraker;

     

       90
       +
             };

     

       91
       +
           };

     

       92
       +
       

     

       93
       +
           users.groups = optionalAttrs (cfg.group == "moonraker") {

     

       94
       +
             moonraker.gid = config.ids.gids.moonraker;

     

       95
       +
           };

     

       96
       +
       

     

       97
       +
           environment.etc."moonraker.cfg".source = let

     

       98
       +
             forcedConfig = {

     

       99
       +
               server = {

     

       100
       +
                 host = cfg.address;

     

       101
       +
                 port = cfg.port;

     

       102
       +
                 klippy_uds_address = cfg.klipperSocket;

     

       103
       +
                 config_path = cfg.configDir;

     

       104
       +
                 database_path = "${cfg.stateDir}/database";

     

       105
       +
               };

     

       106
       +
             };

     

       107
       +
             fullConfig = recursiveUpdate cfg.settings forcedConfig;

     

       108
       +
           in format.generate "moonraker.cfg" fullConfig;

     

       109
       +
       

     

       110
       +
           systemd.tmpfiles.rules = [

     

       111
       +
             "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"

     

       112
       +
             "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -"

     

       113
       +
           ];

     

       114
       +
       

     

       115
       +
           systemd.services.moonraker = {

     

       116
       +
             description = "Moonraker, an API web server for Klipper";

     

       117
       +
             wantedBy = [ "multi-user.target" ];

     

       118
       +
             after = [ "network.target" ]

     

       119
       +
               ++ optional config.services.klipper.enable "klipper.service";

     

       120
       +
       

     

       121
       +
             # Moonraker really wants its own config to be writable...

     

       122
       +
             script = ''

     

       123
       +
               cp /etc/moonraker.cfg ${cfg.configDir}/moonraker-temp.cfg

     

       124
       +
               chmod u+w ${cfg.configDir}/moonraker-temp.cfg

     

       125
       +
               exec ${pkg}/bin/moonraker -c ${cfg.configDir}/moonraker-temp.cfg

     

       126
       +
             '';

     

       127
       +
       

     

       128
       +
             serviceConfig = {

     

       129
       +
               WorkingDirectory = cfg.stateDir;

     

       130
       +
               Group = cfg.group;

     

       131
       +
               User = cfg.user;

     

       132
       +
             };

     

       133
       +
           };

     

       134
       +
         };

     

       135
       +
       }

+34

pkgs/applications/misc/fluidd/default.nix

···

       1
       +
       { lib, stdenvNoCC, fetchurl, unzip }:

     

       2
       +
       

     

       3
       +
       stdenvNoCC.mkDerivation rec {

     

       4
       +
         pname = "fluidd";

     

       5
       +
         version = "1.16.2";

     

       6
       +
       

     

       7
       +
         src = fetchurl {

     

       8
       +
           name = "fluidd-v${version}.zip";

     

       9
       +
           url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";

     

       10
       +
           sha256 = "1qwj25xvvxvm1fxx216nn2gp7js4d682mm3l4s7ns90fc5ygvc8i";

     

       11
       +
         };

     

       12
       +
       

     

       13
       +
         nativeBuildInputs = [ unzip ];

     

       14
       +
       

     

       15
       +
         dontConfigure = true;

     

       16
       +
         dontBuild = true;

     

       17
       +
       

     

       18
       +
         unpackPhase = ''

     

       19
       +
           mkdir fluidd

     

       20
       +
           unzip $src -d fluidd

     

       21
       +
         '';

     

       22
       +
       

     

       23
       +
         installPhase = ''

     

       24
       +
           mkdir -p $out/share/fluidd

     

       25
       +
           cp -r fluidd $out/share/fluidd/htdocs

     

       26
       +
         '';

     

       27
       +
       

     

       28
       +
         meta = with lib; {

     

       29
       +
           description = "Klipper web interface";

     

       30
       +
           homepage = "https://docs.fluidd.xyz";

     

       31
       +
           license = licenses.gpl3Only;

     

       32
       +
           maintainers = with maintainers; [ zhaofengli ];

     

       33
       +
         };

     

       34
       +
       }

+34

pkgs/development/python-modules/streaming-form-data/default.nix

···

       1
       +
       { lib, fetchFromGitHub, buildPythonPackage, pythonOlder,

     

       2
       +
       cython, numpy, pytest, requests-toolbelt }:

     

       3
       +
       

     

       4
       +
       buildPythonPackage rec {

     

       5
       +
         pname = "streaming-form-data";

     

       6
       +
         version = "1.8.1";

     

       7
       +
         disabled = pythonOlder "3.6";

     

       8
       +
       

     

       9
       +
         src = fetchFromGitHub {

     

       10
       +
           owner = "siddhantgoel";

     

       11
       +
           repo = "streaming-form-data";

     

       12
       +
           rev = "v${version}";

     

       13
       +
           sha256 = "1wnak8gwkc42ihgf0g9r7r858hxbqav2xdgqa8azid8v2ff6iq4d";

     

       14
       +
         };

     

       15
       +
       

     

       16
       +
         nativeBuildInputs = [ cython ];

     

       17
       +
       

     

       18
       +
         propagatedBuildInputs = [ requests-toolbelt ];

     

       19
       +
       

     

       20
       +
         checkInputs = [ numpy pytest ];

     

       21
       +
       

     

       22
       +
         checkPhase = ''

     

       23
       +
           make test

     

       24
       +
         '';

     

       25
       +
       

     

       26
       +
         pythonImportsCheck = [ "streaming_form_data" ];

     

       27
       +
       

     

       28
       +
         meta = with lib; {

     

       29
       +
           description = "Streaming parser for multipart/form-data";

     

       30
       +
           homepage = "https://github.com/siddhantgoel/streaming-form-data";

     

       31
       +
           license = licenses.mit;

     

       32
       +
           maintainers = with maintainers; [ zhaofengli ];

     

       33
       +
         };

     

       34
       +
       }

+44

pkgs/servers/moonraker/default.nix

···

       1
       +
       { lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater }:

     

       2
       +
       

     

       3
       +
       let

     

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

     

       5
       +
           tornado

     

       6
       +
           pyserial

     

       7
       +
           pillow

     

       8
       +
           lmdb

     

       9
       +
           streaming-form-data

     

       10
       +
           distro

     

       11
       +
           inotify-simple

     

       12
       +
           libnacl

     

       13
       +
           paho-mqtt

     

       14
       +
         ]);

     

       15
       +
       in stdenvNoCC.mkDerivation rec {

     

       16
       +
         pname = "moonraker";

     

       17
       +
         version = "unstable-2021-07-18";

     

       18
       +
       

     

       19
       +
         src = fetchFromGitHub {

     

       20
       +
           owner = "Arksine";

     

       21
       +
           repo = "moonraker";

     

       22
       +
           rev = "42f61ceafa90fcfea8bffbe968e26a6fd8b61af6";

     

       23
       +
           sha256 = "1w6l9pgs4n4nnk3h40y346bf6j3v4j4h1qnhj5dwlbwdxiqpd9gs";

     

       24
       +
         };

     

       25
       +
       

     

       26
       +
         nativeBuildInputs = [ makeWrapper ];

     

       27
       +
       

     

       28
       +
         installPhase = ''

     

       29
       +
           mkdir -p $out $out/bin $out/lib

     

       30
       +
           cp -r moonraker $out/lib

     

       31
       +
       

     

       32
       +
           makeWrapper ${pythonEnv}/bin/python $out/bin/moonraker \

     

       33
       +
             --add-flags "$out/lib/moonraker/moonraker.py"

     

       34
       +
         '';

     

       35
       +
       

     

       36
       +
         passthru.updateScript = unstableGitUpdater { url = meta.homepage; };

     

       37
       +
       

     

       38
       +
         meta = with lib; {

     

       39
       +
           description = "API web server for Klipper";

     

       40
       +
           homepage = "https://github.com/Arksine/moonraker";

     

       41
       +
           license = licenses.gpl3Only;

     

       42
       +
           maintainers = with maintainers; [ zhaofengli ];

     

       43
       +
         };

     

       44
       +
       }

pkgs/top-level/all-packages.nix

···

       3100
        
       

     

       3101
        
         moodle-dl = callPackage ../tools/networking/moodle-dl { };

     

       3102
        
       

     

       0
        
       
     

       0
        
       
     

       3103
        
         mousetweaks = callPackage ../applications/accessibility/mousetweaks {

     

       3104
        
           inherit (pkgs.xorg) libX11 libXtst libXfixes;

     

       3105
        
         };

     
···

       10892
        
         flasm = callPackage ../development/compilers/flasm { };

     

       10893
        
       

     

       10894
        
         flyctl = callPackage ../development/web/flyctl { };

     

       0
        
       
     

       0
        
       
     

       10895
        
       

     

       10896
        
         flutterPackages =

     

       10897
        
           recurseIntoAttrs (callPackage ../development/compilers/flutter { });

···

       3100
        
       

     

       3101
        
         moodle-dl = callPackage ../tools/networking/moodle-dl { };

     

       3102
        
       

     

       3103
       +
         moonraker = callPackage ../servers/moonraker { };

     

       3104
       +
       

     

       3105
        
         mousetweaks = callPackage ../applications/accessibility/mousetweaks {

     

       3106
        
           inherit (pkgs.xorg) libX11 libXtst libXfixes;

     

       3107
        
         };

     
···

       10894
        
         flasm = callPackage ../development/compilers/flasm { };

     

       10895
        
       

     

       10896
        
         flyctl = callPackage ../development/web/flyctl { };

     

       10897
       +
       

     

       10898
       +
         fluidd = callPackage ../applications/misc/fluidd { };

     

       10899
        
       

     

       10900
        
         flutterPackages =

     

       10901
        
           recurseIntoAttrs (callPackage ../development/compilers/flutter { });

pkgs/top-level/python-packages.nix

···

       8402
        
       

     

       8403
        
         stravalib = callPackage ../development/python-modules/stravalib { };

     

       8404
        
       

     

       0
        
       
     

       0
        
       
     

       8405
        
         streamz = callPackage ../development/python-modules/streamz { };

     

       8406
        
       

     

       8407
        
         strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { };

···

       8402
        
       

     

       8403
        
         stravalib = callPackage ../development/python-modules/stravalib { };

     

       8404
        
       

     

       8405
       +
         streaming-form-data = callPackage ../development/python-modules/streaming-form-data { };

     

       8406
       +
       

     

       8407
        
         streamz = callPackage ../development/python-modules/streamz { };

     

       8408
        
       

     

       8409
        
         strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { };