diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-29 12:00:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-29 12:00:57 +0000 |
| commit | 571f1df5e41d4aeab9f36c76ada75968c940b388 (patch) | |
| tree | 460309d4c12f08f3b4ff34dc5389f9dddc84c6c7 /pkgs/tools/security | |
| parent | 72e667204b6dc29bb53ae9a235d0f5a47b81c36b (diff) | |
| parent | 0891a9099b4f6013cbe201d81558f8ad528fa3ef (diff) | |
| download | nixpkgs-571f1df5e41d4aeab9f36c76ada75968c940b388.tar nixpkgs-571f1df5e41d4aeab9f36c76ada75968c940b388.tar.gz nixpkgs-571f1df5e41d4aeab9f36c76ada75968c940b388.tar.bz2 nixpkgs-571f1df5e41d4aeab9f36c76ada75968c940b388.tar.lz nixpkgs-571f1df5e41d4aeab9f36c76ada75968c940b388.tar.xz nixpkgs-571f1df5e41d4aeab9f36c76ada75968c940b388.tar.zst nixpkgs-571f1df5e41d4aeab9f36c76ada75968c940b388.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/honggfuzz/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 3885316271b..7bb89718bac 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -4,21 +4,20 @@ , makeWrapper , clang , llvm -# TODO: switch to latest versions when 2.6 release is out to include -# https://github.com/google/honggfuzz/commit/90fdf81006614664ef05e5e3c6f94d91610f11b2 -, libbfd_2_38, libopcodes_2_38 +, libbfd +, libopcodes , libunwind , libblocksruntime }: stdenv.mkDerivation rec { pname = "honggfuzz"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - sha256 = "sha256-TkyUKmiiSAfCnfQhSOUxuce6+dRyMmHy7vFK59jPIxM="; + sha256 = "sha256-/ra6g0qjjC8Lo8/n2XEbwnZ95yDHcGhYd5+TTvQ6FAc="; }; postPatch = '' @@ -30,7 +29,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvm ]; - propagatedBuildInputs = [ libbfd_2_38 libopcodes_2_38 libunwind libblocksruntime ]; + propagatedBuildInputs = [ libbfd libopcodes libunwind libblocksruntime ]; + + # Fortify causes build failures: 'str*' defined both normally and as 'alias' attribute + hardeningDisable = [ "fortify" ]; makeFlags = [ "PREFIX=$(out)" ]; |