From 685dd36289f1db0d4c430fb9af89b68310007820 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 9 Oct 2018 13:41:06 +0200
Subject: Reaktor: 0.6.1 -> 0.6.2

---
 krebs/5pkgs/simple/Reaktor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix
index b66e2b22c..3ef9ffb7d 100644
--- a/krebs/5pkgs/simple/Reaktor/default.nix
+++ b/krebs/5pkgs/simple/Reaktor/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonPackage rec {
   name = "Reaktor-${version}";
-  version = "0.6.1";
+  version = "0.6.2";
 
   doCheck = false;
 
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {
     owner = "krebs";
     repo = "Reaktor";
     rev = version;
-    sha256 = "0mw2zizv8p264zqqrnb5qyx7szldcza5ma190292a1qlasyg1b4m";
+    sha256 = "0h8pj0x9b5fnxddwrc0f63rxd3275v5phmjc0fv4kiwlzvbcxj6m";
   };
   meta = {
     homepage = http://krebsco.de/;
-- 
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(-)

(limited to 'krebs/5pkgs')

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

[cgit] Unable to lock slot /tmp/cgit/f7300000.lock: No such file or directory (2)