summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-09-17 01:14:03 +0200
committermakefu <github@syntax-fehler.de>2018-09-17 01:14:03 +0200
commit12a3936e06b3fc6cb3b61fd10c7aeb8d3f461f63 (patch)
tree7ad0d614aa4290878a1c265e22a4c6f3d964de73
parent0823d0cbdc2861defaabc232058d96c8862c0b24 (diff)
parentfca8903d5bea7be12f3f1f46b3cd2f5b9803e30c (diff)
Merge remote-tracking branch 'lass/master'
-rw-r--r--krebs/2configs/buildbot-stockholm.nix12
-rw-r--r--krebs/2configs/reaktor-krebs.nix6
-rw-r--r--krebs/3modules/ci.nix6
-rw-r--r--krebs/5pkgs/simple/Reaktor/default.nix12
-rw-r--r--lass/2configs/blue.nix2
-rw-r--r--lass/2configs/git.nix8
6 files changed, 40 insertions, 6 deletions
diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 0ee91ae34..d10fb7203 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -16,6 +16,18 @@
krebs.ci = {
enable = true;
repos = {
+ disko.urls = [
+ "http://cgit.gum.r/disko"
+ "http://cgit.hotdog.r/disko"
+ "http://cgit.ni.r/disko"
+ "http://cgit.prism.r/disko"
+ ];
+ nix_writers.urls = [
+ "http://cgit.hotdog.r/nix-writers"
+ "http://cgit.ni.r/nix-writers"
+ "http://cgit.prism.r/nix-writers"
+ "https://git.ingolf-wagner.de/krebs/nix-writers.git"
+ ];
stockholm.urls = [
"http://cgit.enklave.r/stockholm"
"http://cgit.gum.r/stockholm"
diff --git a/krebs/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix
index ba3715161..dc2838cae 100644
--- a/krebs/2configs/reaktor-krebs.nix
+++ b/krebs/2configs/reaktor-krebs.nix
@@ -10,6 +10,7 @@ with import <stockholm/lib>;
];
extraEnviron = {
REAKTOR_HOST = "irc.freenode.org";
+ REAKTOR_NICKSERV_PASSWORD = "/var/lib/Reaktor/reaktor_nickserv_password";
};
plugins = with pkgs.ReaktorPlugins; [
sed-plugin
@@ -21,4 +22,9 @@ with import <stockholm/lib>;
(attrValues (todo "agenda"))
;
};
+ krebs.secret.files.nix-serve-key = {
+ path = "/var/lib/Reaktor/reaktor_nickserv_password";
+ owner.name = "Reaktor";
+ source-path = toString <secrets> + "/reaktor_nickserv_password";
+ };
}
diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index fdc8b9dc4..16c6d4315 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -100,6 +100,10 @@ let
command=[
new_steps[new_step]
],
+ env={
+ "NIX_REMOTE": "daemon",
+ "NIX_PATH": "secrets=/var/src/stockholm/null:/var/src",
+ },
timeout=90001,
workdir='build', # TODO figure out why we need this?
)])
@@ -124,7 +128,7 @@ let
},
name="get_steps",
command=["${getJobs}"],
- property="steps_json"
+ extract_fn=lambda rc, stdout, stderr: { 'steps_json': stdout },
))
f_${name}.addStep(StepToStartMoreSteps(command=["echo"])) # TODO remove dummy command from here
diff --git a/krebs/5pkgs/simple/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix
index 6989bb02b..a9566087f 100644
--- a/krebs/5pkgs/simple/Reaktor/default.nix
+++ b/krebs/5pkgs/simple/Reaktor/default.nix
@@ -1,8 +1,8 @@
-{ lib, pkgs,python3Packages,fetchurl, ... }:
+{ lib, pkgs, python3Packages, fetchFromGitHub, ... }:
python3Packages.buildPythonPackage rec {
name = "Reaktor-${version}";
- version = "0.5.1";
+ version = "0.6.0";
doCheck = false;
@@ -10,9 +10,11 @@ python3Packages.buildPythonPackage rec {
python3Packages.docopt
python3Packages.requests
];
- src = fetchurl {
- url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-${version}.tar.gz";
- sha256 = "0dn9r0cyxi1sji2pnybsrc4hhaaq7hmf235nlgkrxqlsdb7y6n6n";
+ src = fetchFromGitHub {
+ owner = "krebs";
+ repo = "Reaktor";
+ rev = version;
+ sha256 = "0nsnv1rixmlg5wkb74b4f5bycb42b9rp4b14hijh558hbsa1b9am";
};
meta = {
homepage = http://krebsco.de/;
diff --git a/lass/2configs/blue.nix b/lass/2configs/blue.nix
index 16c63ff38..68f2256cf 100644
--- a/lass/2configs/blue.nix
+++ b/lass/2configs/blue.nix
@@ -11,6 +11,8 @@ with (import <stockholm/lib>);
environment.systemPackages = with pkgs; [
ag
+ brain
+ dic
nmap
git-preview
];
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 300637ff8..97def9df3 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -34,6 +34,10 @@ let
rules = concatMap make-rules (attrValues repos);
public-repos = mapAttrs make-public-repo {
+ Reaktor = {
+ cgit.desc = "Reaktor IRC bot";
+ cgit.section = "software";
+ };
buildbot-classic = {
cgit.desc = "fork of buildbot";
cgit.section = "software";
@@ -54,6 +58,10 @@ let
cgit.desc = "take a rss feed and a timeout and print it to stdout";
cgit.section = "software";
};
+ nix-writers = {
+ cgit.desc = "high level writers for nix";
+ cgit.section = "software";
+ };
nixpkgs = {
cgit.desc = "nixpkgs fork";
cgit.section = "configuration";