commit c59c4e358989ce49afd177e6899549fbb8f8bf7f · pyrox.dev/nixpkgs

+2 -2

nixos/modules/programs/singularity.nix

···

       5
       5
        
         cfg = config.programs.singularity;

     

       6
       6
        
         singularity = pkgs.singularity.overrideAttrs (attrs : {

     

       7
       7
        
           installPhase = attrs.installPhase + ''

     

       8
       8
       -
             mv $bin/libexec/singularity/bin/starter-suid $bin/libexec/singularity/bin/starter-suid.orig

     

       9
       9
       -
             ln -s /run/wrappers/bin/singularity-suid $bin/libexec/singularity/bin/starter-suid

     

       8
       8
       +
             mv $out/libexec/singularity/bin/starter-suid $out/libexec/singularity/bin/starter-suid.orig

     

       9
       9
       +
             ln -s /run/wrappers/bin/singularity-suid $out/libexec/singularity/bin/starter-suid

     

       10
       10
        
           '';

     

       11
       11
        
         });

     

       12
       12
        
       in {

+1 -1

nixos/modules/services/continuous-integration/gitlab-runner.nix

···

       127
       127
        
             serviceConfig = {

     

       128
       128
        
               StateDirectory = "gitlab-runner";

     

       129
       129
        
               ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

     

       130
       130
       -
               ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \

     

       130
       130
       +
               ExecStart = ''${cfg.package}/bin/gitlab-runner run \

     

       131
       131
        
                 --working-directory ${cfg.workDir} \

     

       132
       132
        
                 --config /etc/gitlab-runner/config.toml \

     

       133
       133
        
                 --service gitlab-runner \

+1 -1

nixos/modules/services/misc/confd.nix

···

       75
       75
        
             wantedBy = [ "multi-user.target" ];

     

       76
       76
        
             after = [ "network.target" ];

     

       77
       77
        
             serviceConfig = {

     

       78
       78
       -
               ExecStart = "${cfg.package.bin}/bin/confd";

     

       78
       78
       +
               ExecStart = "${cfg.package}/bin/confd";

     

       79
       79
        
             };

     

       80
       80
        
           };

     

       81
       81

+1 -1

nixos/modules/services/misc/etcd.nix

···

       178
       178
        
       

     

       179
       179
        
             serviceConfig = {

     

       180
       180
        
               Type = "notify";

     

       181
       181
       -
               ExecStart = "${pkgs.etcd.bin}/bin/etcd";

     

       181
       181
       +
               ExecStart = "${pkgs.etcd}/bin/etcd";

     

       182
       182
        
               User = "etcd";

     

       183
       183
        
               LimitNOFILE = 40000;

     

       184
       184
        
             };

+8 -8

nixos/modules/services/misc/gitea.nix

···

       335
       335
        
             description = "gitea";

     

       336
       336
        
             after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";

     

       337
       337
        
             wantedBy = [ "multi-user.target" ];

     

       338
       338
       -
             path = [ gitea.bin pkgs.gitAndTools.git ];

     

       338
       338
       +
             path = [ gitea pkgs.gitAndTools.git ];

     

       339
       339
        
       

     

       340
       340
        
             preStart = let

     

       341
       341
        
               runConfig = "${cfg.stateDir}/custom/conf/app.ini";

     
···

       347
       347
        
                 cp -f ${configFile} ${runConfig}

     

       348
       348
        
       

     

       349
       349
        
                 if [ ! -e ${secretKey} ]; then

     

       350
       350
       -
                     ${gitea.bin}/bin/gitea generate secret SECRET_KEY > ${secretKey}

     

       350
       350
       +
                     ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey}

     

       351
       351
        
                 fi

     

       352
       352
        
       

     

       353
       353
        
                 if [ ! -e ${jwtSecret} ]; then

     

       354
       354
       -
                     ${gitea.bin}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret}

     

       354
       354
       +
                     ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret}

     

       355
       355
        
                 fi

     

       356
       356
        
       

     

       357
       357
        
                 KEY="$(head -n1 ${secretKey})"

     
