RIP current-date
This commit is contained in:
parent
8e3d27a949
commit
65977c6108
1
Makefile
1
Makefile
@ -42,7 +42,6 @@ endif
|
|||||||
-A "$$get" \
|
-A "$$get" \
|
||||||
-I stockholm="$$PWD" \
|
-I stockholm="$$PWD" \
|
||||||
'<stockholm>' \
|
'<stockholm>' \
|
||||||
--argstr current-date "$$(date -Is)" \
|
|
||||||
--argstr current-host-name "$$HOSTNAME" \
|
--argstr current-host-name "$$HOSTNAME" \
|
||||||
--argstr current-user-name "$$LOGNAME" \
|
--argstr current-user-name "$$LOGNAME" \
|
||||||
$${system+--argstr system "$$system"} \
|
$${system+--argstr system "$$system"} \
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ current-date ? abort "current-date not defined"
|
{ current-host-name ? abort "current-host-name not defined"
|
||||||
, current-host-name ? abort "current-host-name not defined"
|
|
||||||
, current-user-name ? builtins.getEnv "LOGNAME"
|
, current-user-name ? builtins.getEnv "LOGNAME"
|
||||||
, StrictHostKeyChecking ? "yes"
|
, StrictHostKeyChecking ? "yes"
|
||||||
}@args:
|
}@args:
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ current-date
|
{ current-host-name
|
||||||
, current-host-name
|
|
||||||
, current-user-name
|
, current-user-name
|
||||||
, lib
|
, lib
|
||||||
, stockholm
|
, stockholm
|
||||||
@ -21,7 +20,6 @@ let out = {
|
|||||||
config = get-config system;
|
config = get-config system;
|
||||||
in ''
|
in ''
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# ${current-date} ${current-user-name}@${current-host-name}
|
|
||||||
# krebs.deploy
|
# krebs.deploy
|
||||||
set -efu
|
set -efu
|
||||||
(${populate args})
|
(${populate args})
|
||||||
@ -39,7 +37,6 @@ let out = {
|
|||||||
config = get-config system;
|
config = get-config system;
|
||||||
in ''
|
in ''
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# ${current-date} ${current-user-name}@${current-host-name}
|
|
||||||
# krebs.infest
|
# krebs.infest
|
||||||
set -efu
|
set -efu
|
||||||
|
|
||||||
@ -64,7 +61,6 @@ let out = {
|
|||||||
config = get-config system;
|
config = get-config system;
|
||||||
in ''
|
in ''
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# ${current-date} ${current-user-name}@${current-host-name}
|
|
||||||
# krebs.init
|
# krebs.init
|
||||||
set -efu
|
set -efu
|
||||||
|
|
||||||
@ -100,7 +96,6 @@ let out = {
|
|||||||
}@args: let
|
}@args: let
|
||||||
in ''
|
in ''
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# ${current-date} ${current-user-name}@${current-host-name}
|
|
||||||
# krebs.nixos-install
|
# krebs.nixos-install
|
||||||
(${populate (args // { root = "/mnt"; })})
|
(${populate (args // { root = "/mnt"; })})
|
||||||
|
|
||||||
@ -196,7 +191,6 @@ let out = {
|
|||||||
nix-env \
|
nix-env \
|
||||||
--show-trace \
|
--show-trace \
|
||||||
-f '<stockholm>' \
|
-f '<stockholm>' \
|
||||||
--argstr current-date ${lib.shell.escape current-date} \
|
|
||||||
--argstr current-host-name ${lib.shell.escape current-host-name} \
|
--argstr current-host-name ${lib.shell.escape current-host-name} \
|
||||||
--argstr current-user-name ${lib.shell.escape current-user-name} \
|
--argstr current-user-name ${lib.shell.escape current-user-name} \
|
||||||
--profile ${lib.shell.escape config.krebs.build.profile} \
|
--profile ${lib.shell.escape config.krebs.build.profile} \
|
||||||
@ -216,7 +210,6 @@ let out = {
|
|||||||
}@args:
|
}@args:
|
||||||
let out = ''
|
let out = ''
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# ${current-date} ${current-user-name}@${current-host-name}
|
|
||||||
set -efu
|
set -efu
|
||||||
${lib.concatStringsSep "\n"
|
${lib.concatStringsSep "\n"
|
||||||
(lib.concatMap
|
(lib.concatMap
|
||||||
|
@ -86,7 +86,6 @@
|
|||||||
-I stockholm=. \
|
-I stockholm=. \
|
||||||
--show-trace \
|
--show-trace \
|
||||||
-I secrets=. '<stockholm>' \
|
-I secrets=. '<stockholm>' \
|
||||||
--argstr current-date lol \
|
|
||||||
--argstr current-user-name shared \
|
--argstr current-user-name shared \
|
||||||
--argstr current-host-name lol \
|
--argstr current-host-name lol \
|
||||||
--strict --json"])
|
--strict --json"])
|
||||||
@ -98,7 +97,6 @@
|
|||||||
-I stockholm=. \
|
-I stockholm=. \
|
||||||
-I secrets=. '<stockholm>' \
|
-I secrets=. '<stockholm>' \
|
||||||
--show-trace \
|
--show-trace \
|
||||||
--argstr current-date lol \
|
|
||||||
--argstr current-user-name shared \
|
--argstr current-user-name shared \
|
||||||
--argstr current-host-name lol \
|
--argstr current-host-name lol \
|
||||||
--strict --json"])
|
--strict --json"])
|
||||||
|
Loading…
Reference in New Issue
Block a user