shell: use stockholm overlay

This commit is contained in:
tv 2017-06-30 04:40:45 +02:00
parent 7d983f09c8
commit 74522bba94

View File

@ -1,11 +1,7 @@
{ nixpkgs ? import <nixpkgs> {} }: let { nixpkgs ? import <nixpkgs> { overlays = [(import ./krebs/5pkgs)]; } }: let
inherit (nixpkgs) lib pkgs; inherit (nixpkgs) lib pkgs;
slib = import ./lib; slib = import ./lib;
spkgs = {
populate = pkgs.callPackage ./krebs/5pkgs/simple/populate {};
whatsupnix = pkgs.callPackage ./krebs/5pkgs/simple/whatsupnix {};
};
# usage: deploy system=SYSTEM [target=TARGET] # usage: deploy system=SYSTEM [target=TARGET]
cmds.deploy = pkgs.writeScript "cmds.deploy" /* sh */ '' cmds.deploy = pkgs.writeScript "cmds.deploy" /* sh */ ''
@ -102,7 +98,7 @@
-I nixos-config="$config" \ -I nixos-config="$config" \
-E 'with import <stockholm>; config.krebs.build.source' \ -E 'with import <stockholm>; config.krebs.build.source' \
| |
${spkgs.populate}/bin/populate \ ${pkgs.populate}/bin/populate \
"$target_user@$target_host:$target_port$target_path" \ "$target_user@$target_host:$target_port$target_path" \
>&2 >&2
''; '';
@ -141,7 +137,7 @@
-I "$target_path" \ -I "$target_path" \
"$@" \ "$@" \
2>&1 | 2>&1 |
${pkgs.coreutils}/bin/stdbuf -oL ${spkgs.whatsupnix}/bin/whatsupnix ${pkgs.coreutils}/bin/stdbuf -oL ${pkgs.whatsupnix}/bin/whatsupnix
''; '';
utils.deploy = pkgs.writeScript "utils.deploy" /* sh */ '' utils.deploy = pkgs.writeScript "utils.deploy" /* sh */ ''
@ -154,7 +150,7 @@
-I "$target_path" \ -I "$target_path" \
"$@" \ "$@" \
2>&1 | 2>&1 |
${pkgs.coreutils}/bin/stdbuf -oL ${spkgs.whatsupnix}/bin/whatsupnix ${pkgs.coreutils}/bin/stdbuf -oL ${pkgs.whatsupnix}/bin/whatsupnix
''; '';
hook.get-version = pkgs.writeScript "hook.get-version" /* sh */ '' hook.get-version = pkgs.writeScript "hook.get-version" /* sh */ ''