Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2017-07-23 23:53:10 +02:00
commit 5b980c6a32
5 changed files with 137 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
krebs/3modules/buildbot/master.nix
View File

@ -3,14 +3,7 @@
with import <stockholm/lib>;
let
# https://github.com/NixOS/nixpkgs/issues/14026
nixpkgs-fix = import (pkgs.fetchgit {
url = https://github.com/nixos/nixpkgs;
rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
sha256 = "11lqd480bi6xbi7xbh4krrxmbp6a6iafv1d0q3sj461al0x0has8";
}) {};
buildbot = nixpkgs-fix.buildbot;
buildbot = pkgs.buildbot;
buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
# -*- python -*-
from buildbot.plugins import *

7
krebs/3modules/buildbot/slave.nix
View File

@ -2,11 +2,6 @@
with import <stockholm/lib>;
let
nixpkgs-fix = import (pkgs.fetchgit {
url = https://github.com/nixos/nixpkgs;
rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
sha256 = "11lqd480bi6xbi7xbh4krrxmbp6a6iafv1d0q3sj461al0x0has8";
}) {};
buildbot-slave-init = pkgs.writeText "buildbot-slave.tac" ''
import os
@ -158,7 +153,7 @@ let
workdir = shell.escape cfg.workDir;
contact = shell.escape cfg.contact;
description = shell.escape cfg.description;
buildbot = nixpkgs-fix.buildbot-slave;
buildbot = pkgs.buildbot-slave;
# TODO:make this
in {
PermissionsStartOnly = true;

65
krebs/5pkgs/simple/buildbot-slave/default.nix Normal file
View File

@ -0,0 +1,65 @@
{ stdenv, python2Packages, fetchFromGitHub, coreutils }:
python2Packages.buildPythonApplication (rec {
name = "buildbot-slave-classic-2017-07-23";
src = fetchFromGitHub {
owner = "krebscode";
repo = "buildbot-classic";
rev = "7c2826756a00ade7a1d6d20b4e9430710d2bc29e";
sha256 = "0za2k5kap6zky304rjknlvm3gyvw0q0p52c3jjmkf708s9gmyfyg";
};
postUnpack = "sourceRoot=\${sourceRoot}/slave";
propagatedBuildInputs = with python2Packages; [ twisted pathlib ];
# What's up with this?! 'trial' should be 'test', no?
#
# running tests
# usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
# or: setup.py --help [cmd1 cmd2 ...]
# or: setup.py --help-commands
# or: setup.py cmd --help
#
# error: invalid command 'trial'
doCheck = false;
postInstall = ''
mkdir -p "$out/share/man/man1"
cp docs/buildslave.1 "$out/share/man/man1"
'';
meta = with stdenv.lib; {
homepage = http://buildbot.net/;
license = stdenv.lib.licenses.gpl2Plus;
description = "Continuous integration system that automates the build/test cycle";
longDescription =
'' The BuildBot is a system to automate the compile/test cycle
required by most software projects to validate code changes. By
automatically rebuilding and testing the tree each time something
has changed, build problems are pinpointed quickly, before other
developers are inconvenienced by the failure. The guilty
developer can be identified and harassed without human
intervention. By running the builds on a variety of platforms,
developers who do not have the facilities to test their changes
everywhere before checkin will at least know shortly afterwards
whether they have broken the build or not. Warning counts, lint
checks, image size, compile time, and other build parameters can
be tracked over time, are more visible, and are therefore easier
to improve.
The overall goal is to reduce tree breakage and provide a platform
to run tests or code-quality checks that are too annoying or
pedantic for any human to waste their time with. Developers get
immediate (and potentially public) feedback about their changes,
encouraging them to be more careful about testing before checking
in code.
'';
maintainers = with maintainers; [ bjornfor ];
platforms = platforms.all;
};
})

70
krebs/5pkgs/simple/buildbot/default.nix Normal file
View File

@ -0,0 +1,70 @@
{ stdenv, python2Packages, fetchFromGitHub
, enableDebugClient ? false
}:
# enableDebugClient enables "buildbot debugclient", a Gtk-based debug control
# panel. Its mostly for developers.
assert enableDebugClient -> python2Packages.pygobject != null && python2Packages.pyGtkGlade != null;
with python2Packages; buildPythonApplication (rec {
name = "buildbot-classic-2017-07-23";
src = fetchFromGitHub {
owner = "krebscode";
repo = "buildbot-classic";
rev = "2ef3315e0ac8f387ab751d02ee68d166909283aa";
sha256 = "00amqarknbh1p141h14jw4r8d23ih0xgf1h4jscp76ba340drjfj";
};
propagatedBuildInputs =
[ twisted dateutil jinja2 sqlalchemy_migrate pathlib
] ++ stdenv.lib.optional enableDebugClient [ pygobject pyGtkGlade ];
postUnpack = "sourceRoot=\${sourceRoot}/master";
# What's up with this?! 'trial' should be 'test', no?
#
# running tests
# usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
# or: setup.py --help [cmd1 cmd2 ...]
# or: setup.py --help-commands
# or: setup.py cmd --help
#
# error: invalid command 'trial'
doCheck = false;
postInstall = ''
mkdir -p "$out/share/man/man1"
cp docs/buildbot.1 "$out/share/man/man1"
'';
meta = with stdenv.lib; {
homepage = http://buildbot.net/;
license = stdenv.lib.licenses.gpl2Plus;
# Of course, we don't really need that on NixOS. :-)
description = "Continuous integration system that automates the build/test cycle";
longDescription =
'' The BuildBot is a system to automate the compile/test cycle
required by most software projects to validate code changes. By
automatically rebuilding and testing the tree each time something
has changed, build problems are pinpointed quickly, before other
developers are inconvenienced by the failure. The guilty
developer can be identified and harassed without human
intervention. By running the builds on a variety of platforms,
developers who do not have the facilities to test their changes
everywhere before checkin will at least know shortly afterwards
whether they have broken the build or not. Warning counts, lint
checks, image size, compile time, and other build parameters can
be tracked over time, are more visible, and are therefore easier
to improve.
The overall goal is to reduce tree breakage and provide a platform
to run tests or code-quality checks that are too annoying or
pedantic for any human to waste their time with. Developers get
immediate (and potentially public) feedback about their changes,
encouraging them to be more careful about testing before checking
in code.
'';
maintainers = with maintainers; [ bjornfor ];
platforms = platforms.all;
};
})

1
makefu/1systems/shoney/config.nix
View File

@ -14,7 +14,6 @@ in {
<stockholm/makefu/2configs/hw/CAC.nix>
<stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
<stockholm/makefu/2configs/tinc/retiolum.nix>
<stockholm/makefu/2configs/torrent.nix>
];