From 08c98a00ed75a49a34b1f0079954cd65ce2e1e1c Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 13 Oct 2016 21:20:33 +0200 Subject: Revert "k 3 buildbot: remove override (upstream fix)" This reverts commit 252bac92e877e0f14dbdd83a9c54ba02fe937069. because buildbot is broken again --- krebs/3modules/buildbot/master.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index 5dde50ea4..bd17c3765 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -3,8 +3,15 @@ with config.krebs.lib; let - buildbot = pkgs.buildbot; - buildbot-master-config = pkgs.writePython2 "buildbot-master.cfg" '' + # https://github.com/NixOS/nixpkgs/issues/14026 + nixpkgs-fix = import (pkgs.fetchgit { + url = https://github.com/nixos/nixpkgs; + rev = "e026b5c243ea39810826e68362718f5d703fb5d0"; + sha256 = "87e0724910a6df0371f883f99a8cf42e366fb4119f676f6f74ffb404beca2632"; + }) {}; + + buildbot = nixpkgs-fix.buildbot; + buildbot-master-config = pkgs.writeText "buildbot-master.cfg" '' # -*- python -*- from buildbot.plugins import * import re -- cgit v1.2.3 From b7cba0244358beb61aaab135cbe62c331ab6c900 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 13 Oct 2016 21:49:04 +0200 Subject: lib: don't define defaults that require config --- krebs/4lib/default.nix | 1 - krebs/4lib/types.nix | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) (limited to 'krebs') diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix index 3f224edd1..c40b9a868 100644 --- a/krebs/4lib/default.nix +++ b/krebs/4lib/default.nix @@ -19,7 +19,6 @@ let out = lib // rec { ])); types = import ./types.nix { - inherit config; lib = lib // { inherit genid optionalTrace; }; }; diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix index 02ca2b8db..8d6ace2e5 100644 --- a/krebs/4lib/types.nix +++ b/krebs/4lib/types.nix @@ -1,14 +1,9 @@ -{ config, lib, ... }: +{ lib, ... }: with builtins; with lib; with types; -let - # Inherited attributes are used in submodules that have their own `config`. - inherit (config.krebs) build users; -in - types // rec { host = submodule ({ config, ... }: { @@ -27,7 +22,6 @@ types // rec { owner = mkOption { type = user; - default = users.krebs; }; extraZones = mkOption { @@ -49,10 +43,6 @@ types // rec { ssh.pubkey = mkOption { type = nullOr ssh-pubkey; default = null; - apply = x: - optionalTrace (x == null && config.owner.name == build.user.name) - "The option `krebs.hosts.${config.name}.ssh.pubkey' is unused." - x; }; ssh.privkey = mkOption { type = nullOr ssh-privkey; @@ -187,7 +177,6 @@ types // rec { }; owner = mkOption { type = user; - default = users.root; }; group-name = mkOption { type = str; -- cgit v1.2.3 From 591b8793e31d9f698e4a55a563ab0ca227e4813d Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Oct 2016 12:33:15 +0200 Subject: k 3 rtorrent: with 16.09 tmux provides explicit .bin output --- krebs/3modules/rtorrent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix index d53482339..bc65739ea 100644 --- a/krebs/3modules/rtorrent.nix +++ b/krebs/3modules/rtorrent.nix @@ -223,7 +223,7 @@ let touch ${systemd-logfile} cp -f ${configFile} ${cfg.workDir}/.rtorrent.rc ''; - ExecStart = "${pkgs.tmux}/bin/tmux new-session -s rt -n rtorrent -d 'PATH=/bin:/usr/bin:${makeBinPath rutorrent-deps} ${cfg.package}/bin/rtorrent'"; + ExecStart = "${pkgs.tmux.bin}/bin/tmux new-session -s rt -n rtorrent -d 'PATH=/bin:/usr/bin:${makeBinPath rutorrent-deps} ${cfg.package}/bin/rtorrent'"; ## you can simply sudo -u rtorrent tmux a if privateTmp is set to false ## otherwise the tmux session is stored in some private folder in /tmp -- cgit v1.2.3 From 7ebecdc99cd9a1ad9ec7c047348e6ea6faf566c5 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Oct 2016 12:33:56 +0200 Subject: k 3 m: init sdev, use ssh secrets --- krebs/3modules/makefu/default.nix | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index f5190b6ba..e79e54aa6 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -374,8 +374,8 @@ with config.krebs.lib; ''; }; }; - #ssh.privkey.path = ; - #ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIujMZ3ZFxKpWeB/cjfKfYRr77+VRZk0Eik+92t03NoA root@servarch"; + ssh.privkey.path = ; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBGboU/P00yYiwYje53G0oqDFWmcSJ+hIpMsl4f/HH"; }; wbob = rec { cores = 1; @@ -512,6 +512,32 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB }; }; }; + sdev = rec { + cores = 1; + ssh.privkey.path = ; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILtm6ETzNgLcXNkrKs2VUEiGsTKBmOFpW2fazbzdUfOg sdev"; + nets = { + retiolum = { + ip4.addr = "10.243.83.237"; + ip6.addr = "42:af50:99cf:c185:f1a8:14d5:acb:8101"; + aliases = [ + "sdev.retiolum" + "sdev.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEA8BwHwQ4pLZpskVnQONJsmzRPll4ZKMjAC56sY5p+GfT9ZBMkVDn+ + LeH9wuTRiX/ehgtBiyu8w37cz62hz/71H+3mnWJlTm9bbBTc5N0y8l9b+YYeExW4 + XPm4bUbJWKNRG9tHQAns/OREYDsHLsY6UoyNFmB0wTDpgs7egDCoe7E2eT+pG428 + ysCDYlaZaigOyW+bj/HFLj8FSfpF5C/ug7NE/D7QocadsRUiLtVYrJsfmT+KHWf+ + f5rLWLvuFiz1SWf7wZ9sICF3RCaC9Qhz7zplgHbvwbOHtF+Z/6DxduRMkggZUsUD + nm+40Ex1XJTe+s4V4GKLgh/fDKBTS6JwewIDAQAB + -----END RSA PUBLIC KEY----- + ''; + }; + }; + }; + # non-stockholm -- cgit v1.2.3 From 564d5bc37d8533f0d1d3c31a87cd4a32c9451d20 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 19 Oct 2016 14:55:27 +0200 Subject: k 3 rtorrent: revert .bin --- krebs/3modules/rtorrent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix index bc65739ea..d53482339 100644 --- a/krebs/3modules/rtorrent.nix +++ b/krebs/3modules/rtorrent.nix @@ -223,7 +223,7 @@ let touch ${systemd-logfile} cp -f ${configFile} ${cfg.workDir}/.rtorrent.rc ''; - ExecStart = "${pkgs.tmux.bin}/bin/tmux new-session -s rt -n rtorrent -d 'PATH=/bin:/usr/bin:${makeBinPath rutorrent-deps} ${cfg.package}/bin/rtorrent'"; + ExecStart = "${pkgs.tmux}/bin/tmux new-session -s rt -n rtorrent -d 'PATH=/bin:/usr/bin:${makeBinPath rutorrent-deps} ${cfg.package}/bin/rtorrent'"; ## you can simply sudo -u rtorrent tmux a if privateTmp is set to false ## otherwise the tmux session is stored in some private folder in /tmp -- cgit v1.2.3 From 789dbe2b2657760a5cebcf320f6807847d4fba64 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 20 Oct 2016 08:49:22 +0200 Subject: m 5 go: buildNodePackage via callPackage --- krebs/5pkgs/go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/go/default.nix b/krebs/5pkgs/go/default.nix index fb8b65ea1..2871e5a99 100644 --- a/krebs/5pkgs/go/default.nix +++ b/krebs/5pkgs/go/default.nix @@ -1,9 +1,9 @@ -{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }: +{ stdenv, makeWrapper, callPackage, lib, buildEnv, fetchgit, nodePackages, nodejs }: with lib; let - np = nodePackages.override { + np = (callPackage ) { generated = ./packages.nix; self = np; }; @@ -18,7 +18,7 @@ let ignoreCollisions = true; }; -in nodePackages.buildNodePackage { +in np.buildNodePackage { name = "go"; src = fetchgit { -- cgit v1.2.3 From bb2d4b10d3a1a835711e6b4fa459f9b0aaba4a88 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 20 Oct 2016 09:13:15 +0200 Subject: m 5 newsbot-js: buildNodePackage via callPackage --- krebs/5pkgs/newsbot-js/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/newsbot-js/default.nix b/krebs/5pkgs/newsbot-js/default.nix index 9e4a51306..b52454ca4 100644 --- a/krebs/5pkgs/newsbot-js/default.nix +++ b/krebs/5pkgs/newsbot-js/default.nix @@ -1,9 +1,9 @@ -{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }: +{ stdenv, makeWrapper, callPackage, lib, buildEnv, fetchgit, nodePackages, nodejs }: with lib; let - np = nodePackages.override { + np = (callPackage ) { generated = ./packages.nix; self = np; }; @@ -21,7 +21,7 @@ let ignoreCollisions = true; }; -in nodePackages.buildNodePackage { +in np.buildNodePackage { name = "newsbot-js"; src = fetchgit { -- cgit v1.2.3 From 0f2a9778315c3126794c0f1ad63710d38e7a67f7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 20 Oct 2016 09:48:42 +0200 Subject: remove haskellPackges.megaparsec --- krebs/5pkgs/haskell-overrides/megaparsec.nix | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 krebs/5pkgs/haskell-overrides/megaparsec.nix (limited to 'krebs') diff --git a/krebs/5pkgs/haskell-overrides/megaparsec.nix b/krebs/5pkgs/haskell-overrides/megaparsec.nix deleted file mode 100644 index 5ade6006e..000000000 --- a/krebs/5pkgs/haskell-overrides/megaparsec.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ mkDerivation, base, bytestring, fetchzip, HUnit, mtl, QuickCheck -, stdenv, test-framework, test-framework-hunit -, test-framework-quickcheck2, text, transformers -}: -mkDerivation { - pname = "megaparsec"; - version = "4.1.0"; - src = fetchzip { - url = "https://hackage.haskell.org/package/megaparsec-4.1.0/megaparsec-4.1.0.tar.gz"; - sha256 = "1a1ka53a3r91lwnlvzaa8nyk1dxvfd1ij1i5x5vp83q2r9z9dcmi"; - }; - libraryHaskellDepends = [ base bytestring mtl text transformers ]; - testHaskellDepends = [ - base HUnit mtl QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 transformers - ]; - homepage = "https://github.com/mrkkrp/megaparsec"; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd3; -} -- cgit v1.2.3