diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/python-modules/detect-secrets | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/detect-secrets')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix b/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix index 2e07f98d78dd..ef19b9a913b0 100644 --- a/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix @@ -4,6 +4,7 @@ , gibberish-detector , isPy27 , mock +, pkgs , pyahocorasick , pytestCheckHook , pyyaml @@ -21,7 +22,8 @@ buildPythonPackage rec { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dj0lqm9s8OKhM4OmNrmGVRc32/ZV0I9+5WcW2hvLwu0="; + sha256 = "sha256-dG2YaWXAMINxBGKNMlVfGTR9QHdnepiZmN+G88X4Wak="; + leaveDotGit = true; }; propagatedBuildInputs = [ @@ -36,6 +38,7 @@ buildPythonPackage rec { pytestCheckHook responses unidiff + pkgs.gitMinimal ]; preCheck = '' @@ -44,24 +47,15 @@ buildPythonPackage rec { disabledTests = [ # Tests are failing for various reasons. Needs to be adjusted with the next update - "test_baseline_filters_out_known_secrets" "test_basic" - "test_does_not_modify_slim_baseline" "test_handles_each_path_separately" "test_handles_multiple_directories" "test_load_and_output" "test_make_decisions" - "test_modifies_baseline" - "test_no_files_in_git_repo" - "test_outputs_baseline_if_none_supplied" + "test_restores_line_numbers" "test_saves_to_baseline" "test_scan_all_files" - "test_should_scan_all_files_in_directory_if_flag_is_provided" - "test_should_scan_specific_non_tracked_file" - "test_should_scan_tracked_files_in_directory" "test_start_halfway" - "test_works_from_different_directory" - "TestModifiesBaselineFromVersionChange" ]; pythonImportsCheck = [ "detect_secrets" ]; |