about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/libevent
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-06-18 18:30:18 +0000
committerAlyssa Ross <hi@alyssa.is>2019-06-18 18:30:18 +0000
commitef93931efff0323fd13c4270415b578c73b5ef35 (patch)
treee5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs/pkgs/development/libraries/libevent
parentc5571a126859eb658ffd7340cb580f7d91f12bb6 (diff)
parenta1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff)
downloadnixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip
Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libevent')
-rw-r--r--nixpkgs/pkgs/development/libraries/libevent/default.nix16
1 files changed, 2 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix
index 39d2c29b0127..2bc2bcb5b856 100644
--- a/nixpkgs/pkgs/development/libraries/libevent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix
@@ -6,25 +6,13 @@ assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
   name = "libevent-${version}";
-  version = "2.1.8";
+  version = "2.1.10";
 
   src = fetchurl {
     url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz";
-    sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n";
+    sha256 = "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78";
   };
 
-  #NOTE: Patches to support libressl-2.7. These are taken from libevent upstream, and can both be dropped with the next release.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/libevent/libevent/commit/22dd14945c25600de3cf8b91000c66703b551e4f.patch";
-      sha256 = "0fzcb241cp9mm7j6baw22blcglbc083ryigzyjaij8r530av10kd";
-    })
-    (fetchpatch {
-      url = "https://github.com/libevent/libevent/commit/28b8075400c70b2d2da2ce07e590c2ec6d11783d.patch";
-      sha256 = "0dkzlk44033xksg2iq5w90r3lnziwl1mgz291nzqq906zrya0sdb";
-    })
-  ];
-
   # libevent_openssl is moved into its own output, so that openssl isn't present
   # in the default closure.
   outputs = [ "out" "dev" ]