about summary refs log tree commit diff
path: root/modules/user/aszlig/profiles/workstation
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 /modules/user/aszlig/profiles/workstation
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 'modules/user/aszlig/profiles/workstation')
-rw-r--r--modules/user/aszlig/profiles/workstation/default.nix2
-rw-r--r--modules/user/aszlig/profiles/workstation/packages.nix1
2 files changed, 1 insertions, 2 deletions
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index 45eacb8a..dce7575c 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -111,8 +111,6 @@ in {
     vuizvui.programs.gnupg.agent.sshSupport = true;
     vuizvui.programs.gnupg.agent.scdaemon.enable = true;
 
-    vuizvui.user.aszlig.programs.taalo-build.enable = true;
-
     services = {
       openssh = {
         enable = true;
diff --git a/modules/user/aszlig/profiles/workstation/packages.nix b/modules/user/aszlig/profiles/workstation/packages.nix
index 277e9f0c..d5d76b2b 100644
--- a/modules/user/aszlig/profiles/workstation/packages.nix
+++ b/modules/user/aszlig/profiles/workstation/packages.nix
@@ -67,6 +67,7 @@ pkgs: with pkgs; [
   stdmanpages
   strace
   surfraw
+  vuizvui.taalo-build
   telnet
   unzip
   valgrind