From 9f37a4c4f7fff0246577d233a1497fc5a7ceb8d2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 21 Dec 2017 01:27:07 +0100
Subject: tv exim-*: add eximlog

---
 tv/2configs/exim-retiolum.nix  | 3 +++
 tv/2configs/exim-smarthost.nix | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'tv')

diff --git a/tv/2configs/exim-retiolum.nix b/tv/2configs/exim-retiolum.nix
index bf13a388..8b34b16c 100644
--- a/tv/2configs/exim-retiolum.nix
+++ b/tv/2configs/exim-retiolum.nix
@@ -3,6 +3,9 @@
 with import <stockholm/lib>;
 
 {
+  environment.systemPackages = [
+    pkgs.eximlog
+  ];
   krebs.exim-retiolum.enable = true;
   tv.iptables.input-retiolum-accept-tcp = singleton "smtp";
 }
diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index 079013c7..68fbcd15 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/2configs/exim-smarthost.nix
@@ -3,6 +3,9 @@
 with import <stockholm/lib>;
 
 {
+  environment.systemPackages = [
+    pkgs.eximlog
+  ];
   krebs.exim-smarthost = {
     enable = true;
     dkim = [
-- 
cgit v1.2.3


From 28085c8e6d37a0dd31d7627fa01d072723c4f46c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 22 Dec 2017 21:31:39 +0100
Subject: tv querel: add chromium with flash

---
 tv/1systems/querel/config.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tv')

diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index 05b4d913..07ec8e40 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -29,6 +29,7 @@ with import <stockholm/lib>;
   };
 
   environment.systemPackages = with pkgs; [
+    chromium
     firefoxWrapper
     gimp
     kate
@@ -65,6 +66,8 @@ with import <stockholm/lib>;
 
   networking.networkmanager.enable = true;
 
+  nixpkgs.config.chromium.enablePepperFlash = true;
+
   programs.ssh.startAgent = false;
 
   services.printing = {
-- 
cgit v1.2.3


From 04b711f516c978e84b334a82008d40dfaad1de1b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 27 Dec 2017 15:32:02 +0100
Subject: tv nixpkgs: d0f0657 -> 53e6d67

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

(limited to 'tv')

diff --git a/tv/source.nix b/tv/source.nix
index f3bda271..31308fc9 100644
--- a/tv/source.nix
+++ b/tv/source.nix
@@ -10,7 +10,7 @@ in
       nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix";
       nixpkgs.git = {
         # nixos-17.09
-        ref = mkDefault "d0f0657ca06cc8cb239cb94f430b53bcdf755887";
+        ref = mkDefault "53e6d671a9662922080635482b7e1c418d2cdc72";
         url = https://github.com/NixOS/nixpkgs;
       };
       secrets.file = getAttr builder {
-- 
cgit v1.2.3