···

       374
       374
        
               HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 6 -type f -wholename "*git/hooks/*")

     

       375
       375
        
               if [ "$HOOKS" ]

     

       376
       376
        
               then

     

       377
       377
       -
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS

     

       377
       377
       +
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' $HOOKS

     

       378
       378
        
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS

     

       379
       379
        
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS

     

       380
       380
        
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS

     
···

       383
       383
        
               # update command option in authorized_keys

     

       384
       384
        
               if [ -r ${cfg.stateDir}/.ssh/authorized_keys ]

     

       385
       385
        
               then

     

       386
       386
       -
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys

     

       386
       386
       +
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys

     

       387
       387
        
               fi

     

       388
       388
        
             '';

     

       389
       389
        
       

     
···

       392
       392
        
               User = cfg.user;

     

       393
       393
        
               Group = "gitea";

     

       394
       394
        
               WorkingDirectory = cfg.stateDir;

     

       395
       395
       -
               ExecStart = "${gitea.bin}/bin/gitea web";

     

       395
       395
       +
               ExecStart = "${gitea}/bin/gitea web";

     

       396
       396
        
               Restart = "always";

     

       397
       397
        
       

     

       398
       398
        
               # Filesystem

     
···

       450
       450
        
              description = "gitea dump";

     

       451
       451
        
              after = [ "gitea.service" ];

     

       452
       452
        
              wantedBy = [ "default.target" ];

     

       453
       453
       -
              path = [ gitea.bin ];

     

       453
       453
       +
              path = [ gitea ];

     

       454
       454
        
       

     

       455
       455
        
              environment = {

     

       456
       456
        
                USER = cfg.user;

     
···

       461
       461
        
              serviceConfig = {

     

       462
       462
        
                Type = "oneshot";

     

       463
       463
        
                User = cfg.user;

     

       464
       464
       -
                ExecStart = "${gitea.bin}/bin/gitea dump";

     

       464
       464
       +
                ExecStart = "${gitea}/bin/gitea dump";

     

       465
       465
        
                WorkingDirectory = cfg.stateDir;

     

       466
       466
        
              };

     

       467
       467
        
           };

+3 -3

nixos/modules/services/misc/gogs.nix

···

       200
       200
        
             description = "Gogs (Go Git Service)";

     

       201
       201
        
             after = [ "network.target" ];

     

       202
       202
        
             wantedBy = [ "multi-user.target" ];

     

       203
       203
       -
             path = [ pkgs.gogs.bin ];

     

       203
       203
       +
             path = [ pkgs.gogs ];

     

       204
       204
        
       

     

       205
       205
        
             preStart = let

     

       206
       206
        
               runConfig = "${cfg.stateDir}/custom/conf/app.ini";

     
···

       230
       230
        
               HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")

     

       231
       231
        
               if [ "$HOOKS" ]

     

       232
       232
        
               then

     

       233
       233
       -
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs.bin}/bin/gogs,g' $HOOKS

     

       233
       233
       +
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs}/bin/gogs,g' $HOOKS

     

       234
       234
        
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS

     

       235
       235
        
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS

     

       236
       236
        
                 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS

     
···

       242
       242
        
               User = cfg.user;

     

       243
       243
        
               Group = cfg.group;

     

       244
       244
        
               WorkingDirectory = cfg.stateDir;

     

       245
       245
       -
               ExecStart = "${pkgs.gogs.bin}/bin/gogs web";

     

       245
       245
       +
               ExecStart = "${pkgs.gogs}/bin/gogs web";

     

       246
       246
        
               Restart = "always";

     

       247
       247
        
             };

     

       248
       248

+1 -1

nixos/modules/services/misc/leaps.nix

···

       55
       55
        
               Restart = "on-failure";

     

       56
       56
        
               WorkingDirectory = stateDir;

     

       57
       57
        
               PrivateTmp = true;

     

       58
       58
       -
               ExecStart = "${pkgs.leaps.bin}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}";

     

       58
       58
       +
               ExecStart = "${pkgs.leaps}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}";

     

       59
       59
        
             };

     

       60
       60
        
           };

     

       61
       61
        
         };

