Merge remote-tracking branch 'prism/master'

5 files changed, 43 insertions, 30 deletions

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
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 = <secrets/ssh_host_ed25519_key>;
-      #ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIujMZ3ZFxKpWeB/cjfKfYRr77+VRZk0Eik+92t03NoA root@servarch";
+      ssh.privkey.path = <secrets/ssh.id_ed25519>;
+      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 = <secrets/ssh_host_ed25519_key>;
+      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
 
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 <nixpkgs/pkgs/top-level/node-packages.nix>) {
     generated = ./packages.nix;
     self = np;
   };
@@ -18,7 +18,7 @@ let
     ignoreCollisions = true;
   };
 
-in nodePackages.buildNodePackage {
+in np.buildNodePackage {
   name = "go";
 
   src = fetchgit {
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;
-}
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 <nixpkgs/pkgs/top-level/node-packages.nix>) {
     generated = ./packages.nix;
     self = np;
   };
@@ -21,7 +21,7 @@ let
     ignoreCollisions = true;
   };
 
-in nodePackages.buildNodePackage {
+in np.buildNodePackage {
   name = "newsbot-js";
 
   src = fetchgit {