From 7fb4039efd227b00944954f9679f71e735ac4f42 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 27 Feb 2017 01:11:03 +0100 Subject: [PATCH] update nix expression --- shell.nix | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/shell.nix b/shell.nix index e5d3ff0..9e5b60e 100644 --- a/shell.nix +++ b/shell.nix @@ -5,44 +5,23 @@ with pkgs.lib; let modes = { - shell = "exec zsh"; + shell = "exec fish"; test = "npm test"; - run = "exec bin/hubot"; - runTg = '' - telegram-cli \ - -dWE \ - -Z $HUBOT_TG_SCRIPT \ - -P $HUBOT_TG_PORT > /dev/null 2>&1 & - bin/hubot -a tg - pkill -9 telegram-wo-key; exit - ''; -}; - -telegram = pkgs.telegram-cli.override { - python = pkgs.python3; + run = "exec bin/hubot -a matrix"; }; in pkgs.stdenv.mkDerivation rec { name = "asjon-dev"; source = "."; - buildInputs = node ++ external; - node = with pkgs.nodePackages; [ - pkgs.nodejs - mocha - coffee-script - ]; - external = with pkgs; [ - zsh - telegram - graphicsmagick + node = with pkgs; [ + nodejs nodePackages.coffee-script + openssh graphicsmagick ]; shellHook = environment + getAttr mode modes; environment = '' #set env variables here - export HUBOT_TG_SCRIPT=node_modules/hubot-tg/hubot.py - export HUBOT_TG_PORT=1123 - export ADMIN_ROOM=user#123456 + export AUTO_KILL_ON_UPDATE=1 ''; }