use NIX_*_DIR env vars when defined

[?]
Mar 16, 2011, 1:08 PM
W3HI52QVYQUEMJDK6TI54WPNDQJOHYD47G45LNMI2YTH6YGKNXNQC

Dependencies

  • [2] MVB7RRLT * Move NARs from the NixChannel controller to the Root controller and
  • [3] QBQSQOSY hydra: moved getbuildlog
  • [4] RBGYFVWX use HYDRA_DATA/hydra.conf as default location for hydra.conf
  • [5] AFTXA575 * $HYDRA_DATA environment variable.
  • [6] A63IHCMX * Register GC roots properly.
  • [7] J5UVLXOK * Start of a basic Catalyst web interface.
  • [8] LZO3C2KI * Hack around those SQLite timeouts: just retry the transaction.
  • [9] C7CXMZ66 hydra: do not perform git clone every time. in stead work on local clone and pull
  • [10] 2T42QGZD * Register builds as GC roots so they don't get deleted.
  • [11] 5NO7NCKT * Refactoring.
  • [12] SMM4HQTP * Put actions related to builds under /build (e.g. /log/<buildid>
  • [13] NYC3LZKH * Generate NAR archives on the fly. Necessary for producing channels
  • [*] ZWCTAZGL added newsitems, added some admin options to clear various caches.
  • [*] JLDUSNUO * Unify rendering of finished and scheduled builds.
  • [*] OOQ2D3KC * Refactoring: move fetchInput out of hydra_scheduler into a separate
  • [*] 2GK5DOU7 * Downloading closures.

Change contents

  • edit in src/lib/Hydra/Controller/Root.pm at line 33
    [15.2335]
    [16.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
    [5.2637][2.423:455]()
    $path = "/nix/store/$path";
    [5.2637]
    [5.2637]
    $path = ($ENV{NIX_STORE_DIR}."/$path" || "/nix/store/$path" );
  • replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 24
    [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
    [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
    [5.111][5.707:780]()
    my $dir = "/nix/var/nix/gcroots/per-user/$ENV{LOGNAME}/hydra-roots";
    [5.111]
    [5.780]
    my $dir = ($ENV{NIX_STATE_DIR} || "/nix/var/nix" ) . "/gcroots/per-user/$ENV{LOGNAME}/hydra-roots";