Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
65c2680f24
8
Makefile
8
Makefile
|
@ -102,13 +102,7 @@ ifneq ($(ssh),)
|
||||||
populate: populate-flags += --ssh=$(ssh)
|
populate: populate-flags += --ssh=$(ssh)
|
||||||
endif
|
endif
|
||||||
populate:
|
populate:
|
||||||
nix-instantiate \
|
nix-shell --run 'get-source $(LOGNAME)/1systems/$(system)/source.nix' \
|
||||||
--eval \
|
|
||||||
--json \
|
|
||||||
--readonly-mode \
|
|
||||||
--show-trace \
|
|
||||||
--strict \
|
|
||||||
$(LOGNAME)/1systems/$(system)/source.nix | \
|
|
||||||
populate $(populate-target) $(populate-flags)
|
populate $(populate-target) $(populate-flags)
|
||||||
|
|
||||||
# usage: make pkgs.populate
|
# usage: make pkgs.populate
|
||||||
|
|
|
@ -262,7 +262,12 @@ with import <stockholm/lib>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
writeJSON = name: value: pkgs.writeText name (toJSON value);
|
writeJSON = name: value: pkgs.runCommand name {
|
||||||
|
json = toJSON value;
|
||||||
|
passAsFile = [ "json" ];
|
||||||
|
} /* sh */ ''
|
||||||
|
${pkgs.jq}/bin/jq . "$jsonPath" > "$out"
|
||||||
|
'';
|
||||||
|
|
||||||
writeNixFromCabal =
|
writeNixFromCabal =
|
||||||
trace (toString [
|
trace (toString [
|
||||||
|
|
|
@ -10,6 +10,12 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
sanitize = x: getAttr (typeOf x) {
|
||||||
|
set = mapAttrs
|
||||||
|
(const sanitize)
|
||||||
|
(filterAttrs (name: value: name != "_module" && value != null) x);
|
||||||
|
string = x;
|
||||||
|
};
|
||||||
in
|
in
|
||||||
# This function's return value can be used as pkgs.populate input.
|
# This function's return value can be used as pkgs.populate input.
|
||||||
_file: source: (eval _file source).config.source
|
_file: source: sanitize (eval _file source).config.source
|
||||||
|
|
122
shell.nix
122
shell.nix
|
@ -2,6 +2,10 @@ let
|
||||||
lib = import ./lib;
|
lib = import ./lib;
|
||||||
pkgs = import <nixpkgs> { overlays = [(import ./krebs/5pkgs)]; };
|
pkgs = import <nixpkgs> { overlays = [(import ./krebs/5pkgs)]; };
|
||||||
|
|
||||||
|
#
|
||||||
|
# high level commands
|
||||||
|
#
|
||||||
|
|
||||||
# usage: deploy [--user=USER] --system=SYSTEM [--target=TARGET]
|
# usage: deploy [--user=USER] --system=SYSTEM [--target=TARGET]
|
||||||
cmds.deploy = pkgs.writeDash "cmds.deploy" ''
|
cmds.deploy = pkgs.writeDash "cmds.deploy" ''
|
||||||
set -efu
|
set -efu
|
||||||
|
@ -29,6 +33,69 @@ let
|
||||||
exec ${utils.build} config.system.build.toplevel
|
exec ${utils.build} config.system.build.toplevel
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
#
|
||||||
|
# low level commands
|
||||||
|
#
|
||||||
|
|
||||||
|
# usage: get-source SOURCE_FILE
|
||||||
|
cmds.get-source = pkgs.writeDash "cmds.get-source" ''
|
||||||
|
set -efu
|
||||||
|
exec ${pkgs.nix}/bin/nix-instantiate \
|
||||||
|
--eval \
|
||||||
|
--json \
|
||||||
|
--readonly-mode \
|
||||||
|
--show-trace \
|
||||||
|
--strict \
|
||||||
|
"$1"
|
||||||
|
'';
|
||||||
|
|
||||||
|
# usage: parse-target [--default=TARGET] TARGET
|
||||||
|
# TARGET = [USER@]HOST[:PORT][/PATH]
|
||||||
|
cmds.parse-target = pkgs.writeDash "cmds.parse-target" ''
|
||||||
|
set -efu
|
||||||
|
args=$(${pkgs.utillinux}/bin/getopt -n "$0" -s sh \
|
||||||
|
-o d: \
|
||||||
|
-l default: \
|
||||||
|
-- "$@")
|
||||||
|
if \test $? != 0; then exit 1; fi
|
||||||
|
eval set -- "$args"
|
||||||
|
default_target=
|
||||||
|
while :; do case $1 in
|
||||||
|
-d|--default) default_target=$2; shift 2;;
|
||||||
|
--) shift; break;;
|
||||||
|
esac; done
|
||||||
|
target=$1; shift
|
||||||
|
for arg; do echo "$0: bad argument: $arg" >&2; done
|
||||||
|
if \test $# != 0; then exit 2; fi
|
||||||
|
exec ${pkgs.jq}/bin/jq \
|
||||||
|
-enr \
|
||||||
|
--arg default_target "$default_target" \
|
||||||
|
--arg target "$target" \
|
||||||
|
-f ${pkgs.writeText "cmds.parse-target.jq" ''
|
||||||
|
def parse: match("^(?:([^@]+)@)?([^:/]+)?(?::([0-9]+))?(/.*)?$") | {
|
||||||
|
user: .captures[0].string,
|
||||||
|
host: .captures[1].string,
|
||||||
|
port: .captures[2].string,
|
||||||
|
path: .captures[3].string,
|
||||||
|
};
|
||||||
|
def sanitize: with_entries(select(.value != null));
|
||||||
|
($default_target | parse) + ($target | parse | sanitize) |
|
||||||
|
. + { local: (.user == env.LOGNAME and .host == env.HOSTNAME) }
|
||||||
|
''}
|
||||||
|
'';
|
||||||
|
|
||||||
|
# usage: quote [ARGS...]
|
||||||
|
cmds.quote = pkgs.writeDash "cmds.quote" ''
|
||||||
|
set -efu
|
||||||
|
prefix=
|
||||||
|
for x; do
|
||||||
|
y=$(${pkgs.jq}/bin/jq -nr --arg x "$x" '$x | @sh "\(.)"')
|
||||||
|
echo -n "$prefix$y"
|
||||||
|
prefix=' '
|
||||||
|
done
|
||||||
|
echo
|
||||||
|
'';
|
||||||
|
|
||||||
init.args = pkgs.writeText "init.args" /* sh */ ''
|
init.args = pkgs.writeText "init.args" /* sh */ ''
|
||||||
args=$(${pkgs.utillinux}/bin/getopt -n "$command" -s sh \
|
args=$(${pkgs.utillinux}/bin/getopt -n "$command" -s sh \
|
||||||
-o s:t:u: \
|
-o s:t:u: \
|
||||||
|
@ -54,7 +121,9 @@ let
|
||||||
export target
|
export target
|
||||||
export user
|
export user
|
||||||
|
|
||||||
export target_object="$(${init.env.parsetarget} $target)"
|
default_target=root@$system:22/var/src
|
||||||
|
|
||||||
|
export target_object="$(parse-target "$target" -d "$default_target")"
|
||||||
export target_user="$(echo $target_object | ${pkgs.jq}/bin/jq -r .user)"
|
export target_user="$(echo $target_object | ${pkgs.jq}/bin/jq -r .user)"
|
||||||
export target_host="$(echo $target_object | ${pkgs.jq}/bin/jq -r .host)"
|
export target_host="$(echo $target_object | ${pkgs.jq}/bin/jq -r .host)"
|
||||||
export target_port="$(echo $target_object | ${pkgs.jq}/bin/jq -r .port)"
|
export target_port="$(echo $target_object | ${pkgs.jq}/bin/jq -r .port)"
|
||||||
|
@ -68,35 +137,9 @@ let
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
'' // {
|
'' // {
|
||||||
parsetarget = pkgs.writeDash "init.env.parsetarget" ''
|
|
||||||
set -efu
|
|
||||||
exec ${pkgs.jq}/bin/jq \
|
|
||||||
-enr \
|
|
||||||
--arg target "$1" \
|
|
||||||
-f ${init.env.parsetarget.jq}
|
|
||||||
'' // {
|
|
||||||
jq = pkgs.writeText "init.env.parsetarget.jq" ''
|
|
||||||
def when(c; f): if c then f else . end;
|
|
||||||
def capturesDef(i; v): .captures[i].string | when(. == null; v);
|
|
||||||
$target | match("^(?:([^@]+)@)?([^:/]+)?(?::([0-9]+))?(/.*)?$") | {
|
|
||||||
user: capturesDef(0; "root"),
|
|
||||||
host: capturesDef(1; env.system),
|
|
||||||
port: capturesDef(2; "22"),
|
|
||||||
path: capturesDef(3; "/var/src"),
|
|
||||||
} | . + {
|
|
||||||
local: (.user == env.LOGNAME and .host == env.HOSTNAME),
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
populate = pkgs.writeDash "init.env.populate" ''
|
populate = pkgs.writeDash "init.env.populate" ''
|
||||||
set -efu
|
set -efu
|
||||||
_source=$(${pkgs.nix}/bin/nix-instantiate \
|
_source=$(get-source "$source")
|
||||||
--eval \
|
|
||||||
--json \
|
|
||||||
--readonly-mode \
|
|
||||||
--show-trace \
|
|
||||||
--strict \
|
|
||||||
"$source")
|
|
||||||
echo $_source |
|
echo $_source |
|
||||||
${pkgs.populate}/bin/populate \
|
${pkgs.populate}/bin/populate \
|
||||||
"$target_user@$target_host:$target_port$target_path" \
|
"$target_user@$target_host:$target_port$target_path" \
|
||||||
|
@ -105,21 +148,17 @@ let
|
||||||
'';
|
'';
|
||||||
proxy = pkgs.writeDash "init.env.proxy" ''
|
proxy = pkgs.writeDash "init.env.proxy" ''
|
||||||
set -efu
|
set -efu
|
||||||
q() {
|
|
||||||
${pkgs.jq}/bin/jq -nr --arg x "$*" '$x | @sh "\(.)"'
|
|
||||||
}
|
|
||||||
exec ${pkgs.openssh}/bin/ssh \
|
exec ${pkgs.openssh}/bin/ssh \
|
||||||
"$target_user@$target_host" -p "$target_port" \
|
"$target_user@$target_host" -p "$target_port" \
|
||||||
cd "$target_path/stockholm" \; \
|
cd "$target_path/stockholm" \; \
|
||||||
NIX_PATH=$(q "$target_path") \
|
NIX_PATH=$(quote "$target_path") \
|
||||||
STOCKHOLM_VERSION=$STOCKHOLM_VERSION \
|
STOCKHOLM_VERSION=$(quote "$STOCKHOLM_VERSION") \
|
||||||
nix-shell \
|
nix-shell --run "$(quote "
|
||||||
--run $(q \
|
system=$(quote "$system") \
|
||||||
system=$system \
|
target=$(quote "$target") \
|
||||||
target=$target \
|
using_proxy=true \
|
||||||
using_proxy=true \
|
$(quote "$@")
|
||||||
"$*"
|
")"
|
||||||
)
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -162,7 +201,8 @@ let
|
||||||
in pkgs.stdenv.mkDerivation {
|
in pkgs.stdenv.mkDerivation {
|
||||||
name = "stockholm";
|
name = "stockholm";
|
||||||
shellHook = /* sh */ ''
|
shellHook = /* sh */ ''
|
||||||
export NIX_PATH="stockholm=$PWD''${NIX_PATH+:$NIX_PATH}"
|
export NIX_PATH=stockholm=$PWD:nixpkgs=${toString <nixpkgs>}
|
||||||
|
export NIX_REMOTE=daemon
|
||||||
export PATH=${lib.makeBinPath [
|
export PATH=${lib.makeBinPath [
|
||||||
shell.cmdspkg
|
shell.cmdspkg
|
||||||
]}
|
]}
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
{ config, ... }:
|
|
||||||
|
|
||||||
with import <stockholm/lib>;
|
|
||||||
|
|
||||||
{
|
|
||||||
krebs.build.host = config.krebs.hosts.caxi;
|
|
||||||
|
|
||||||
imports = [
|
|
||||||
<stockholm/tv>
|
|
||||||
<stockholm/tv/2configs/hw/CAC-Developer-1.nix>
|
|
||||||
<stockholm/tv/2configs/fs/CAC-CentOS-7-64bit.nix>
|
|
||||||
<stockholm/tv/2configs/retiolum.nix>
|
|
||||||
];
|
|
||||||
|
|
||||||
networking = let
|
|
||||||
inherit (config.krebs.build.host.nets.internet) ip4;
|
|
||||||
in {
|
|
||||||
interfaces.enp2s1.ip4 = singleton {
|
|
||||||
address = ip4.addr;
|
|
||||||
prefixLength = fromJSON (head (match ".*/([0-9]+)" ip4.prefix));
|
|
||||||
};
|
|
||||||
defaultGateway = head (match "([^/]*)\.0/[0-9]+" ip4.prefix) + ".1";
|
|
||||||
nameservers = ["8.8.8.8"];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,3 +0,0 @@
|
||||||
import <stockholm/tv/source.nix> {
|
|
||||||
name = "caxi";
|
|
||||||
}
|
|
|
@ -230,6 +230,7 @@ let {
|
||||||
''write\(Ba\|Da\)sh[^ \t\r\n]*[ \t\r\n]*"[^"]*"''
|
''write\(Ba\|Da\)sh[^ \t\r\n]*[ \t\r\n]*"[^"]*"''
|
||||||
''[a-z]*Phase[ \t\r\n]*=''
|
''[a-z]*Phase[ \t\r\n]*=''
|
||||||
];
|
];
|
||||||
|
yaml = {};
|
||||||
vim.extraStart =
|
vim.extraStart =
|
||||||
''write[^ \t\r\n]*[ \t\r\n]*"\(\([^"]*\.\)\?vimrc\|[^"]*\.vim\)"'';
|
''write[^ \t\r\n]*[ \t\r\n]*"\(\([^"]*\.\)\?vimrc\|[^"]*\.vim\)"'';
|
||||||
xdefaults = {};
|
xdefaults = {};
|
||||||
|
|
|
@ -1,22 +1,18 @@
|
||||||
with import <stockholm/lib>;
|
with import <stockholm/lib>;
|
||||||
self: super: let
|
|
||||||
|
|
||||||
# This callPackage will try to detect obsolete overrides.
|
self: super:
|
||||||
callPackage = path: args: let
|
|
||||||
override = super.callPackage path args;
|
|
||||||
upstream = optionalAttrs (override ? "name")
|
|
||||||
(super.${(parseDrvName override.name).name} or {});
|
|
||||||
in if upstream ? "name" &&
|
|
||||||
override ? "name" &&
|
|
||||||
compareVersions upstream.name override.name != -1
|
|
||||||
then
|
|
||||||
trace
|
|
||||||
"Upstream `${upstream.name}' gets overridden by `${override.name}'."
|
|
||||||
override
|
|
||||||
else override;
|
|
||||||
|
|
||||||
in {
|
# Import files and subdirectories like they are overlays.
|
||||||
|
foldl' mergeAttrs {}
|
||||||
|
(map
|
||||||
|
(name: import (./. + "/${name}") self super)
|
||||||
|
(filter
|
||||||
|
(name: name != "default.nix" && !hasPrefix "." name)
|
||||||
|
(attrNames (readDir ./.))))
|
||||||
|
|
||||||
|
//
|
||||||
|
|
||||||
|
{
|
||||||
# TODO use XDG_RUNTIME_DIR?
|
# TODO use XDG_RUNTIME_DIR?
|
||||||
cr = self.writeDashBin "cr" ''
|
cr = self.writeDashBin "cr" ''
|
||||||
set -efu
|
set -efu
|
||||||
|
@ -42,9 +38,4 @@ in {
|
||||||
sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
|
sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
|
||||||
}) {};
|
}) {};
|
||||||
in nixpkgs-1509.wvdial;
|
in nixpkgs-1509.wvdial;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// mapAttrs (_: flip callPackage {})
|
|
||||||
(filterAttrs (_: dir: pathExists (dir + "/default.nix"))
|
|
||||||
(subdirsOf ./.))
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user