6 files changed, 22 insertions, 5 deletions
diff --git a/krebs/5pkgs/simple/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix
index fc371082..6989bb02 100644
--- a/krebs/5pkgs/simple/Reaktor/default.nix
+++ b/krebs/5pkgs/simple/Reaktor/default.nix
@@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec {
 
   propagatedBuildInputs = with pkgs;[
     python3Packages.docopt
-    python3Packages.requests2
+    python3Packages.requests
   ];
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-${version}.tar.gz";
diff --git a/krebs/5pkgs/simple/bepasty-client-cli/default.nix b/krebs/5pkgs/simple/bepasty-client-cli/default.nix
index c58e637b..7811ef5f 100644
--- a/krebs/5pkgs/simple/bepasty-client-cli/default.nix
+++ b/krebs/5pkgs/simple/bepasty-client-cli/default.nix
@@ -5,7 +5,7 @@ with pythonPackages; buildPythonPackage rec {
   propagatedBuildInputs = [
     python_magic
     click
-    requests2
+    requests
   ];
 
   src = fetchFromGitHub {
diff --git a/krebs/5pkgs/simple/cac-panel/default.nix b/krebs/5pkgs/simple/cac-panel/default.nix
index fd479953..57f58f4d 100644
--- a/krebs/5pkgs/simple/cac-panel/default.nix
+++ b/krebs/5pkgs/simple/cac-panel/default.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec {
 
   propagatedBuildInputs = with python3Packages; [
     docopt
-    requests2
+    requests
     beautifulsoup4
   ];
 }
diff --git a/krebs/5pkgs/simple/git-preview.nix b/krebs/5pkgs/simple/git-preview.nix
new file mode 100644
index 00000000..d6c9579a
--- /dev/null
+++ b/krebs/5pkgs/simple/git-preview.nix
@@ -0,0 +1,17 @@
+{ coreutils, git, writeDashBin }:
+
+writeDashBin "git-preview" ''
+  set -efu
+  head_commit=$(${git}/bin/git log -1 --format=%H)
+  merge_commit=$1; shift
+  merge_message='Merge for git-preview'
+  preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX)
+  preview_branch=$(${coreutils}/bin/basename "$preview_dir")
+  ${git}/bin/git worktree add -b "$preview_branch" "$preview_dir" >/dev/null
+  ${git}/bin/git -C "$preview_dir" checkout "$head_commit"
+  ${git}/bin/git -C "$preview_dir" merge -m "$merge_message" "$merge_commit"
+  ${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@" &
+  ${git}/bin/git branch -fd "$preview_branch"
+  ${coreutils}/bin/rm -fR "$preview_dir"
+  wait
+''
diff --git a/krebs/5pkgs/simple/treq/default.nix b/krebs/5pkgs/simple/treq/default.nix
index 20387b9c..7cb826a5 100644
--- a/krebs/5pkgs/simple/treq/default.nix
+++ b/krebs/5pkgs/simple/treq/default.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonPackage rec {
   propagatedBuildInputs = with pythonPackages; [
     twisted
     pyopenssl
-    requests2
+    requests
     service-identity
   ];
 }
diff --git a/krebs/5pkgs/simple/urlwatch/default.nix b/krebs/5pkgs/simple/urlwatch/default.nix
index 50955566..adaefbc4 100644
--- a/krebs/5pkgs/simple/urlwatch/default.nix
+++ b/krebs/5pkgs/simple/urlwatch/default.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec {
     minidb
     pycodestyle
     pyyaml
-    requests2
+    requests
   ];
 
   meta = {