From 8d28f29c57467ca05e38a27a54de5f74494d8be6 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 3 Jan 2017 18:10:30 +0100 Subject: [PATCH] MaJ version hydra - manuelle --- public/service-hydra-core.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/public/service-hydra-core.nix b/public/service-hydra-core.nix index cd656dd..c259a70 100644 --- a/public/service-hydra-core.nix +++ b/public/service-hydra-core.nix @@ -5,8 +5,17 @@ let cfg = config.r6d.config-generator; computers = config.r6d.computers; profiles = config.r6d.profiles; -in + + # Note that we use 'import {}' instead of 'pkgs'. + # If we use the latter we get an infinite recursion + # because we include hydra-src in the module imports below which in turn defines the 'pkgs' value. + hydra-src = (import {}).fetchgit { + url = "https://github.com/NixOS/hydra.git"; + rev = "de55303197d997c4fc5503b52b1321ae9528583d"; + sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly"; + }; +in mkIf cfg.hydra-core { # Paquets @@ -43,6 +52,7 @@ mkIf cfg.hydra-core { listenHost = "localhost"; minimumDiskFree = 50; # Go smtpHost = "localhost"; + package = lib.mkDefault ((import (hydra-src + /release.nix) {}).build.x86_64-linux); }; ## Ménage