diff options
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/1systems/puyak/config.nix | 1 | ||||
| -rw-r--r-- | krebs/3modules/Reaktor.nix | 16 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/buildbot-classic-slave/default.nix | 9 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/buildbot-classic/default.nix | 27 |
4 files changed, 31 insertions, 22 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 8454ba23f..a1df11901 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -12,6 +12,7 @@ ]; krebs.build.host = config.krebs.hosts.puyak; + sound.enable = false; boot = { loader.systemd-boot.enable = true; diff --git a/krebs/3modules/Reaktor.nix b/krebs/3modules/Reaktor.nix index a70f1ef5d..99a7a55ef 100644 --- a/krebs/3modules/Reaktor.nix +++ b/krebs/3modules/Reaktor.nix @@ -4,8 +4,7 @@ with import <stockholm/lib>; let cfg = config.krebs.Reaktor; - - workdir = "/var/lib/Reaktor"; + homedir = "/var/lib/Reaktor"; out = { options.krebs.Reaktor = api; @@ -38,6 +37,14 @@ let default = [pkgs.ReaktorPlugins.nixos-version]; }; + workdir = mkOption { + default = "/var/lib/Reaktor"; + type = types.path; + description = '' + path to be used as workdir (home dir is still /var/lib/Reaktor) + ''; + }; + extraConfig = mkOption { default = ""; type = types.string; @@ -84,7 +91,7 @@ let name = "Reaktor"; uid = genid name; description = "Reaktor user"; - home = workdir; + home = homedir; createHome = true; }; @@ -118,7 +125,7 @@ let REAKTOR_NICKNAME = botcfg.nickname; REAKTOR_DEBUG = (if botcfg.debug then "True" else "False"); REAKTOR_CHANNELS = lib.concatStringsSep "," botcfg.channels; - state_dir = workdir; + state_dir = botcfg.workdir; } // botcfg.extraEnviron; serviceConfig= { @@ -129,6 +136,7 @@ let else ''(${pkgs.Reaktor}/bin/reaktor get-config;cat "${ReaktorConfig}" ) > /tmp/reaktor-${name}-config.py'' } + mkdir -p ${botcfg.workdir} ''; ExecStart = "${pkgs.Reaktor}/bin/reaktor run /tmp/reaktor-${name}-config.py"; PrivateTmp = "true"; diff --git a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix index c316889e4..bbc824a6a 100644 --- a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix +++ b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix @@ -1,16 +1,15 @@ -{ coreutils, fetchgit, fetchFromGitHub, buildbot-classic, python2Packages, ... }: +{ coreutils, fetchgit, git, buildbot-classic, python2Packages, ... }: python2Packages.buildPythonApplication { - name = "buildbot-classic-slave-0.8.12"; + name = "buildbot-classic-slave-0.8.13"; namePrefix = ""; src = buildbot-classic.src; postUnpack = "sourceRoot=\${sourceRoot}/slave"; - patchPhase = '' - substituteInPlace buildslave/scripts/logwatcher.py --replace /usr/bin/tail ${coreutils}/bin/tail - ''; + patchPhase = ":"; + nativeBuildInputs = [ git ]; propagatedBuildInputs = [ python2Packages.twisted ]; doCheck = false; diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix index a3d924c4a..353972109 100644 --- a/krebs/5pkgs/simple/buildbot-classic/default.nix +++ b/krebs/5pkgs/simple/buildbot-classic/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, fetchFromGitHub, python2Packages, ... }: +{ fetchgit, fetchFromGitHub, python2Packages, git, ... }: let # https://github.com/NixOS/nixpkgs/issues/14026 nixpkgs-fix = import (fetchgit { @@ -8,18 +8,19 @@ let }) {}; in nixpkgs-fix.buildPythonApplication { - name = "buildbot-classic-0.8.12"; + name = "buildbot-classic-0.8.13"; namePrefix = ""; patches = []; - src = fetchFromGitHub { - owner = "krebscode"; - repo = "buildbot-classic"; - rev = "5b4f5f6f1"; - sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93"; + src = fetchgit { + url = "https://github.com/krebscode/buildbot-classic"; + rev = "211ec7815"; + sha256 = "0cyn406r31qdqhpsih7w83x47b443svpgfhxqd6w3iryv0y1z95i"; + leaveDotGit = true; + }; postUnpack = "sourceRoot=\${sourceRoot}/master"; - + buildInputs = [ git ]; patchPhase = # The code insists on /usr/bin/tail, /usr/bin/make, etc. '' echo "patching erroneous absolute path references..." @@ -32,11 +33,11 @@ in nixpkgs-fix.buildPythonApplication { sed -i 's/==/>=/' setup.py ''; - propagatedBuildInputs = [ - python2Packages.jinja2 - python2Packages.twisted - nixpkgs-fix.pythonPackages.dateutil_1_5 - nixpkgs-fix.pythonPackages.sqlalchemy_migrate_0_7 + propagatedBuildInputs = with nixpkgs-fix.pythonPackages; [ + jinja2 + twisted + dateutil_1_5 + sqlalchemy_migrate_0_7 ]; doCheck = false; postInstall = '' |