Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'

Conflicts:
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix

1 files changed, 4 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/development/libraries/pe-parse/default.nix b/nixpkgs/pkgs/development/libraries/pe-parse/default.nix
index d9ccb4447b2f..7560f2297cfa 100644
--- a/nixpkgs/pkgs/development/libraries/pe-parse/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pe-parse/default.nix
@@ -1,23 +1,16 @@
-{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "pe-parse";
-  version = "2.0.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "pe-parse";
     rev = "v${version}";
-    hash = "sha256-HwWlMRhpB/sa/JRyAZF7LZzkXCCyuxB+gtDAfHt7e6k=";
+    hash = "sha256-XegSZWRoQg6NEWuTSFI1RMvN3GbpLDrZrloPU2XdK2M=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/trailofbits/pe-parse/commit/eecdb3d36eb44e306398a2e66e85490f9bdcc74c.patch";
-      hash = "sha256-pd6D/JMctiQqJxnJU9Nm/GDVf4/CaIGeXx1UfdcCupo=";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
 
   doInstallCheck = true;
@@ -28,6 +21,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A principled, lightweight parser for Windows portable executable files";
     homepage = "https://github.com/trailofbits/pe-parse";
+    changelog = "https://github.com/trailofbits/pe-parse/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ arturcygan ];
     mainProgram = "dump-pe";