diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix index 76ee7febfe7..b2a555bd263 100644 --- a/pkgs/development/libraries/pe-parse/default.nix +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "pe-parse"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pe-parse"; rev = "v${version}"; - sha256 = "1jvfjaiwddczjlx4xdhpbgwvvpycab7ix35lwp3wfy44hs6qpjqv"; + hash = "sha256-HwWlMRhpB/sa/JRyAZF7LZzkXCCyuxB+gtDAfHt7e6k="; }; nativeBuildInputs = [ cmake ]; doInstallCheck = true; installCheckPhase = '' - $out/bin/dump-pe ../test/assets/example.exe + $out/bin/dump-pe ../tests/assets/example.exe ''; meta = with lib; { diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index 9957eccd426..c342ee4d70d 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -1,28 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, pe-parse }: +{ stdenv, lib, fetchFromGitHub, cmake, gtest, openssl, pe-parse }: stdenv.mkDerivation rec { pname = "uthenticode"; - version = "1.0.4"; + version = "1.0.8"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; rev = "v${version}"; - sha256 = "16j91cki63zk4d7wzwvq8al98l8hmvcdil3vfp44ink4q4bfswkx"; + hash = "sha256-H4fAHZM+vYaUkXZE4f7r2bxw9dno7O+lYrqQ9/6YPWA="; }; - patches = [ - # adds USE_SYSTEM_GTEST cmake flag, the patch won't be necessary in next versions - (fetchpatch { - url = "https://github.com/trailofbits/uthenticode/commit/7a4c5499c8e5ea7bfae1c620e1f96c112866b1dd.patch"; - sha256 = "17637j5zwp71jmi803mv1z04arld3k3kmrm8nvrkpg08q5kizh28"; - }) - ]; - - cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_SYSTEM_GTEST=1" ]; + cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ pe-parse openssl gtest ]; + checkInputs = [ gtest ]; + buildInputs = [ pe-parse openssl ]; doCheck = true; checkPhase = "test/uthenticode_test";