From 960e66201e35768e4439e59c8fe78b1976b914c4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 23 Oct 2018 18:27:45 +0200
Subject: tv x220: add config argument

---
 tv/2configs/hw/x220.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index e91fd82c8..38a89cfc3 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-
+{ config, pkgs, ... }:
 {
   imports = [
     ../smartd.nix
-- 
cgit v1.2.3


From 2751c1c3adf1d3140ae9b63bc399f998bb45cd1b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 23 Oct 2018 19:26:37 +0200
Subject: git-preview: add GIT_PREVIEW_MERGE_STRATEGY

---
 krebs/5pkgs/simple/git-preview/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/krebs/5pkgs/simple/git-preview/default.nix b/krebs/5pkgs/simple/git-preview/default.nix
index 77826f34b..da1525072 100644
--- a/krebs/5pkgs/simple/git-preview/default.nix
+++ b/krebs/5pkgs/simple/git-preview/default.nix
@@ -9,7 +9,11 @@ writeDashBin "git-preview" ''
   preview_name=$(${coreutils}/bin/basename "$preview_dir")
   ${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null
   ${git}/bin/git -C "$preview_dir" checkout -q "$head_commit"
-  ${git}/bin/git -C "$preview_dir" merge -qm "$merge_message" "$merge_commit"
+  ${git}/bin/git -C "$preview_dir" merge \
+      ''${GIT_PREVIEW_MERGE_STRATEGY+-s "$GIT_PREVIEW_MERGE_STRATEGY"} \
+      -m "$merge_message" \
+      -q \
+      "$merge_commit"
   ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@"
   ${coreutils}/bin/rm -fR "$preview_dir"
   ${coreutils}/bin/rm -R .git/worktrees/"$preview_name"
-- 
cgit v1.2.3


From 34e1f09bf5e233bee78ee63166d2a1d9944a51f9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 27 Oct 2018 14:50:28 +0200
Subject: nix-writers: 3.0.0 -> 3.2.0

---
 submodules/nix-writers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/nix-writers b/submodules/nix-writers
index c27a9416e..fc8a3802a 160000
--- a/submodules/nix-writers
+++ b/submodules/nix-writers
@@ -1 +1 @@
-Subproject commit c27a9416e8ee04d708b11b48f8cf1a055c0cc079
+Subproject commit fc8a3802a0777a5f43a9a2fe0f5848ecaeb555a1
-- 
cgit v1.2.3