diff options
| author | tv <tv@krebsco.de> | 2016-02-04 04:44:26 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-02-04 04:46:36 +0100 |
| commit | 65977c6108d9517d58a6bd6ce8676c6a7b97615e (patch) | |
| tree | 7e6c1c1de7572f343b91ca814734a670b29ccf27 | |
| parent | 8e3d27a9499bb70d5d033e4fd007aa53dea70b18 (diff) | |
RIP current-date
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | default.nix | 3 | ||||
| -rw-r--r-- | krebs/default.nix | 9 | ||||
| -rw-r--r-- | shared/2configs/buildbot-standalone.nix | 2 |
4 files changed, 2 insertions, 13 deletions
@@ -42,7 +42,6 @@ endif -A "$$get" \ -I stockholm="$$PWD" \ '<stockholm>' \ - --argstr current-date "$$(date -Is)" \ --argstr current-host-name "$$HOSTNAME" \ --argstr current-user-name "$$LOGNAME" \ $${system+--argstr system "$$system"} \ diff --git a/default.nix b/default.nix index 9dd18a235..4a5e4ea2c 100644 --- a/default.nix +++ b/default.nix @@ -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" , StrictHostKeyChecking ? "yes" }@args: diff --git a/krebs/default.nix b/krebs/default.nix index df2d95483..e9ee71b34 100644 --- a/krebs/default.nix +++ b/krebs/default.nix @@ -1,5 +1,4 @@ -{ current-date -, current-host-name +{ current-host-name , current-user-name , lib , stockholm @@ -21,7 +20,6 @@ let out = { config = get-config system; in '' #! /bin/sh - # ${current-date} ${current-user-name}@${current-host-name} # krebs.deploy set -efu (${populate args}) @@ -39,7 +37,6 @@ let out = { config = get-config system; in '' #! /bin/sh - # ${current-date} ${current-user-name}@${current-host-name} # krebs.infest set -efu @@ -64,7 +61,6 @@ let out = { config = get-config system; in '' #! /bin/sh - # ${current-date} ${current-user-name}@${current-host-name} # krebs.init set -efu @@ -100,7 +96,6 @@ let out = { }@args: let in '' #! /bin/sh - # ${current-date} ${current-user-name}@${current-host-name} # krebs.nixos-install (${populate (args // { root = "/mnt"; })}) @@ -196,7 +191,6 @@ let out = { nix-env \ --show-trace \ -f '<stockholm>' \ - --argstr current-date ${lib.shell.escape current-date} \ --argstr current-host-name ${lib.shell.escape current-host-name} \ --argstr current-user-name ${lib.shell.escape current-user-name} \ --profile ${lib.shell.escape config.krebs.build.profile} \ @@ -216,7 +210,6 @@ let out = { }@args: let out = '' #! /bin/sh - # ${current-date} ${current-user-name}@${current-host-name} set -efu ${lib.concatStringsSep "\n" (lib.concatMap diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix index c614bd3c1..9982dd915 100644 --- a/shared/2configs/buildbot-standalone.nix +++ b/shared/2configs/buildbot-standalone.nix @@ -86,7 +86,6 @@ -I stockholm=. \ --show-trace \ -I secrets=. '<stockholm>' \ - --argstr current-date lol \ --argstr current-user-name shared \ --argstr current-host-name lol \ --strict --json"]) @@ -98,7 +97,6 @@ -I stockholm=. \ -I secrets=. '<stockholm>' \ --show-trace \ - --argstr current-date lol \ --argstr current-user-name shared \ --argstr current-host-name lol \ --strict --json"]) |