From 67969d72e137a65adba775c6219eb85ae72ccc77 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 28 Feb 2018 14:47:12 +0100
Subject: os-release: use <stockholm-version>

---
 krebs/3modules/os-release.nix            | 6 +++++-
 krebs/5pkgs/simple/stockholm/default.nix | 2 --
 krebs/source.nix                         | 6 ++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/os-release.nix b/krebs/3modules/os-release.nix
index 0779feed..8f71a357 100644
--- a/krebs/3modules/os-release.nix
+++ b/krebs/3modules/os-release.nix
@@ -5,7 +5,11 @@ let
   nixos-version = "${nixos-version-id} (${config.system.nixosCodeName})";
   nixos-pretty-name = "NixOS ${nixos-version}";
 
-  stockholm-version-id = maybeEnv "STOCKHOLM_VERSION" "unknown";
+  stockholm-version-id = let
+    eval = tryEval (removeSuffix "\n" (readFile <stockholm-version>));
+  in
+    if eval.success then eval.value else "unknown";
+
   stockholm-version = "${stockholm-version-id}";
   stockholm-pretty-name = "stockholm ${stockholm-version}";
 
diff --git a/krebs/5pkgs/simple/stockholm/default.nix b/krebs/5pkgs/simple/stockholm/default.nix
index 53c1ca5b..4d15e7ac 100644
--- a/krebs/5pkgs/simple/stockholm/default.nix
+++ b/krebs/5pkgs/simple/stockholm/default.nix
@@ -216,7 +216,6 @@
   init.env = pkgs.writeText "init.env" /* sh */ ''
 
     export HOSTNAME="$(${pkgs.nettools}/bin/hostname)"
-    export STOCKHOLM_VERSION="''${STOCKHOLM_VERSION-$(${cmds.get-version})}"
 
     export quiet
     export system
@@ -251,7 +250,6 @@
             "$target_user@$target_host" -p "$target_port" \
             cd "$target_path/stockholm" \; \
             NIX_PATH=$(${pkgs.quote}/bin/quote "$target_path") \
-            STOCKHOLM_VERSION=$(${pkgs.quote}/bin/quote "$STOCKHOLM_VERSION") \
             nix-shell --run "$(${pkgs.quote}/bin/quote "
               ${lib.concatStringsSep " " (lib.mapAttrsToList
                 (name: opt: /* sh */
diff --git a/krebs/source.nix b/krebs/source.nix
index 73ebf135..45507c8c 100644
--- a/krebs/source.nix
+++ b/krebs/source.nix
@@ -4,6 +4,11 @@ host@{ name, secure ? false, override ? {} }: let
               then "buildbot"
               else "krebs";
   _file = <stockholm> + "/krebs/1systems/${name}/source.nix";
+  pkgs = import <nixpkgs> {
+    overlays = map import [
+      <stockholm/krebs/5pkgs>
+    ];
+  };
 in
   evalSource (toString _file) [
     {
@@ -16,6 +21,7 @@ in
         };
       };
       stockholm.file = toString <stockholm>;
+      stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
         ref = "c831224528cd6bfd49bfc2c18b9c5d9015651077"; # nixos-17.09 @ 2018-02-15
-- 
cgit v1.2.3