From 390375cd8a0c745eb6b4df93f3f6f3e5f2985c90 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Tue, 20 Mar 2018 15:17:36 +0100
Subject: j: dirty merge again

---
 jeschli/source.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jeschli/source.nix')

diff --git a/jeschli/source.nix b/jeschli/source.nix
index 382dd61bc..d5cc32a9f 100644
--- a/jeschli/source.nix
+++ b/jeschli/source.nix
@@ -10,7 +10,7 @@ in
       nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
       nixpkgs.git = {
         url = https://github.com/nixos/nixpkgs;
-        ref = "0653b73";
+        ref = "395fe7f";
       };
       secrets.file = getAttr builder {
         buildbot = toString <stockholm/jeschli/2configs/tests/dummy-secrets>;
-- 
cgit v1.2.3


From 4851f6b43ff2eebecf5f1dc6a808225ee1af0f08 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Sat, 24 Mar 2018 12:08:14 +0100
Subject: j nixpkgs: follow krebs

---
 jeschli/source.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'jeschli/source.nix')

diff --git a/jeschli/source.nix b/jeschli/source.nix
index 91ff5514f..29cf9d818 100644
--- a/jeschli/source.nix
+++ b/jeschli/source.nix
@@ -13,10 +13,7 @@ in
   evalSource (toString _file) [
     {
       nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
-      nixpkgs.git = {
-        url = https://github.com/nixos/nixpkgs;
-        ref = "395fe7f";
-      };
+      nixpkgs = (import <stockholm/krebs/source.nix> host).nixpkgs;
       secrets.file = getAttr builder {
         buildbot = toString <stockholm/jeschli/2configs/tests/dummy-secrets>;
         jeschli = "${getEnv "HOME"}/secrets/${name}";
-- 
cgit v1.2.3