Merge remote-tracking branch 'ni/master'

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"

submodules/nix-writers

@@ -1 +1 @@
-Subproject commit 0660cc1a1169e799bda356c6fadb245a96345816
+Subproject commit fc8a3802a0777a5f43a9a2fe0f5848ecaeb555a1

tv/2configs/hw/x220.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-
+{ config, pkgs, ... }:
 {
   imports = [
     ../smartd.nix