diff options
| author | lassulus <lass@blue.r> | 2018-10-30 19:54:22 +0100 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-10-30 19:54:22 +0100 |
| commit | f130c335de0f902b29bad5da60051d6fa2bdef4e (patch) | |
| tree | f000fa7d227e3bf2e59345cf0073a25a7dfbc657 | |
| parent | 228d4acd7b17afb245627f62f8943f418fb1dd8d (diff) | |
| parent | 212bc39249f9792cbedf2e9a6b3fed90c52c63e7 (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | krebs/5pkgs/simple/git-preview/default.nix | 6 | ||||
| m--------- | submodules/nix-writers | 0 | ||||
| -rw-r--r-- | tv/2configs/hw/x220.nix | 3 |
3 files changed, 6 insertions, 3 deletions
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" diff --git a/submodules/nix-writers b/submodules/nix-writers -Subproject 0660cc1a1169e799bda356c6fadb245a9634581 +Subproject fc8a3802a0777a5f43a9a2fe0f5848ecaeb555a 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 |