grahamc/hydra2 - Change W3HI52QVYQUEMJDK6TI54WPNDQJOHYD47G45LNMI2YTH6YGKNXNQC

use NIX_*_DIR env vars when defined

Created by Rob Vermaas on March 16, 2011

W3HI52QVYQUEMJDK6TI54WPNDQJOHYD47G45LNMI2YTH6YGKNXNQC

Dependencies

In channels

main

Change contents

Insertion in src/lib/Hydra/Controller/Root.pm at line 33 [7.804]

[5.2335]

[6.52]

#    $c->stash->{nrbuilds} = [nrbuildsQuery($c, 30, "day", "", "", "", "")];
    # <img src="http://chart.apis.google.com/chart?cht=bvg&chtt=Nr%20builds%20over%20the%20last%2030%20days&chs=300x100&chd=t:1785,881,2863,2828,1472,2847,1449,5634,1625,1200,1576,700,839,8533,1439,361,991,1337,1234,1322,1883,2146,1553,883,378,1395,1204,527,1147,124&chco=BBCEBB&chds=0,8533&chbh=a&chxt=y&chxr=0,0,8533"/>

Replacement in src/lib/Hydra/Controller/Root.pm at line 191 [7.804]
B:BD[7.2637] → [2.423:455]
```
    $path = "/nix/store/$path";
```
[7.2637]
[7.2637]
```
    $path = ($ENV{NIX_STORE_DIR}."/$path" || "/nix/store/$path" );
```

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 24 [8.2663]

B:BD[3.157] → [3.157:221]

    my $logPath = "/nix/var/log/nix/drvs/" . basename $drvPath;

[3.157]

[3.221]

    my $logPath = ($ENV{NIX_LOG_DIR} || "/nix/var/log/nix"). "/drvs/" . basename $drvPath;

Replacement in src/lib/Hydra/Helper/Nix.pm at line 33 [9.436]

B:BD[4.164] → [4.164:306]

    my $conf = $ENV{"HYDRA_CONF"} || (getHydraPath . "/hydra.conf");
    die "The HYDRA_CONF file ($conf) does not exist!\n" unless -f $conf;

[4.164]

[4.306]

    my $conf = $ENV{"HYDRA_CONFIG"} || (getHydraPath . "/hydra.conf");
    die "The HYDRA_CONFIG file ($conf) does not exist!\n" unless -f $conf;

Replacement in src/lib/Hydra/Helper/Nix.pm at line 77 [9.436]

B:BD[10.111] → [11.707:780]

    my $dir = "/nix/var/nix/gcroots/per-user/$ENV{LOGNAME}/hydra-roots";

[10.111]

[11.780]

    my $dir = ($ENV{NIX_STATE_DIR} || "/nix/var/nix" ) . "/gcroots/per-user/$ENV{LOGNAME}/hydra-roots";