+1 -2

nixos/modules/services/misc/ssm-agent.nix

···

       35
       35
        
       

     

       36
       36
        
             path = [ fake-lsb-release ];

     

       37
       37
        
             serviceConfig = {

     

       38
       38
       -
               ExecStart = "${cfg.package.bin}/bin/agent";

     

       38
       38
       +
               ExecStart = "${cfg.package}/bin/agent";

     

       39
       39
        
               KillMode = "process";

     

       40
       40
        
               Restart = "on-failure";

     

       41
       41
        
               RestartSec = "15min";

     
···

       43
       43
        
           };

     

       44
       44
        
         };

     

       45
       45
        
       }

     

       46
       46
       -

+1 -1

nixos/modules/services/monitoring/bosun.nix

···

       148
       148
        
               User = cfg.user;

     

       149
       149
        
               Group = cfg.group;

     

       150
       150
        
               ExecStart = ''

     

       151
       151
       -
                 ${cfg.package.bin}/bin/bosun -c ${configFile}

     

       151
       151
       +
                 ${cfg.package}/bin/bosun -c ${configFile}

     

       152
       152
        
               '';

     

       153
       153
        
             };

     

       154
       154
        
           };

+1 -1

nixos/modules/services/monitoring/grafana-reporter.nix

···

       59
       59
        
                 "-templates ${cfg.templateDir}"

     

       60
       60
        
               ];

     

       61
       61
        
             in {

     

       62
       62
       -
               ExecStart = "${pkgs.grafana_reporter.bin}/bin/grafana-reporter ${args}";

     

       62
       62
       +
               ExecStart = "${pkgs.grafana_reporter}/bin/grafana-reporter ${args}";

     

       63
       63
        
             };

     

       64
       64
        
           };

     

       65
       65
        
         };

+1 -1

nixos/modules/services/monitoring/grafana.nix

···

       535
       535
        
               ${optionalString cfg.provision.enable ''

     

       536
       536
        
                 export GF_PATHS_PROVISIONING=${provisionConfDir};

     

       537
       537
        
               ''}

     

       538
       538
       -
               exec ${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}

     

       538
       538
       +
               exec ${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir}

     

       539
       539
        
             '';

     

       540
       540
        
             serviceConfig = {

     

       541
       541
        
               WorkingDirectory = cfg.dataDir;

+1 -1

nixos/modules/services/monitoring/prometheus/exporters/snmp.nix

···

       58
       58
        
           in {

     

       59
       59
        
           serviceConfig = {

     

       60
       60
        
             ExecStart = ''

     

       61
       61
       -
               ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \

     

       61
       61
       +
               ${pkgs.prometheus-snmp-exporter}/bin/snmp_exporter \

     

       62
       62
        
                 --config.file=${escapeShellArg configFile} \

     

       63
       63
        
                 --log.format=${escapeShellArg cfg.logFormat} \

     

       64
       64
        
                 --log.level=${cfg.logLevel} \

+1 -1

nixos/modules/services/monitoring/scollector.nix

···

       118
       118
        
             serviceConfig = {

     

       119
       119
        
               User = cfg.user;

     

       120
       120
        
               Group = cfg.group;

     

       121
       121
       -
               ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";

     

       121
       121
       +
               ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";

     

       122
       122
        
             };

     

       123
       123
        
           };

     

       124
       124

+4 -4

nixos/modules/services/networking/consul.nix

···

       179
       179
        
                   (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);

     

       180
       180
        
       

     

       181
       181
        
               serviceConfig = {

     

       182
       182
       -
                 ExecStart = "@${cfg.package.bin}/bin/consul consul agent -config-dir /etc/consul.d"

     

       182
       182
       +
                 ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"

     

       183
       183
        
                   + concatMapStrings (n: " -config-file ${n}") configFiles;

     

       184
       184
       -
                 ExecReload = "${cfg.package.bin}/bin/consul reload";

     

       184
       184
       +
                 ExecReload = "${cfg.package}/bin/consul reload";

     

       185
       185
        
                 PermissionsStartOnly = true;

     

       186
       186
        
                 User = if cfg.dropPrivileges then "consul" else null;

     

       187
       187
        
                 Restart = "on-failure";

     

       188
       188
        
                 TimeoutStartSec = "infinity";

     

       189
       189
        
               } // (optionalAttrs (cfg.leaveOnStop) {

     

       190
       190
       -
                 ExecStop = "${cfg.package.bin}/bin/consul leave";

     

       190
       190
       +
                 ExecStop = "${cfg.package}/bin/consul leave";

     

       191
       191
        
               });

     

       192
       192
        
       

     

       193
       193
        
               path = with pkgs; [ iproute gnugrep gawk consul ];

     
