From fb734eded558aad5a728eb1b1b350235a921d541 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 4 Feb 2016 03:07:47 +0100
Subject: stockholm: stockholm-path -> ./.

---
 default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 1637aa464..b2b57ea4c 100644
--- a/default.nix
+++ b/default.nix
@@ -17,8 +17,7 @@ let stockholm = {
     nlib = import <nixpkgs/lib>;
     klib = import (slib.kpath "4lib") { lib = nlib; };
     slib = rec {
-      stockholm-path = ./.;
-      nspath = ns: p: stockholm-path + "/${ns}/${p}";
+      nspath = ns: p: ./. + "/${ns}/${p}";
       kpath = nspath "krebs";
       upath = nspath current-user-name;
     };
-- 
cgit v1.2.3


From 8e3d27a9499bb70d5d033e4fd007aa53dea70b18 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 4 Feb 2016 04:35:39 +0100
Subject: stockholm: add slib.npath

---
 default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index b2b57ea4c..9dd18a235 100644
--- a/default.nix
+++ b/default.nix
@@ -14,12 +14,12 @@ let stockholm = {
   krebs = import ./krebs (args // { inherit lib stockholm; });
 
   lib = let
-    nlib = import <nixpkgs/lib>;
+    nlib = import (slib.npath "lib");
     klib = import (slib.kpath "4lib") { lib = nlib; };
     slib = rec {
-      nspath = ns: p: ./. + "/${ns}/${p}";
-      kpath = nspath "krebs";
-      upath = nspath current-user-name;
+      npath = p: <nixpkgs> + "/${p}";
+      kpath = p: ./. + "/krebs/${p}";
+      upath = p: ./. + "/${current-user-name}/${p}";
     };
     ulib = let p = slib.upath "4lib"; in
       nlib.optionalAttrs (klib.dir.has-default-nix p)
@@ -44,7 +44,7 @@ let stockholm = {
     in kpkgs // upkgs;
   };
 
-  eval = config: import <nixpkgs/nixos/lib/eval-config.nix> {
+  eval = config: import (lib.npath "nixos/lib/eval-config.nix") {
     specialArgs = {
       inherit lib;
     };
-- 
cgit v1.2.3


From 65977c6108d9517d58a6bd6ce8676c6a7b97615e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 4 Feb 2016 04:44:26 +0100
Subject: RIP current-date

---
 default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'default.nix')

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:
-- 
cgit v1.2.3


From 89d6f319d0909b127a603fd825e3a1143b14260b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 4 Feb 2016 04:47:58 +0100
Subject: stockholm: guess current-{host,user}-name harder

---
 default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 4a5e4ea2c..656a7f4b3 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,9 @@
-{ current-host-name ? abort "current-host-name not defined"
-, current-user-name ? builtins.getEnv "LOGNAME"
+{ current-host-name ?
+    let v = builtins.getEnv "HOSTNAME"; in
+    if v != "" then v else builtins.readFile /proc/sys/kernel/hostname
+, current-user-name ?
+    let v = builtins.getEnv "LOGNAME"; in
+    if v != "" then v else abort "undefined variable: LOGNAME"
 , StrictHostKeyChecking ? "yes"
 }@args:
 
-- 
cgit v1.2.3


From b857a48632128be0324c68be95bee16fb0f1b15f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 4 Feb 2016 05:40:26 +0100
Subject: krebs.build.populate: init and drop support for v1

---
 default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 656a7f4b3..278f1d14d 100644
--- a/default.nix
+++ b/default.nix
@@ -1,9 +1,15 @@
-{ current-host-name ?
+{ configuration ? import (nixpkgs-path + "/nixos/lib/from-env.nix") "NIXOS_CONFIG" <nixos-config>
+, system ? builtins.currentSystem
+, current-host-name ?
     let v = builtins.getEnv "HOSTNAME"; in
     if v != "" then v else builtins.readFile /proc/sys/kernel/hostname
 , current-user-name ?
     let v = builtins.getEnv "LOGNAME"; in
     if v != "" then v else abort "undefined variable: LOGNAME"
+, nixpkgs-path ?
+    if (builtins.tryEval <nixpkgs/krebs>).success
+      then <upstream-nixpkgs>
+      else <nixpkgs>
 , StrictHostKeyChecking ? "yes"
 }@args:
 
@@ -11,7 +17,8 @@ let stockholm = {
     inherit krebs;
     inherit users;
     inherit lib;
-    inherit pkgs;
+    inherit config options pkgs;
+    system = config.system.build.toplevel;
   };
 
   krebs = import ./krebs (args // { inherit lib stockholm; });
@@ -20,7 +27,7 @@ let stockholm = {
     nlib = import (slib.npath "lib");
     klib = import (slib.kpath "4lib") { lib = nlib; };
     slib = rec {
-      npath = p: <nixpkgs> + "/${p}";
+      npath = p: nixpkgs-path + "/${p}";
       kpath = p: ./. + "/krebs/${p}";
       upath = p: ./. + "/${current-user-name}/${p}";
     };
@@ -29,7 +36,7 @@ let stockholm = {
                          (import p { lib = nlib // klib; });
   in nlib // klib // slib // ulib // builtins;
 
-  inherit (eval {}) pkgs;
+  inherit (eval configuration) config options pkgs;
 
   base-module = { config, ... }: {
     imports = builtins.filter lib.dir.has-default-nix (lib.concatLists [
@@ -48,6 +55,7 @@ let stockholm = {
   };
 
   eval = config: import (lib.npath "nixos/lib/eval-config.nix") {
+    inherit system;
     specialArgs = {
       inherit lib;
     };
-- 
cgit v1.2.3