summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-06-30 04:40:45 +0200
committertv <tv@krebsco.de>2017-06-30 04:40:45 +0200
commit74522bba94a3a62dcaed15c6ab9ff4e064a654ab (patch)
tree8453e5ff022b048832762b3c9ac673a2f3905f84
parent7d983f09c8433b623ffb49435807d3417a93776b (diff)
shell: use stockholm overlay
-rw-r--r--shell.nix12
1 files changed, 4 insertions, 8 deletions
diff --git a/shell.nix b/shell.nix
index e16f172e9..d8f3184db 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,11 +1,7 @@
-{ nixpkgs ? import <nixpkgs> {} }: let
+{ nixpkgs ? import <nixpkgs> { overlays = [(import ./krebs/5pkgs)]; } }: let
inherit (nixpkgs) lib pkgs;
slib = import ./lib;
- spkgs = {
- populate = pkgs.callPackage ./krebs/5pkgs/simple/populate {};
- whatsupnix = pkgs.callPackage ./krebs/5pkgs/simple/whatsupnix {};
- };
# usage: deploy system=SYSTEM [target=TARGET]
cmds.deploy = pkgs.writeScript "cmds.deploy" /* sh */ ''
@@ -102,7 +98,7 @@
-I nixos-config="$config" \
-E 'with import <stockholm>; config.krebs.build.source' \
|
- ${spkgs.populate}/bin/populate \
+ ${pkgs.populate}/bin/populate \
"$target_user@$target_host:$target_port$target_path" \
>&2
'';
@@ -141,7 +137,7 @@
-I "$target_path" \
"$@" \
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 */ ''
@@ -154,7 +150,7 @@
-I "$target_path" \
"$@" \
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 */ ''