From 16eac7a2684c6f924d3cf2b31b2c8c843d84bbfa Mon Sep 17 00:00:00 2001
From: Kolby Dauler <kolby.dauler@keeptruckin.com>
Date: Tue, 5 May 2020 17:10:57 -0700
Subject: [PATCH] trufflehog: 2.0.97 -> 2.1.11

---
 pkgs/tools/security/trufflehog/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index a02059703664..a992d527c26c 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -1,20 +1,25 @@
-{ lib, pythonPackages }:
+{ lib, python3Packages }:
 
 let
-  truffleHogRegexes = pythonPackages.buildPythonPackage rec {
+  truffleHogRegexes = python3Packages.buildPythonPackage rec {
     pname = "truffleHogRegexes";
+<<<<<<< HEAD
     version = "0.0.4";
     src = pythonPackages.fetchPypi {
+=======
+    version = "0.0.7";
+    src = python3Packages.fetchPypi {
+>>>>>>> 2c28266fcef... trufflehog: 2.0.97 -> 2.1.11
       inherit pname version;
       sha256 = "09vrscbb4h4w01gmamlzghxx6cvrqdscylrbdcnbjsd05xl7zh4z";
     };
   };
 in
-  pythonPackages.buildPythonApplication rec {
+  python3Packages.buildPythonApplication rec {
     pname = "truffleHog";
     version = "2.0.97";
 
-    src = pythonPackages.fetchPypi {
+    src = python3Packages.fetchPypi {
       inherit pname version;
       sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r";
     };
@@ -24,7 +29,7 @@ in
       substituteInPlace setup.py --replace "GitPython ==" "GitPython >= "
     '';
 
-    propagatedBuildInputs = [ pythonPackages.GitPython truffleHogRegexes ];
+    propagatedBuildInputs = [ python3Packages.GitPython truffleHogRegexes ];
 
     # Test cases run git clone and require network access
     doCheck = false;