Author: maggesi
Date: Fri May 18 20:21:43 2012
New Revision: 34177
URL: https://nixos.org/websvn/nix/?rev=34177&sc=1
Log:
z77z configs: update release.nix and include missing files
Added:
configurations/trunk/misc/z77z/modules/
configurations/trunk/misc/z77z/modules/hydra.nix
Modified:
configurations/trunk/misc/z77z/build-releases
configurations/trunk/misc/z77z/release.nix
Modified: configurations/trunk/misc/z77z/build-releases
==============================================================================
--- configurations/trunk/misc/z77z/build-releases Fri May 18 19:40:49
2012 (r34176)
+++ configurations/trunk/misc/z77z/build-releases Fri May 18 20:21:43
2012 (r34177)
@@ -1,4 +1,11 @@
#!/bin/sh
-nix-build -o neve-sys -A system -I
configuration=/etc/nixos/z77z/neve/configuration.nix release.nix --show-trace
-nix-build -o virtux-sys -A system -I configuration=/etc/nixos/z77z/virtux.nix
release.nix --show-trace
-nix-build -o dolly-sys -A system -I configuration=/etc/nixos/z77z/dolly.nix
release.nix --show-trace
\ No newline at end of file
+
+NIX_PATH=
+
+nix-build \
+ -o systems-result \
+ -I configuration=/etc/nixos/systems/elio.nix \
+ -I nixpkgs=/etc/nixos/nixpkgs/ \
+ -I nixos=/etc/nixos/nixos/ \
+ release.nix \
+ --show-trace
Added: configurations/trunk/misc/z77z/modules/hydra.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ configurations/trunk/misc/z77z/modules/hydra.nix Fri May 18 20:21:43
2012 (r34177)
@@ -0,0 +1,228 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+ cfg = config.services.hydra;
+
+ hydraConf = pkgs.writeScript "hydra.conf"
+ ''
+ using_frontend_proxy 1
+ base_uri ${cfg.hydraURL}
+ notification_sender ${cfg.notificationSender}
+ max_servers 25
+ '';
+
+ env = ''export NIX_REMOTE=daemon ''
+ + ''HYDRA_DBI="${cfg.dbi}" ''
+ + ''HYDRA_CONFIG=${cfg.baseDir}/data/hydra.conf ''
+ + ''HYDRA_DATA=${cfg.baseDir}/data ''
+ + ''HYDRA_PORT="${toString cfg.port}" ''
+ + (if cfg.logo != null
+ then ''HYDRA_LOGO="${cfg.logo}" ''
+ else "")
+ + ''HYDRA_TRACKER="${cfg.tracker}" ;'';
+
+in
+
+{
+ ###### interface
+ options = {
+ services.hydra = rec {
+
+ enable = mkOption {
+ default = false;
+ description = ''
+ Whether to run Hydra services.
+ '';
+ };
+
+ baseDir = mkOption {
+ default = "/home/${user.default}";
+ description = ''
+ The directory holding configuration, logs and temporary files.
+ '';
+ };
+
+ user = mkOption {
+ default = "hydra";
+ description = ''
+ The user the Hydra services should run as.
+ '';
+ };
+
+ dbi = mkOption {
+ default = "dbi:Pg:dbname=hydra;host=localhost;user=root;";
+ example = "dbi:SQLite:/home/hydra/db/hydra.sqlite";
+ description = ''
+ The DBI string for Hydra database connection.
+ '';
+ };
+
+ hydra = mkOption {
+ #default = pkgs.hydra;
+ description = ''
+ Location of hydra
+ '';
+ };
+
+ hydraURL = mkOption {
+ default = "http://hydra.nixos.org";;
+ description = ''
+ The base URL for the Hydra webserver instance. Used for links in
emails.
+ '';
+ };
+
+ port = mkOption {
+ default = 3000;
+ description = ''
+ TCP port the web server should listen to.
+ '';
+ };
+
+ minimumDiskFree = mkOption {
+ default = 5;
+ description = ''
+ Threshold of minimum disk space (G) to determine if queue runner
should run or not.
+ '';
+ };
+
+ minimumDiskFreeEvaluator = mkOption {
+ default = 2;
+ description = ''
+ Threshold of minimum disk space (G) to determine if evaluator should
run or not.
+ '';
+ };
+
+ notificationSender = mkOption {
+ default = "[email protected]";
+ description = ''
+ Sender email address used for email notifications.
+ '';
+ };
+
+ tracker = mkOption {
+ default = "";
+ description = ''
+ Piece of HTML that is included on all pages.
+ '';
+ };
+
+ logo = mkOption {
+ default = null;
+ description = ''
+ File name of an alternate logo to be displayed on the web pages.
+ '';
+ };
+
+ autoStart = mkOption {
+ default = true;
+ description = ''
+ If hydra upstart jobs should start automatically.
+ '';
+ };
+
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ cfg.hydra ];
+
+ users.extraUsers = [
+ { name = cfg.user;
+ description = "Hydra";
+ home = cfg.baseDir;
+ createHome = true;
+ useDefaultShell = true;
+ }
+ ];
+
+ nix.gc.automatic = true;
+ # $3 / $4 don't always work depending on length of device name
+ nix.gc.options = ''--max-freed "$((200 * 1024**3 - 1024 * $(df /nix/store
| tail -n 1 | awk '{ print $3 }')))"'';
+
+ nix.extraOptions = ''
+ gc-keep-outputs = true
+ gc-keep-derivations = true
+
+ # The default (`true') slows Nix down a lot since the build farm
+ # has so many GC roots.
+ gc-check-reachability = false
+
+ # Hydra needs caching of build failures.
+ build-cache-failure = true
+
+ build-poll-interval = 10
+
+ use-sqlite-wal = false
+ '';
+
+ jobs.hydra_init =
+ { description = "hydra-init";
+ startOn = "started network-interfaces";
+ preStart = ''
+ mkdir -p ${cfg.baseDir}/data
+ chown ${cfg.user} ${cfg.baseDir}/data
+ ln -sf ${hydraConf} ${cfg.baseDir}/data/hydra.conf
+ '';
+ exec = ''
+ echo done
+ '';
+ };
+
+ jobs.hydra_server =
+ { description = "hydra-server";
+ startOn = if cfg.autoStart then "started network-interfaces
hydra-init" else "never";
+ exec = ''
+ ${pkgs.su}/bin/su - ${cfg.user} -c '${env}
${cfg.hydra}/bin/hydra-server > ${cfg.baseDir}/data/server.log 2>&1'
+ '';
+ };
+
+ jobs.hydra_queue_runner =
+ { description = "hydra-queue-runner";
+ startOn = if cfg.autoStart then "started network-interfaces
hydra-init" else "never";
+ preStart = "${pkgs.su}/bin/su - ${cfg.user} -c '${env}
${cfg.hydra}/bin/hydra-queue-runner --unlock'";
+ exec = ''
+ ${pkgs.su}/bin/su - ${cfg.user} -c '${env} nice -n 8
${cfg.hydra}/bin/hydra-queue-runner > ${cfg.baseDir}/data/queue-runner.log 2>&1'
+ '';
+ };
+
+ jobs.hydra_evaluator =
+ { description = "hydra-evaluator";
+ startOn = if cfg.autoStart then "started network-interfaces
hydra-init" else "never";
+ exec = ''
+ ${pkgs.su}/bin/su - ${cfg.user} -c '${env} nice -n 5
${cfg.hydra}/bin/hydra-evaluator > ${cfg.baseDir}/data/evaluator.log 2>&1'
+ '';
+ };
+
+ services.cron.systemCronJobs =
+ let
+ # If there is less than ... GiB of free disk space, stop the queue
+ # to prevent builds from failing or aborting.
+ checkSpace = pkgs.writeScript "hydra-check-space"
+ ''
+ #! /bin/sh
+ if [ $(($(stat -f -c '%a'
/nix/store) * $(stat -f -c '%S' /nix/store))) -lt $((${toString
cfg.minimumDiskFree} * 1024**3)) ]; then
+ stop hydra-queue-runner
+ fi
+ if [ $(($(stat -f -c '%a' /nix/store) * $(stat -f -c '%S'
/nix/store))) -lt $((${toString cfg.minimumDiskFreeEvaluator} * 1024**3)) ];
then
+ stop hydra-evaluator
+ fi
+ '';
+ compressLogs = pkgs.writeScript "compress-logs" ''
+ #! /bin/sh -e
+ touch -d 'last month' r
+ find /nix/var/log/nix/drvs -type f -a ! -newer r -name '*.drv' |
xargs bzip2 -v
+ '';
+ in
+ [ "*/5 * * * * root ${checkSpace} &>
${cfg.baseDir}/data/checkspace.log"
+ "15 5 * * * root ${compressLogs} &>
${cfg.baseDir}/data/compress.log"
+ "15 02 * * * ${cfg.user} ${env}
${cfg.hydra}/bin/hydra-update-gc-roots &> ${cfg.baseDir}/data/gc-roots.log"
+ ];
+
+ };
+}
Modified: configurations/trunk/misc/z77z/release.nix
==============================================================================
--- configurations/trunk/misc/z77z/release.nix Fri May 18 19:40:49 2012
(r34176)
+++ configurations/trunk/misc/z77z/release.nix Fri May 18 20:21:43 2012
(r34177)
@@ -1,14 +1,17 @@
-{ nixpkgs ? <nixpkgs>
-, nixos ? <nixos>
-, configuration ? <configuration>
+{ nixpkgsSrc ? <nixpkgs>
+, nixosSrc ? <nixos>
}:
let
- pkgs = import nixpkgs { };
- eval = import (nixos + "/lib/eval-config.nix") {
- inherit pkgs;
- modules = [ configuration ];
- };
-in {
- system = eval.config.system.build.toplevel;
-}
\ No newline at end of file
+ system = "i686-linux";
+ pkgs = import nixpkgsSrc { inherit system; };
+ eval = conf: import (nixosSrc + "/lib/eval-config.nix")
+ { inherit pkgs system;
+ modules = [ conf ];
+ };
+in
+{
+ elio = (eval ./elio.nix).config.system.build.toplevel;
+ neve = (eval ./neve/configuration.nix).config.system.build.toplevel;
+ virtux = (eval ./virtux.nix).config.system.build.toplevel;
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
