Merge remote-tracking branch 'lass/master'

2 files changed, 24 insertions, 1 deletions

diff --git a/krebs/5pkgs/simple/generate-secrets/default.nix b/krebs/5pkgs/simple/generate-secrets/default.nix
index f9a7450f7..a3c9f67c5 100644
--- a/krebs/5pkgs/simple/generate-secrets/default.nix
+++ b/krebs/5pkgs/simple/generate-secrets/default.nix
@@ -23,7 +23,6 @@ pkgs.writers.writeDashBin "generate-secrets" ''
 
   cat <<EOF
     $HOSTNAME = {
-      cores = 1;
       owner = config.krebs.users.krebs;
       nets = {
         retiolum = {
diff --git a/krebs/5pkgs/simple/git-assembler.nix b/krebs/5pkgs/simple/git-assembler.nix
new file mode 100644
index 000000000..095dddf0f
--- /dev/null
+++ b/krebs/5pkgs/simple/git-assembler.nix
@@ -0,0 +1,24 @@
+{ pkgs, stdenv }:
+
+stdenv.mkDerivation rec {
+  pname = "git-assembler";
+  version = "1.3";
+
+  src = pkgs.fetchFromGitLab {
+    owner = "wavexx";
+    repo = "git-assembler";
+    rev = "v${version}";
+    hash = "sha256-A+ygt6Fxiu6EkVoQU5L1rhxu2e1HU0nbqJFzLzXzHBo=";
+  };
+
+  buildInputs = [
+    pkgs.python3
+  ];
+
+  buildPhase = ":";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp git-assembler $out/bin
+  '';
+}