grahamc/hydra2 - Change 7XOH2DGH3W4B7BJWCXDP673R5R7TQGLCNTHJT7IZUSBVQWYWJUHQC

hydra-module.nix: Give types to options

Also, rename the "service.hydra.hydra" option to "service.hydra.package" to be consistent with NixOS option naming conventions.

Created by Eelco Dolstra on November 6, 2013

7XOH2DGH3W4B7BJWCXDP673R5R7TQGLCNTHJT7IZUSBVQWYWJUHQC

Dependencies

In channels

main

Change contents

Insertion in hydra-module.nix at line 34 [5.1]
[5.599]
[5.599]
```
        type = types.bool;
```
Insertion in hydra-module.nix at line 42 [5.1]
[5.1082]
[6.122]
```
        type = types.string;
```
Deletion in hydra-module.nix at line 44 [5.1]
∅:D[6.190] → [7.95:155]
B:BD[5.1149] → [7.95:155]
```
        example = "dbi:SQLite:/home/hydra/db/hydra.sqlite";
```
Replacement in hydra-module.nix at line 49 [5.1]
∅:D[8.361] → [5.1257:1282]
B:BD[5.1257] → [5.1257:1282]
```
      hydra = mkOption {
```
[8.361]
[9.403]
```
      package = mkOption {
        type = types.path;
```

Replacement in hydra-module.nix at line 52 [5.1]

∅:D[9.434] → [5.1312:1377]

B:BD[5.1312] → [5.1312:1377]

        description = ''
          Location of hydra
        '';

[9.434]

[5.1377]

        description = "The Hydra package.";

Insertion in hydra-module.nix at line 56 [5.1]
[5.1421]
[5.1465]
```
        type = types.str;
```
Insertion in hydra-module.nix at line 63 [5.1]
[4.30]
[4.30]
```
        type = types.str;
```
Insertion in hydra-module.nix at line 73 [5.1]
[10.73]
[10.73]
```
        type = types.int;
```
Insertion in hydra-module.nix at line 81 [5.1]
[5.1637]
[5.1637]
```
        type = types.int;
```

Replacement in hydra-module.nix at line 84 [5.1]

B:BD[5.1683] → [8.448:542]

          Threshold of minimum disk space (G) to determine if queue runner should run or not.

[5.1683]

[5.1779]

          Threshold of minimum disk space (GiB) to determine if queue runner should run or not.

Insertion in hydra-module.nix at line 89 [5.1]
[5.1845]
[5.1845]
```
        type = types.int;
```

Replacement in hydra-module.nix at line 92 [5.1]

B:BD[5.1891] → [8.543:634]

          Threshold of minimum disk space (G) to determine if evaluator should run or not.

[5.1891]

[5.1984]

          Threshold of minimum disk space (GiB) to determine if evaluator should run or not.

Insertion in hydra-module.nix at line 97 [5.1]
[5.2044]
[5.2086]
```
        type = types.str;
```
Insertion in hydra-module.nix at line 104 [5.1]
[5.2223]
[5.2223]
```
        type = types.str;
```
Insertion in hydra-module.nix at line 112 [5.1]
[7.247]
[7.247]
```
        type = types.nullOr types.str;
```
Deletion in hydra-module.nix at line 120 [5.1]
B:BD[11.102] → [11.102:127]
```
        default = false;
```
Insertion in hydra-module.nix at line 121 [5.1]
[11.154]
[11.154]
```
        default = false;
```
Replacement in hydra-module.nix at line 146 [5.1]
∅:D[3.384] → [5.2592:2640]
B:BD[5.2592] → [5.2592:2640]
```
    environment.systemPackages = [ cfg.hydra ];
```
[3.384]
[5.2640]
```
    environment.systemPackages = [ cfg.package ];
```

Replacement in hydra-module.nix at line 195 [5.1]

∅:D[2.697] → [12.195:264]

B:BD[12.195] → [12.195:264]

          ${pkgs.shadow}/bin/su hydra -c ${cfg.hydra}/bin/hydra-init

[2.697]

[5.3887]

          ${pkgs.shadow}/bin/su hydra -c ${cfg.package}/bin/hydra-init

Replacement in hydra-module.nix at line 207 [5.1]

B:BD[9.1186] → [4.242:436]

          { ExecStart = "@${cfg.hydra}/bin/hydra-server hydra-server -f -h '${cfg.listenHost}' --max_spare_servers 5 --max_servers 25 --max_requests 100${optionalString cfg.debugServer " -d"}";

[9.1186]

[6.330]

          { ExecStart = "@${cfg.package}/bin/hydra-server hydra-server -f -h '${cfg.listenHost}' --max_spare_servers 5 --max_servers 25 --max_requests 100${optionalString cfg.debugServer " -d"}";

Replacement in hydra-module.nix at line 220 [5.1]

B:BD[9.1684] → [9.1684:1842]

          { ExecStartPre = "${cfg.hydra}/bin/hydra-queue-runner --unlock";
            ExecStart = "@${cfg.hydra}/bin/hydra-queue-runner hydra-queue-runner";

[9.1684]

[6.359]

          { ExecStartPre = "${cfg.package}/bin/hydra-queue-runner --unlock";
            ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner";

Replacement in hydra-module.nix at line 234 [5.1]

B:BD[9.2199] → [9.2199:2276]

          { ExecStart = "@${cfg.hydra}/bin/hydra-evaluator hydra-evaluator";

[9.2199]

[6.388]

          { ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator";

Replacement in hydra-module.nix at line 245 [5.1]

B:BD[9.2533] → [9.2533:2622]

          { ExecStart = "@${cfg.hydra}/bin/hydra-update-gc-roots hydra-update-gc-roots";

[9.2533]

[6.417]

          { ExecStart = "@${cfg.package}/bin/hydra-update-gc-roots hydra-update-gc-roots";

hydra-module.nix: Give types to options

Dependencies

In channels

Change contents

Insertion in hydra-module.nix at line 34 [5.1]

Insertion in hydra-module.nix at line 42 [5.1]

Deletion in hydra-module.nix at line 44 [5.1]

Replacement in hydra-module.nix at line 49 [5.1]

Replacement in hydra-module.nix at line 52 [5.1]

Insertion in hydra-module.nix at line 56 [5.1]

Insertion in hydra-module.nix at line 63 [5.1]

Insertion in hydra-module.nix at line 73 [5.1]

Insertion in hydra-module.nix at line 81 [5.1]

Replacement in hydra-module.nix at line 84 [5.1]

Insertion in hydra-module.nix at line 89 [5.1]

Replacement in hydra-module.nix at line 92 [5.1]

Insertion in hydra-module.nix at line 97 [5.1]

Insertion in hydra-module.nix at line 104 [5.1]

Insertion in hydra-module.nix at line 112 [5.1]

Deletion in hydra-module.nix at line 120 [5.1]

Insertion in hydra-module.nix at line 121 [5.1]

Replacement in hydra-module.nix at line 146 [5.1]

Replacement in hydra-module.nix at line 195 [5.1]

Replacement in hydra-module.nix at line 207 [5.1]

Replacement in hydra-module.nix at line 220 [5.1]

Replacement in hydra-module.nix at line 234 [5.1]

Replacement in hydra-module.nix at line 245 [5.1]