summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-06-30 09:43:33 +0200
committertv <tv@krebsco.de>2017-06-30 09:43:33 +0200
commitc500d72ad855418b7d4d9d852d423a8a9440285c (patch)
treed727c035c260bdd434defcc920002aca74d9c09d
parenta2ea8740a40d5e9f5dc8e86d33e605a78963fc2f (diff)
shell: rename hook attribute to shell
-rw-r--r--shell.nix17
1 files changed, 6 insertions, 11 deletions
diff --git a/shell.nix b/shell.nix
index d6d215861..782b4fa31 100644
--- a/shell.nix
+++ b/shell.nix
@@ -121,32 +121,27 @@
utils.build = pkgs.writeDash "utils.build" ''
set -efu
- expr=$1
- shift
${pkgs.nix}/bin/nix-build \
-Q \
--no-out-link \
--show-trace \
- -E "with import <stockholm>; $expr" \
+ -E "with import <stockholm>; $1" \
-I "$target_path" \
- "$@" \
2>&1 |
${pkgs.whatsupnix}/bin/whatsupnix
'';
utils.deploy = pkgs.writeDash "utils.deploy" ''
set -efu
- PATH=/run/current-system/sw/bin nixos-rebuild \
- switch \
+ PATH=/run/current-system/sw/bin nixos-rebuild switch \
-Q \
--show-trace \
-I "$target_path" \
- "$@" \
2>&1 |
${pkgs.whatsupnix}/bin/whatsupnix
'';
- hook.get-version = pkgs.writeDash "hook.get-version" ''
+ shell.get-version = pkgs.writeDash "shell.get-version" ''
set -efu
version=git.$(${pkgs.git}/bin/git describe --always --dirty)
case $version in (*-dirty)
@@ -156,7 +151,7 @@
echo "$date.$version"
'';
- hook.pkg = pkgs.runCommand "hook.pkg" {} /* sh */ ''
+ shell.cmdspkg = pkgs.runCommand "shell.cmdspkg" {} /* sh */ ''
mkdir -p $out/bin
${lib.concatStrings (lib.mapAttrsToList (name: path: /* sh */ ''
ln -s ${path} $out/bin/${name}
@@ -168,7 +163,7 @@ in pkgs.stdenv.mkDerivation {
shellHook = /* sh */ ''
export NIX_PATH="stockholm=$PWD''${NIX_PATH+:$NIX_PATH}"
export PATH=${lib.makeBinPath [
- hook.pkg
+ shell.cmdspkg
]}
eval "$(declare -F | ${pkgs.gnused}/bin/sed s/declare/unset/)"
@@ -187,7 +182,7 @@ in pkgs.stdenv.mkDerivation {
}
export HOSTNAME="$(${pkgs.nettools}/bin/hostname)"
- export STOCKHOLM_VERSION="''${STOCKHOLM_VERSION-$(${hook.get-version})}"
+ export STOCKHOLM_VERSION="''${STOCKHOLM_VERSION-$(${shell.get-version})}"
PS1='\[\e[38;5;162m\]\w\[\e[0m\] '
'';