commit f0136e4bc85b5cadd72671b513ecf24a576a046f · pyrox.dev/nixpkgs

maintainers/maintainer-list.nix

···

       23
       23
        
           github = "a1russell";

     

       24
       24
        
           name = "Adam Russell";

     

       25
       25
        
         };

     

       26
       26
       +
         aanderse = {

     

       27
       27
       +
           email = "aaron@fosslib.net";

     

       28
       28
       +
           github = "aanderse";

     

       29
       29
       +
           name = "Aaron Andersen";

     

       30
       30
       +
         };

     

       26
       31
        
         aaronschif = {

     

       27
       32
        
           email = "aaronschif@gmail.com";

     

       28
       33
        
           github = "aaronschif";

nixos/modules/module-list.nix

···

       421
       421
        
         ./services/monitoring/graphite.nix

     

       422
       422
        
         ./services/monitoring/hdaps.nix

     

       423
       423
        
         ./services/monitoring/heapster.nix

     

       424
       424
       +
         ./services/monitoring/incron.nix

     

       424
       425
        
         ./services/monitoring/longview.nix

     

       425
       426
        
         ./services/monitoring/monit.nix

     

       426
       427
        
         ./services/monitoring/munin.nix

+98

nixos/modules/services/monitoring/incron.nix

···

       1
       1
       +
       

     

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

     

       3
       3
       +
       

     

       4
       4
       +
       with lib;

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
       

     

       8
       8
       +
         cfg = config.services.incron;

     

       9
       9
       +
       

     

       10
       10
       +
       in

     

       11
       11
       +
       

     

       12
       12
       +
       {

     

       13
       13
       +
         options = {

     

       14
       14
       +
       

     

       15
       15
       +
           services.incron = {

     

       16
       16
       +
       

     

       17
       17
       +
             enable = mkOption {

     

       18
       18
       +
               type = types.bool;

     

       19
       19
       +
               default = false;

     

       20
       20
       +
               description = ''

     

       21
       21
       +
                 Whether to enable the incron daemon.

     

       22
       22
       +
       

     

       23
       23
       +
                 Note that commands run under incrontab only support common Nix profiles for the <envar>PATH</envar> provided variable.

     

       24
       24
       +
               '';

     

       25
       25
       +
             };

     

       26
       26
       +
       

     

       27
       27
       +
             allow = mkOption {

     

       28
       28
       +
               type = types.nullOr (types.listOf types.str);

     

       29
       29
       +
               default = null;

     

       30
       30
       +
               description = ''

     

       31
       31
       +
                 Users allowed to use incrontab.

     

       32
       32
       +
       

     

       33
       33
       +
                 If empty then no user will be allowed to have their own incrontab.

     

       34
       34
       +
                 If <literal>null</literal> then will defer to <option>deny</option>.

     

       35
       35
       +
                 If both <option>allow</option> and <option>deny</option> are null

     

       36
       36
       +
                 then all users will be allowed to have their own incrontab.

     

       37
       37
       +
               '';

     

       38
       38
       +
             };

     

       39
       39
       +
       

     

       40
       40
       +
             deny = mkOption {

     

       41
       41
       +
               type = types.nullOr (types.listOf types.str);

     

       42
       42
       +
               default = null;

     

       43
       43
       +
               description = "Users forbidden from using incrontab.";

     

       44
       44
       +
             };

     

       45
       45
       +
       

     

       46
       46
       +
             systab = mkOption {

     

       47
       47
       +
               type = types.lines;

     

       48
       48
       +
               default = "";

     

       49
       49
       +
               description = "The system incrontab contents.";

     

       50
       50
       +
               example = ''

     

       51
       51
       +
                 /var/mail IN_CLOSE_WRITE abc $@/$#

     

       52
       52
       +
                 /tmp IN_ALL_EVENTS efg $@/$# $&

     

       53
       53
       +
               '';

     

       54
       54
       +
             };

     

       55
       55
       +
       

     

       56
       56
       +
             extraPackages = mkOption {

     

       57
       57
       +
               type = types.listOf types.package;

     

       58
       58
       +
               default = [];

     

       59
       59
       +
               example = literalExample "[ pkgs.rsync ]";

     

       60
       60
       +
               description = "Extra packages available to the system incrontab.";

     

       61
       61
       +
             };

     

       62
       62
       +
       

     

       63
       63
       +
           };

     

       64
       64
       +
       

     

       65
       65
       +
         };

     

       66
       66
       +
       

     

       67
       67
       +
         config = mkIf cfg.enable {

     

       68
       68
       +
       

     

       69
       69
       +
           warnings = optional (cfg.allow != null && cfg.deny != null)

     

       70
       70
       +
             ''If `services.incron.allow` is set then `services.incron.deny` will be ignored.'';

     

       71
       71
       +
       

     

       72
       72
       +
           environment.systemPackages = [ pkgs.incron ];

     

       73
       73
       +
       

     

       74
       74
       +
           security.wrappers.incrontab.source = "${pkgs.incron}/bin/incrontab";

     

       75
       75
       +
       

     

       76
       76
       +
           # incron won't read symlinks

     

       77
       77
       +
           environment.etc."incron.d/system" = {

     

       78
       78
       +
             mode = "0444";

     

       79
       79
       +
             text = cfg.systab;

     

       80
       80
       +
           };

     

       81
       81
       +
           environment.etc."incron.allow" = mkIf (cfg.allow != null) {

     

       82
       82
       +
             text = concatStringsSep "\n" cfg.allow;

     

       83
       83
       +
           };

     

       84
       84
       +
           environment.etc."incron.deny" = mkIf (cfg.deny != null) {

     

       85
       85
       +
             text = concatStringsSep "\n" cfg.deny;

     

       86
       86
       +
           };

     

       87
       87
       +
       

     

       88
       88
       +
           systemd.services.incron = {

     

       89
       89
       +
             description = "File System Events Scheduler";

     

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

     

       91
       91
       +
             path = cfg.extraPackages;

     

       92
       92
       +
             serviceConfig.PIDFile = "/run/incrond.pid";

     

       93
       93
       +
             serviceConfig.ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 710 -p /var/spool/incron";

     

       94
       94
       +
             serviceConfig.ExecStart = "${pkgs.incron}/bin/incrond --foreground";

     

       95
       95
       +
           };

     

       96
       96
       +
         };

     

       97
       97
       +
       

     

       98
       98
       +
       }

+36

pkgs/tools/system/incron/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, bash }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "incron-0.5.12";

     

       5
       5
       +
         src = fetchFromGitHub {

     

       6
       6
       +
           owner = "ar-";

     

       7
       7
       +
           repo = "incron";

     

       8
       8
       +
           rev = name;

     

       9
       9
       +
           sha256 = "11d5f98cjafiv9h9zzzrw2s06s2fvdg8gp64km7mdprd2xmy6dih";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         patches = [ ./default_path.patch ];

     

       13
       13
       +
       

     

       14
       14
       +
         prePatch = ''

     

       15
       15
       +
           sed -i "s|/bin/bash|${bash}/bin/bash|g" usertable.cpp

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         installFlags = [ "PREFIX=$(out)" ];

     

       19
       19
       +
         installTargets = [ "install-man" ];

     

       20
       20
       +
       

     

       21
       21
       +
         preInstall = ''

     

       22
       22
       +
           mkdir -p $out/bin

     

       23
       23
       +
       

     

       24
       24
       +
           # make install doesn't work because setuid and permissions

     

       25
       25
       +
           # just manually install the binaries instead

     

       26
       26
       +
           cp incrond incrontab $out/bin/

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         meta = with stdenv.lib; {

     

       30
       30
       +
           description = "A cron-like daemon which handles filesystem events.";

     

       31
       31
       +
           homepage = https://github.com/ar-/incron;

     

       32
       32
       +
           license = licenses.gpl2;

     

       33
       33
       +
           maintainers = [ maintainers.aanderse ];

     

       34
       34
       +
           platforms = platforms.linux;

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+36

pkgs/tools/system/incron/default_path.patch

···

       1
       1
       +
       diff --git usertable.cpp usertable.cpp

     

       2
       2
       +
       index 11fd04b..a8681bd 100644

     

       3
       3
       +
       --- a/usertable.cpp

     

       4
       4
       +
       +++ b/usertable.cpp

     

       5
       5
       +
       @@ -43,9 +43,6 @@

     

       6
       6
       +
        #define DONT_FOLLOW(mask) (false)

     

       7
       7
       +
        #endif // IN_DONT_FOLLOW

     

       8
       8
       +
        

     

       9
       9
       +
       -// this is not enough, but...

     

       10
       10
       +
       -#define DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin"

     

       11
       11
       +
       -

     

       12
       12
       +
        

     

       13
       13
       +
        PROC_MAP UserTable::s_procMap;

     

       14
       14
       +
        

     

       15
       15
       +
       @@ -597,12 +594,20 @@ void UserTable::RunAsUser(std::string cmd) const

     

       16
       16
       +
            if (clearenv() != 0)

     

       17
       17
       +
              goto failed;

     

       18
       18
       +
        

     

       19
       19
       +
       +    // try to recreate the user path as best as possible

     

       20
       20
       +
       +    std::string DEFAULT_PATH;

     

       21
       21
       +
       +    DEFAULT_PATH += "/run/wrappers/bin:";

     

       22
       22
       +
       +    DEFAULT_PATH += pwd->pw_dir;

     

       23
       23
       +
       +    DEFAULT_PATH += "/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/etc/profiles/per-user/";

     

       24
       24
       +
       +    DEFAULT_PATH += pwd->pw_name;

     

       25
       25
       +
       +    DEFAULT_PATH += "/bin";

     

       26
       26
       +
       +

     

       27
       27
       +
            if (    setenv("LOGNAME",   pwd->pw_name,   1) != 0

     

       28
       28
       +
                ||  setenv("USER",      pwd->pw_name,   1) != 0

     

       29
       29
       +
                ||  setenv("USERNAME",  pwd->pw_name,   1) != 0

     

       30
       30
       +
                ||  setenv("HOME",      pwd->pw_dir,    1) != 0

     

       31
       31
       +
                ||  setenv("SHELL",     pwd->pw_shell,  1) != 0

     

       32
       32
       +
       -        ||  setenv("PATH",      DEFAULT_PATH,   1) != 0)

     

       33
       33
       +
       +        ||  setenv("PATH",      DEFAULT_PATH.c_str(),   1) != 0)

     

       34
       34
       +
            {

     

       35
       35
       +
              goto failed;

     

       36
       36
       +
            }

pkgs/top-level/all-packages.nix

···

       3267
       3267
        
       

     

       3268
       3268
        
         inboxer = callPackage ../applications/networking/mailreaders/inboxer { };

     

       3269
       3269
        
       

     

       3270
       3270
       +
         incron = callPackage ../tools/system/incron { };

     

       3271
       3271
       +
       

     

       3270
       3272
        
         inetutils = callPackage ../tools/networking/inetutils { };

     

       3271
       3273
        
       

     

       3272
       3274
        
         infiniband-diags = callPackage ../tools/networking/infiniband-diags { };