commit 8743e81cd309a65235c22bdcb5d23aa097cbc7b1 · pyrox.dev/nixpkgs

+10

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

···

       449
       449
        
                 RandomX benchmark.

     

       450
       450
        
               </para>

     

       451
       451
        
             </listitem>

     

       452
       452
       +
             <listitem>

     

       453
       453
       +
               <para>

     

       454
       454
       +
                 Auto nice daemons

     

       455
       455
       +
                 <link xlink:href="https://github.com/Nefelim4ag/Ananicy">ananicy</link>

     

       456
       456
       +
                 and

     

       457
       457
       +
                 <link xlink:href="https://gitlab.com/ananicy-cpp/ananicy-cpp/">ananicy-cpp</link>.

     

       458
       458
       +
                 Available as

     

       459
       459
       +
                 <link linkend="opt-services.ananicy.enable">services.ananicy</link>.

     

       460
       460
       +
               </para>

     

       461
       461
       +
             </listitem>

     

       452
       462
        
           </itemizedlist>

     

       453
       463
        
         </section>

     

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

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

···

       133
       133
        
       

     

       134
       134
        
       - [xmrig](https://github.com/xmrig/xmrig), a high performance, open source, cross platform RandomX, KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and RandomX benchmark.

     

       135
       135
        
       

     

       136
       136
       +
       - Auto nice daemons [ananicy](https://github.com/Nefelim4ag/Ananicy) and [ananicy-cpp](https://gitlab.com/ananicy-cpp/ananicy-cpp/). Available as [services.ananicy](#opt-services.ananicy.enable).

     

       137
       137
       +
       

     

       136
       138
        
       ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}

     

       137
       139
        
       

     

       138
       140
        
       - The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix`, now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout.

nixos/modules/module-list.nix

···

       485
       485
        
         ./services/mail/roundcube.nix

     

       486
       486
        
         ./services/mail/sympa.nix

     

       487
       487
        
         ./services/mail/nullmailer.nix

     

       488
       488
       +
         ./services/misc/ananicy.nix

     

       488
       489
        
         ./services/misc/airsonic.nix

     

       489
       490
        
         ./services/misc/ankisyncd.nix

     

       490
       491
        
         ./services/misc/apache-kafka.nix

+107

nixos/modules/services/misc/ananicy.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.ananicy;

     

       7
       7
       +
         configFile = pkgs.writeText "ananicy.conf" (generators.toKeyValue { } cfg.settings);

     

       8
       8
       +
         extraRules = pkgs.writeText "extraRules" cfg.extraRules;

     

       9
       9
       +
         servicename = if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then "ananicy-cpp" else "ananicy";

     

       10
       10
       +
       in

     

       11
       11
       +
       {

     

       12
       12
       +
         options = {

     

       13
       13
       +
           services.ananicy = {

     

       14
       14
       +
             enable = mkEnableOption "Ananicy, an auto nice daemon";

     

       15
       15
       +
       

     

       16
       16
       +
             package = mkOption {

     

       17
       17
       +
               type = types.package;

     

       18
       18
       +
               default = pkgs.ananicy;

     

       19
       19
       +
               defaultText = literalExpression "pkgs.ananicy";

     

       20
       20
       +
               example = literalExpression "pkgs.ananicy-cpp";

     

       21
       21
       +
               description = ''

     

       22
       22
       +
                 Which ananicy package to use.

     

       23
       23
       +
               '';

     

       24
       24
       +
             };

     

       25
       25
       +
       

     

       26
       26
       +
             settings = mkOption {

     

       27
       27
       +
               type = with types; attrsOf (oneOf [ int bool str ]);

     

       28
       28
       +
               default = { };

     

       29
       29
       +
               example = {

     

       30
       30
       +
                 apply_nice = false;

     

       31
       31
       +
               };

     

       32
       32
       +
               description = ''

     

       33
       33
       +
                 See <link xlink:href="https://github.com/Nefelim4ag/Ananicy/blob/master/ananicy.d/ananicy.conf"/>

     

       34
       34
       +
               '';

     

       35
       35
       +
             };

     

       36
       36
       +
       

     

       37
       37
       +
             extraRules = mkOption {

     

       38
       38
       +
               type = types.str;

     

       39
       39
       +
               default = "";

     

       40
       40
       +
               description = ''

     

       41
       41
       +
                 Extra rules in json format on separate lines. See:

     

       42
       42
       +
                 <link xlink:href="https://github.com/Nefelim4ag/Ananicy#configuration"/>

     

       43
       43
       +
                 <link xlink:href="https://gitlab.com/ananicy-cpp/ananicy-cpp/#global-configuration"/>

     

       44
       44
       +
               '';

     

       45
       45
       +
               example = literalExpression ''

     

       46
       46
       +
                 '''

     

       47
       47
       +
                   { "name": "eog", "type": "Image-View" }

     

       48
       48
       +
                   { "name": "fdupes", "type": "BG_CPUIO" }

     

       49
       49
       +
                 '''

     

       50
       50
       +
               '';

     

       51
       51
       +
       

     

       52
       52
       +
             };

     

       53
       53
       +
           };

     

       54
       54
       +
         };

     

       55
       55
       +
       

     

       56
       56
       +
         config = mkIf cfg.enable {

     

       57
       57
       +
           environment = {

     

       58
       58
       +
             systemPackages = [ cfg.package ];

     

       59
       59
       +
             etc."ananicy.d".source = pkgs.runCommandLocal "ananicyfiles" { } ''

     

       60
       60
       +
               mkdir -p $out

     

       61
       61
       +
               # ananicy-cpp does not include rules or settings on purpose

     

       62
       62
       +
               cp -r ${pkgs.ananicy}/etc/ananicy.d/* $out

     

       63
       63
       +
               rm $out/ananicy.conf

     

       64
       64
       +
               cp ${configFile} $out/ananicy.conf

     

       65
       65
       +
               ${optionalString (cfg.extraRules != "") "cp ${extraRules} $out/nixRules.rules"}

     

       66
       66
       +
             '';

     

       67
       67
       +
           };

     

       68
       68
       +
       

     

       69
       69
       +
           # ananicy and ananicy-cpp have different default settings

     

       70
       70
       +
           services.ananicy.settings =

     

       71
       71
       +
             let

     

       72
       72
       +
               mkOD = mkOptionDefault;

     

       73
       73
       +
             in

     

       74
       74
       +
             {

     

       75
       75
       +
               cgroup_load = mkOD true;

     

       76
       76
       +
               type_load = mkOD true;

     

       77
       77
       +
               rule_load = mkOD true;

     

       78
       78
       +
               apply_nice = mkOD true;

     

       79
       79
       +
               apply_ioclass = mkOD true;

     

       80
       80
       +
               apply_ionice = mkOD true;

     

       81
       81
       +
               apply_sched = mkOD true;

     

       82
       82
       +
               apply_oom_score_adj = mkOD true;

     

       83
       83
       +
               apply_cgroup = mkOD true;

     

       84
       84
       +
             } // (if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then {

     

       85
       85
       +
               # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/blob/master/src/config.cpp#L12

     

       86
       86
       +
               loglevel = mkOD "warn"; # default is info but its spammy

     

       87
       87
       +
               cgroup_realtime_workaround = mkOD true;

     

       88
       88
       +
             } else {

     

       89
       89
       +
               # https://github.com/Nefelim4ag/Ananicy/blob/master/ananicy.d/ananicy.conf

     

       90
       90
       +
               check_disks_schedulers = mkOD true;

     

       91
       91
       +
               check_freq = mkOD 5;

     

       92
       92
       +
             });

     

       93
       93
       +
       

     

       94
       94
       +
           systemd = {

     

       95
       95
       +
             # https://gitlab.com/ananicy-cpp/ananicy-cpp/#cgroups applies to both ananicy and -cpp

     

       96
       96
       +
             enableUnifiedCgroupHierarchy = mkDefault false;

     

       97
       97
       +
             packages = [ cfg.package ];

     

       98
       98
       +
             services."${servicename}" = {

     

       99
       99
       +
               wantedBy = [ "default.target" ];

     

       100
       100
       +
             };

     

       101
       101
       +
           };

     

       102
       102
       +
         };

     

       103
       103
       +
       

     

       104
       104
       +
         meta = {

     

       105
       105
       +
           maintainers = with maintainers; [ artturin ];

     

       106
       106
       +
         };

     

       107
       107
       +
       }