···

       238
       238
        
       

     

       239
       239
        
               serviceConfig = {

     

       240
       240
        
                 ExecStart = ''

     

       241
       241
       -
                   ${cfg.alerts.package.bin}/bin/consul-alerts start \

     

       241
       241
       +
                   ${cfg.alerts.package}/bin/consul-alerts start \

     

       242
       242
        
                     --alert-addr=${cfg.alerts.listenAddr} \

     

       243
       243
        
                     --consul-addr=${cfg.alerts.consulAddr} \

     

       244
       244
        
                     ${optionalString cfg.alerts.watchChecks "--watch-checks"} \

+3 -3

nixos/modules/services/networking/flannel.nix

···

       19
       19
        
           package = mkOption {

     

       20
       20
        
             description = "Package to use for flannel";

     

       21
       21
        
             type = types.package;

     

       22
       22
       -
             default = pkgs.flannel.bin;

     

       23
       23
       -
             defaultText = "pkgs.flannel.bin";

     

       22
       22
       +
             default = pkgs.flannel;

     

       23
       23
       +
             defaultText = "pkgs.flannel";

     

       24
       24
        
           };

     

       25
       25
        
       

     

       26
       26
        
           publicIp = mkOption {

     
···

       167
       167
        
               touch /run/flannel/docker

     

       168
       168
        
             '' + optionalString (cfg.storageBackend == "etcd") ''

     

       169
       169
        
               echo "setting network configuration"

     

       170
       170
       -
               until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'

     

       170
       170
       +
               until ${pkgs.etcdctl}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'

     

       171
       171
        
               do

     

       172
       172
        
                 echo "setting network configuration, retry"

     

       173
       173
        
                 sleep 1

+1 -1

nixos/modules/services/networking/skydns.nix

···

       83
       83
        
               SKYDNS_NAMESERVERS = concatStringsSep "," cfg.nameservers;

     

       84
       84
        
             };

     

       85
       85
        
             serviceConfig = {

     

       86
       86
       -
               ExecStart = "${cfg.package.bin}/bin/skydns";

     

       86
       86
       +
               ExecStart = "${cfg.package}/bin/skydns";

     

       87
       87
        
             };

     

       88
       88
        
           };

     

       89
       89

+2 -2

nixos/modules/services/security/hologram-agent.nix

···

       43
       43
        
             description = "Provide EC2 instance credentials to machines outside of EC2";

     

       44
       44
        
             after       = [ "network.target" ];

     

       45
       45
        
             wantedBy    = [ "multi-user.target" ];

     

       46
       46
       -
             requires    = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; 

     

       46
       46
       +
             requires    = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ];

     

       47
       47
        
             preStart = ''

     

       48
       48
        
               /run/current-system/sw/bin/rm -fv /run/hologram.sock

     

       49
       49
        
             '';

     

       50
       50
        
             serviceConfig = {

     

       51
       51
       -
               ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}";

     

       51
       51
       +
               ExecStart = "${pkgs.hologram}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}";

     

       52
       52
        
             };

     

       53
       53
        
           };

     

       54
       54

