From 96ea1311d698ec30ab14af0f0169367fc1e6260b Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 14 Sep 2018 09:57:09 +0200 Subject: buildbot: test nix-writers --- krebs/2configs/buildbot-stockholm.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix index 0ee91ae34..8284ff3b3 100644 --- a/krebs/2configs/buildbot-stockholm.nix +++ b/krebs/2configs/buildbot-stockholm.nix @@ -16,6 +16,12 @@ krebs.ci = { enable = true; repos = { + 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" -- cgit v1.2.3 From da41d8b4738083d5ad2263d5ed657ddb9f941cb4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 14 Sep 2018 11:40:48 +0200 Subject: buildbot: test disko --- krebs/2configs/buildbot-stockholm.nix | 6 ++++++ lass/2configs/blue.nix | 2 ++ 2 files changed, 8 insertions(+) diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix index 8284ff3b3..d10fb7203 100644 --- a/krebs/2configs/buildbot-stockholm.nix +++ b/krebs/2configs/buildbot-stockholm.nix @@ -16,6 +16,12 @@ 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" 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 ); environment.systemPackages = with pkgs; [ ag + brain + dic nmap git-preview ]; -- cgit v1.2.3 From 3b5f868a5bfefd80a09345f169f0fa963eca0293 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 14 Sep 2018 11:41:12 +0200 Subject: ci: set env for test-runners --- krebs/3modules/ci.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index fdc8b9dc4..817539645 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? )]) -- cgit v1.2.3 From 0b3497384e7e67e734f5f771fcb5aa649ad964d2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 14 Sep 2018 13:57:58 +0200 Subject: ci: ignore stderr from getJobs --- krebs/3modules/ci.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index 817539645..16c6d4315 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -128,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 -- cgit v1.2.3 From eb0087649d7174763cc790313994f2d9f2f62c19 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 16 Sep 2018 19:46:08 +0200 Subject: Reaktor: 0.5.1 -> 0.6.0 --- krebs/5pkgs/simple/Reaktor/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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/; -- cgit v1.2.3 From 4bcb98a3c4c29a20289b7706667d24c514edd62c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 16 Sep 2018 19:49:54 +0200 Subject: reaktor-krebs: configure nickserv password --- krebs/2configs/reaktor-krebs.nix | 6 ++++++ 1 file changed, 6 insertions(+) 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 ; ]; 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 ; (attrValues (todo "agenda")) ; }; + krebs.secret.files.nix-serve-key = { + path = "/var/lib/Reaktor/reaktor_nickserv_password"; + owner.name = "Reaktor"; + source-path = toString + "/reaktor_nickserv_password"; + }; } -- cgit v1.2.3 From 4b3af45e9c9149ee59b11729ffe75e4738b409b3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 16 Sep 2018 20:35:23 +0200 Subject: l git: add Reaktor --- lass/2configs/git.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 300637ff8..0fe990999 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"; -- cgit v1.2.3 From fca8903d5bea7be12f3f1f46b3cd2f5b9803e30c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 16 Sep 2018 20:36:20 +0200 Subject: l git: add nix-writers --- lass/2configs/git.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 0fe990999..97def9df3 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -58,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"; -- cgit v1.2.3