git.iko.soy/typeable/nixpkgs
on master help sign in
trufflehog: 2.0.97 -> 2.1.11
commit16eac7a2684c6f924d3cf2b31b2c8c843d84bbfa authorKolby Dauler <kolby.dauler@keeptruckin.com> dateTue 5 May 2020, 17:10 (7 years ago) parentec21df3
1 file changed+10−5
pkgs/tools/security/trufflehog/default.nix+10−5
pkgs/tools/security/trufflehog/default.nix+10−5
@@ -1,20 +1,25 @@
1−{ lib, pythonPackages }:
1+{ lib, python3Packages }:
22
33let
4− truffleHogRegexes = pythonPackages.buildPythonPackage rec {
4+ truffleHogRegexes = python3Packages.buildPythonPackage rec {
55 pname = "truffleHogRegexes";
6+<<<<<<< HEAD
67 version = "0.0.4";
78 src = pythonPackages.fetchPypi {
9+=======
10+ version = "0.0.7";
11+ src = python3Packages.fetchPypi {
12+>>>>>>> 2c28266fcef... trufflehog: 2.0.97 -> 2.1.11
813 inherit pname version;
914 sha256 = "09vrscbb4h4w01gmamlzghxx6cvrqdscylrbdcnbjsd05xl7zh4z";
1015 };
1116 };
1217in
13− pythonPackages.buildPythonApplication rec {
18+ python3Packages.buildPythonApplication rec {
1419 pname = "truffleHog";
1520 version = "2.0.97";
1621
17− src = pythonPackages.fetchPypi {
22+ src = python3Packages.fetchPypi {
1823 inherit pname version;
1924 sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r";
2025 };
@@ -24,7 +29,7 @@ in
2429 substituteInPlace setup.py --replace "GitPython ==" "GitPython >= "
2530 '';
2631
27− propagatedBuildInputs = [ pythonPackages.GitPython truffleHogRegexes ];
32+ propagatedBuildInputs = [ python3Packages.GitPython truffleHogRegexes ];
2833
2934 # Test cases run git clone and require network access
3035 doCheck = false;