From 5518fcf25a4872bdca797bd830aebe8570aa2915 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 28 Nov 2016 23:24:47 +0100 Subject: l 2 buildbot: fix indentation --- lass/2configs/buildbot-standalone.nix | 74 +++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 24 deletions(-) diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index e7fbccb77..9ff96089b 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -18,25 +18,34 @@ in { }; change_source.stockholm = '' stockholm_repo = '${stockholm-mirror-url}' - cs.append(changes.GitPoller( + cs.append( + changes.GitPoller( stockholm_repo, workdir='stockholm-poller', branches=True, project='stockholm', - pollinterval=120)) + pollinterval=120 + ) + ) ''; scheduler = { build-scheduler = '' # build all hosts - sched.append(schedulers.SingleBranchScheduler( - change_filter=util.ChangeFilter(branch_re=".*"), - treeStableTimer=10, - name="build-all-branches", - builderNames=["build-all", "build-pkgs"])) + sched.append( + schedulers.SingleBranchScheduler( + change_filter=util.ChangeFilter(branch_re=".*"), + treeStableTimer=10, + name="build-all-branches", + builderNames=["build-all", "build-pkgs"] + ) + ) ''; }; builder_pre = '' # prepare grab_repo step for stockholm - grab_repo = steps.Git(repourl=stockholm_repo, mode='full') + grab_repo = steps.Git( + repourl=stockholm_repo, + mode='full' + ) # TODO: get nixpkgs/stockholm paths from krebs env_lass = { @@ -57,13 +66,21 @@ in { # prepare nix-shell # the dependencies which are used by the test script - deps = [ "gnumake", "jq", "nix", "(import ).pkgs.populate", "openssh" ] + deps = [ + "gnumake", + "jq", + "nix", + "(import ).pkgs.populate", + "openssh" + ] # TODO: --pure , prepare ENV in nix-shell command: # SSL_CERT_FILE,LOGNAME,NIX_REMOTE - nixshell = ["nix-shell", - "-I", "stockholm=.", - "-I", "nixpkgs=/var/src/nixpkgs", - "-p" ] + deps + [ "--run" ] + nixshell = [ + "nix-shell", + "-I", "stockholm=.", + "-I", "nixpkgs=/var/src/nixpkgs", + "-p" + ] + deps + [ "--run" ] # prepare addShell function def addShell(factory,**kwargs): @@ -73,29 +90,38 @@ in { build-all = '' f = util.BuildFactory() f.addStep(grab_repo) + for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]: - addShell(f,name="build-{}".format(i),env=env_lass, - command=nixshell + \ - ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + addShell(f,name="build-{}".format(i),env=env_lass, + command=nixshell + \ + ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ make \ test \ target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \ method=build \ - system={}".format(i)]) + system={}".format(i) + ] + ) for i in [ "x", "wry", "vbob", "wbob", "shoney" ]: - addShell(f,name="build-{}".format(i),env=env_makefu, - command=nixshell + \ - ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + addShell(f,name="build-{}".format(i),env=env_makefu, + command=nixshell + \ + ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ make \ test \ target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \ method=build \ - system={}".format(i)]) + system={}".format(i) + ] + ) - bu.append(util.BuilderConfig(name="build-all", - workernames=workernames, - factory=f)) + bu.append( + util.BuilderConfig( + name="build-all", + workernames=workernames, + factory=f + ) + ) ''; -- cgit v1.2.3 From f55fceaa63d9f830a70d031fdde360c1862bbd32 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 29 Nov 2016 13:56:59 +0100 Subject: l 2 buildbot: add shared hosts to build-all --- lass/2configs/buildbot-standalone.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 9ff96089b..23dd0ae09 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -90,6 +90,17 @@ in { build-all = '' f = util.BuildFactory() f.addStep(grab_repo) + for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf", "test-centos7" ]: + addShell(f,name="build-{}".format(i),env=env_shared, + command=nixshell + \ + ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + make \ + test \ + target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \ + method=build \ + system={}".format(i) + ] + ) for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]: addShell(f,name="build-{}".format(i),env=env_lass, -- cgit v1.2.3 From dbc68c5e1bc0ff9ee2b5674098a6221255a03f61 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 29 Nov 2016 11:15:57 +0100 Subject: l 2 buildbot: rename build-all -> build-hosts --- lass/2configs/buildbot-standalone.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 23dd0ae09..72cd66420 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -35,7 +35,7 @@ in { change_filter=util.ChangeFilter(branch_re=".*"), treeStableTimer=10, name="build-all-branches", - builderNames=["build-all", "build-pkgs"] + builderNames=["build-hosts", "build-pkgs"] ) ) ''; @@ -87,7 +87,7 @@ in { factory.addStep(steps.ShellCommand(**kwargs)) ''; builder = { - build-all = '' + build-hosts = '' f = util.BuildFactory() f.addStep(grab_repo) for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf", "test-centos7" ]: @@ -128,7 +128,7 @@ in { bu.append( util.BuilderConfig( - name="build-all", + name="build-hosts", workernames=workernames, factory=f ) -- cgit v1.2.3 From 61c38e4c2dca1c55d80b87bc7c09b00337ca9f38 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 1 Dec 2016 16:57:29 +0100 Subject: k 3: remove Mic92 from eloop-ml --- krebs/3modules/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 7f5d2c7bd..bf09b7424 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -155,14 +155,13 @@ let to = concatMapStringsSep "," (getAttr "mail") (toList to); }; in mapAttrsToList format (with config.krebs.users; let - eloop-ml = spam-ml ++ [ ciko Mic92 ]; + eloop-ml = spam-ml ++ [ ciko ]; spam-ml = [ lass makefu tv ]; ciko.mail = "wieczorek.stefan@gmail.com"; - Mic92.mail = "joerg@higgsboson.tk"; in { "anmeldung@eloop.org" = eloop-ml; "cfp@eloop.org" = eloop-ml; -- cgit v1.2.3 From fe05d5ac603201d9dc97f5d28b6c10e19682abcb Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 1 Dec 2016 17:10:13 +0100 Subject: l 2 baseX: add ncdu to pkgs --- lass/2configs/baseX.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index fbab23500..cdb6d34ab 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -36,6 +36,7 @@ in { gitAndTools.qgit lm_sensors much + ncdu nmap pavucontrol powertop -- cgit v1.2.3 From 26705829d8e6aeb7bfb7cdb6dde8054f0ee5d073 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 1 Dec 2016 17:10:31 +0100 Subject: l 2 games: add doom{1,2} wrappers --- lass/2configs/games.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix index 0eec97922..82b7eb2c9 100644 --- a/lass/2configs/games.nix +++ b/lass/2configs/games.nix @@ -2,10 +2,28 @@ let mainUser = config.users.extraUsers.mainUser; + doom = pkgs.writeDash "doom" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${pkgs.zandronum}/bin/zandronum \ + -file $DOOM_DIR/lib/brutalv20.pk3 \ + -file $DOOM_DIR/lib/RebotStarcraftMarines.pk3 \ + -fov 120 \ + "$@" + ''; + doom1 = pkgs.writeDashBin "doom1" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${doom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@" + ''; + doom2 = pkgs.writeDashBin "doom2" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${doom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@" + ''; in { environment.systemPackages = with pkgs; [ dwarf_fortress + doom1 + doom2 ]; users.extraUsers = { -- cgit v1.2.3 From f4ce5ea248c6dcb965f9367a4569a39f4be747af Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 1 Dec 2016 21:50:23 +0100 Subject: l 2 nixpkgs: ece0cea -> e360c72 --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index be54d120a..48472f7a1 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "ece0cea127f0a8799a6bd3b12c368193491f9058"; + ref = "e360c7205f84be180d80b97f3980fb809a951486"; }; } -- cgit v1.2.3 From b6e6a99585c9b53e1f96529eaa1449f8eb30dae2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 2 Dec 2016 09:23:09 +0100 Subject: k 5 urlwatch: remove obsolete postFixup --- krebs/5pkgs/urlwatch/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/krebs/5pkgs/urlwatch/default.nix b/krebs/5pkgs/urlwatch/default.nix index 7a4df5c7c..7ffbd8870 100644 --- a/krebs/5pkgs/urlwatch/default.nix +++ b/krebs/5pkgs/urlwatch/default.nix @@ -15,10 +15,6 @@ python3Packages.buildPythonPackage rec { requests2 ]; - postFixup = '' - wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH" - ''; - meta = { description = "A tool for monitoring webpages for updates"; homepage = https://thp.io/2008/urlwatch/; -- cgit v1.2.3 From 41c7c82343b77700372ee601961d214609d3c124 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Dec 2016 15:38:26 +0100 Subject: l 2 nixpkgs: e360c72 -> 6a9f087 --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 48472f7a1..9b26f5be8 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "e360c7205f84be180d80b97f3980fb809a951486"; + ref = "6a9f087e37e392b9c3819196af33c529c12c4e48"; }; } -- cgit v1.2.3 From 8ba35538c093a228e2836e4c4d29757dfeb8853c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Dec 2016 20:40:11 +0100 Subject: l 1 mors: use libvirtd instead of virtualbox --- lass/1systems/mors.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 99705cbf1..9f2cec9a1 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -13,7 +13,6 @@ with import ; ../2configs/browsers.nix ../2configs/games.nix ../2configs/pass.nix - ../2configs/virtualbox.nix ../2configs/elster.nix ../2configs/steam.nix ../2configs/wine.nix @@ -79,6 +78,9 @@ with import ; { services.redis.enable = true; } + { + virtualisation.libvirtd.enable = true; + } ]; krebs.build.host = config.krebs.hosts.mors; -- cgit v1.2.3 From 3b80a5518c8f5b30de8f08d69c3dc01c2ad52d3d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Dec 2016 20:40:26 +0100 Subject: l 2 baseX: use pulse.nix --- lass/2configs/baseX.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index cdb6d34ab..b2a5ba089 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -7,11 +7,8 @@ in { ./xserver ./mpv.nix ./power-action.nix + ./pulse.nix ]; - hardware.pulseaudio = { - enable = true; - systemWide = true; - }; users.extraUsers.mainUser.extraGroups = [ "audio" "video" ]; -- cgit v1.2.3 From d10e33e49c72ef627c514b9e7d8bc2300fa8ec25 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Dec 2016 20:40:53 +0100 Subject: l 2 baseX: add terminals to pkgs --- lass/2configs/baseX.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index b2a5ba089..e98f382e3 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -50,6 +50,9 @@ in { yt-next youtube-tools + + rxvt_unicode + termite #window manager stuff #haskellPackages.xmobar #haskellPackages.yeganesh -- cgit v1.2.3 From 0c84c2bd4d2f3ef50601f136fd4c537ae7a97416 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 4 Dec 2016 20:41:09 +0100 Subject: l 2 privoxy-retiolum: open for dns0 --- lass/2configs/privoxy-retiolum.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/privoxy-retiolum.nix b/lass/2configs/privoxy-retiolum.nix index 9059bbac8..352a6d3d8 100644 --- a/lass/2configs/privoxy-retiolum.nix +++ b/lass/2configs/privoxy-retiolum.nix @@ -14,6 +14,7 @@ in { tables = { filter.INPUT.rules = [ { predicate = "-i retiolum -p tcp --dport 8118"; target = "ACCEPT"; } + { predicate = "-i dns0 -p tcp --dport 8118"; target = "ACCEPT"; } ]; }; }; -- cgit v1.2.3 From ddf04562b2a155f1599988d089c0ca6ed2def3a4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 7 Dec 2016 10:14:27 +0100 Subject: l 2 games: add vdoom{1,2} to pkgs --- lass/2configs/games.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix index 82b7eb2c9..245f3ca1e 100644 --- a/lass/2configs/games.nix +++ b/lass/2configs/games.nix @@ -2,12 +2,16 @@ let mainUser = config.users.extraUsers.mainUser; + vdoom = pkgs.writeDash "vdoom" '' + ${pkgs.zandronum}/bin/zandronum \ + -fov 120 \ + "$@" + ''; doom = pkgs.writeDash "doom" '' DOOM_DIR=''${DOOM_DIR:-~/doom/} - ${pkgs.zandronum}/bin/zandronum \ + ${vdoom} \ -file $DOOM_DIR/lib/brutalv20.pk3 \ -file $DOOM_DIR/lib/RebotStarcraftMarines.pk3 \ - -fov 120 \ "$@" ''; doom1 = pkgs.writeDashBin "doom1" '' @@ -18,12 +22,22 @@ let DOOM_DIR=''${DOOM_DIR:-~/doom/} ${doom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@" ''; + vdoom1 = pkgs.writeDashBin "vdoom1" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${vdoom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@" + ''; + vdoom2 = pkgs.writeDashBin "vdoom2" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${vdoom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@" + ''; in { environment.systemPackages = with pkgs; [ dwarf_fortress doom1 doom2 + vdoom1 + vdoom2 ]; users.extraUsers = { -- cgit v1.2.3 From 19c648e0f380fd8efc94428151a09469187b5019 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 7 Dec 2016 21:38:55 +0100 Subject: l 2 games: use zandronum-bin instead of zandronum --- lass/2configs/games.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix index 245f3ca1e..e7c7de938 100644 --- a/lass/2configs/games.nix +++ b/lass/2configs/games.nix @@ -3,7 +3,7 @@ let mainUser = config.users.extraUsers.mainUser; vdoom = pkgs.writeDash "vdoom" '' - ${pkgs.zandronum}/bin/zandronum \ + ${pkgs.zandronum-bin}/bin/zandronum \ -fov 120 \ "$@" ''; -- cgit v1.2.3 From 277d5e18dad6cb00e1bd55410542f508399f10bb Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 7 Dec 2016 21:40:12 +0100 Subject: l 2 nixpkgs: 6a9f087 -> 76f346d --- lass/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index 9b26f5be8..fd331e90d 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "6a9f087e37e392b9c3819196af33c529c12c4e48"; + ref = "76f346d61d537f5bbe4f365f9f659df7024602b4"; }; } -- cgit v1.2.3 From a64a9668aa0639e78a6c677c17718731d8f2418c Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 8 Dec 2016 21:45:36 +0100 Subject: l 2 exim-smarthost: add irgendwas@lassul.us --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 3bf78d9f4..d120dfcad 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -31,6 +31,7 @@ with import ; { from = "nebenan@lassul.us"; to = lass.mail; } { from = "feed@lassul.us"; to = lass.mail; } { from = "art@lassul.us"; to = lass.mail; } + { from = "irgendwas@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3