From a10580c2b2454885fb4d8be4fb1910b9addee000 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 9 Mar 2016 22:52:51 +0100
Subject: s 2 base: bump nixpkgs

---
 shared/2configs/base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index 9f998b5..f6ec93a 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -18,7 +18,7 @@ with config.krebs.lib;
   krebs.build.source = {
     nixpkgs = mkDefault {
       url = https://github.com/NixOS/nixpkgs;
-      rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # for urlwatch-minidb
+      rev = "40c586b7ce2c559374df435f46d673baf711c543";
     };
     secrets =  mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}";
     stockholm = mkDefault "${getEnv "HOME"}/stockholm";
-- 
cgit v1.2.3


From 37ff2437476bf8752643f3735ed3f2b19dbddb40 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 10 Mar 2016 12:32:29 +0100
Subject: Makefile: ifndef HOSTNAME, def it

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 226c0f2..bd45440 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
 stockholm ?= .
 
+export HOSTNAME ?= $(shell cat /proc/sys/kernel/hostname)
+
 export STOCKHOLM_VERSION ?= $(shell \
 	version=git.$$(git describe --always --dirty); \
-	case $$version in (*-dirty) version=$$version@$$(hostname); esac; \
+	case $$version in (*-dirty) version=$$version@$$HOSTNAME; esac; \
 	date=$$(date +%y.%m); \
 	printf '%s' "$$date.$$version"; \
 )
-- 
cgit v1.2.3


From 5cabee62cdef212cf4088d934b92a3b14e947e02 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 10 Mar 2016 12:41:24 +0100
Subject: Makefile: define nixos-config using ?=

---
 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index bd45440..7252ca7 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,9 @@ export STOCKHOLM_VERSION ?= $(shell \
 	printf '%s' "$$date.$$version"; \
 )
 
-ifndef nixos-config
 $(if $(system),,$(error unbound variable: system))
-nixos-config = ./$(LOGNAME)/1systems/$(system).nix
-endif
+
+nixos-config ?= $(stockholm)/$(LOGNAME)/1systems/$(system).nix
 
 # target = [target_user@]target_host[:target_port][/target_path]
 ifdef target
-- 
cgit v1.2.3


From 864603aa04b9d2ad97e313d4d526fc9d050d5b88 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 15 Mar 2016 13:55:01 +0100
Subject: tv git: add newbot-js

---
 tv/2configs/git.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 7a42ca9..4c1fba5 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -30,6 +30,7 @@ let
     load-env = {};
     make-snapshot = {};
     much = {};
+    newsbot-js = {};
     nixpkgs = {};
     push = {};
     regfish = {};
-- 
cgit v1.2.3