about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2017-11-12 20:40:59 +0100
committeraszlig <aszlig@nix.build>2017-11-12 20:40:59 +0100
commitb5954cf18c7933bde5d952821a8457b64da52d65 (patch)
tree9c21b93208ce2af517a634ca023d087b745dfb39 /machines
parent9fcd4d0350670b1b7c4edf9c57e5bced82f23134 (diff)
taalo-build: Rewrite as wrapper and move to pkgs
We no longer use the legacy SSH store protocol for taalo but the new
ssh-ng protocol, which makes the implementation of taalo-build a LOT
less clunky.

It also didn't make sense to have this as a NixOS module when we after
all just emit a static store path without any stuff depending on
configuration options.

The new implementation basically just wraps nix-build and nix-store -r
along with the right NIX_REMOTE variable.

With Nix 1.2 this can also be done with the new "nix build" command
using the --store option, but unfortunately "nix build" doesn't yet have
the same functionality as nix-build.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Profpatsch, @bendlas
Diffstat (limited to 'machines')
-rw-r--r--machines/profpatsch/katara.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index aafbcd6d..84408084 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -183,6 +183,7 @@ in {
       nixPkgs = [
         nix-repl                  # nix REPL
         nix-prefetch-scripts      # prefetch store paths from various destinations
+        vuizvui.taalo-build       # build derivation on taalo
       ];
       tmpPkgs = [
         # TODO needs user service
@@ -333,9 +334,6 @@ in {
     # TODO: base config?
     vuizvui.programs.fish.fasd.enable = true;
 
-    # build derivation on taalo
-    vuizvui.user.aszlig.programs.taalo-build.enable = true;
-
     vuizvui.user.profpatsch.programs.scanning = {
       enable = true;
       remoteScanners = ''