+1 -1

nixos/modules/services/security/hologram-server.nix

···

       123
       123
        
             wantedBy    = [ "multi-user.target" ];

     

       124
       124
        
       

     

       125
       125
        
             serviceConfig = {

     

       126
       126
       -
               ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";

     

       126
       126
       +
               ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}";

     

       127
       127
        
             };

     

       128
       128
        
           };

     

       129
       129
        
         };

+1 -1

nixos/modules/services/security/oauth2_proxy.nix

···

       577
       577
        
             serviceConfig = {

     

       578
       578
        
               User = "oauth2_proxy";

     

       579
       579
        
               Restart = "always";

     

       580
       580
       -
               ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}";

     

       580
       580
       +
               ExecStart = "${cfg.package}/bin/oauth2_proxy ${configString}";

     

       581
       581
        
               EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile;

     

       582
       582
        
             };

     

       583
       583
        
           };

+1 -1

nixos/modules/services/web-apps/mattermost.nix

···

       224
       224
        
               serviceConfig = {

     

       225
       225
        
                 User = "nobody";

     

       226
       226
        
                 Group = "nogroup";

     

       227
       227
       -
                 ExecStart = "${pkgs.matterircd.bin}/bin/matterircd ${concatStringsSep " " cfg.matterircd.parameters}";

     

       227
       227
       +
                 ExecStart = "${pkgs.matterircd}/bin/matterircd ${concatStringsSep " " cfg.matterircd.parameters}";

     

       228
       228
        
                 WorkingDirectory = "/tmp";

     

       229
       229
        
                 PrivateTmp = true;

     

       230
       230
        
                 Restart = "always";

+1 -2

nixos/modules/virtualisation/ecs-agent.nix

···

       38
       38
        
               if [ ! -z "$ECS_DATADIR" ]; then

     

       39
       39
        
                 mkdir -p "$ECS_DATADIR"

     

       40
       40
        
               fi

     

       41
       41
       -
               ${cfg.package.bin}/bin/agent

     

       41
       41
       +
               ${cfg.package}/bin/agent

     

       42
       42
        
             '';

     

       43
       43
        
           };

     

       44
       44
        
         };

     

       45
       45
        
       }

     

       46
       46
       -

+1 -1

nixos/modules/virtualisation/lxd.nix

···

       108
       108
        
             '';

     

       109
       109
        
       

     

       110
       110
        
             serviceConfig = {

     

       111
       111
       -
               ExecStart = "@${cfg.package.bin}/bin/lxd lxd --group lxd";

     

       111
       111
       +
               ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd";

     

       112
       112
        
               Type = "simple";

     

       113
       113
        
               KillMode = "process"; # when stopping, leave the containers alone

     

       114
       114
        
               LimitMEMLOCK = "infinity";

+3 -5

nixos/modules/virtualisation/podman.nix

···

       6
       6
        
       

     

       7
       7
        
         # Provides a fake "docker" binary mapping to podman

     

       8
       8
        
         dockerCompat = pkgs.runCommandNoCC "${pkgs.podman.pname}-docker-compat-${pkgs.podman.version}" {

     

       9
       9
       -
           outputs = [ "out" "bin" "man" ];

     

       9
       9
       +
           outputs = [ "out" "man" ];

     

       10
       10
        
           inherit (pkgs.podman) meta;

     

       11
       11
        
         } ''

     

       12
       12
       -
           mkdir $out

     

       13
       13
       -
       

     

       14
       14
       -
           mkdir -p $bin/bin

     

       15
       15
       -
           ln -s ${pkgs.podman.bin}/bin/podman $bin/bin/docker

     

       12
       12
       +
           mkdir -p $out/bin

     

       13
       13
       +
           ln -s ${pkgs.podman}/bin/podman $out/bin/docker

     

       16
       14
        
       

     

       17
       15
        
           mkdir -p $man/share/man/man1

     

       18
       16
        
           for f in ${pkgs.podman.man}/share/man/man1/*; do