diff options
| author | Leo Famulari <leo@famulari.name> | 2017-02-02 10:52:24 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-02-02 10:52:24 -0500 |
| commit | e8c83d04e176f205b30b3d470f22ee5e1c686331 (patch) | |
| tree | 30a95626ea31414a6319b93f50eea1e69b87a619 /gnu/packages/libevent.scm | |
| parent | d9b4cbc2a168ca3d248c5abf1f1d14c1808e6a20 (diff) | |
| parent | de643f0c15677665acce73db9c28c5488e623633 (diff) | |
| download | guix-e8c83d04e176f205b30b3d470f22ee5e1c686331.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/libevent.scm')
| -rw-r--r-- | gnu/packages/libevent.scm | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index cb76915ef7..bef09f9538 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2016 David Thompson <davet@gnu.org> +;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,7 +34,7 @@ (define-public libevent (package (name "libevent") - (version "2.0.22") + (version "2.1.8") (source (origin (method url-fetch) (uri (string-append @@ -41,13 +42,16 @@ version "-stable/libevent-" version "-stable.tar.gz")) (sha256 (base32 - "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki")) - (patches (search-patches "libevent-dns-tests.patch")))) + "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n")) + (patches (search-patches "libevent-2.1-dns-tests.patch" + ;; XXX: Try removing this for > 2.1.8. + ;; https://github.com/libevent/libevent/issues/452 + "libevent-2.1-skip-failing-test.patch")))) (build-system gnu-build-system) (inputs - `(;; Dependencies used for the tests and for `event_rpcgen.py'. - ("which" ,which) - ("python" ,python-wrapper))) + `(("python" ,python-2))) ; for 'event_rpcgen.py' + (native-inputs + `(("which" ,which))) (home-page "http://libevent.org/") (synopsis "Event notification library") (description @@ -62,6 +66,24 @@ then add or remove events dynamically without having to change the event loop.") (license bsd-3))) +(define-public libevent-2.0 + (package + (inherit libevent) + (version "2.0.22") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/libevent/libevent/releases/download/release-" + version "-stable/libevent-" version "-stable.tar.gz")) + (sha256 + (base32 + "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki")) + (patches (search-patches + "libevent-dns-tests.patch" + "libevent-2.0-evdns-fix-remote-stack-overread.patch" + "libevent-2.0-evutil-fix-buffer-overflow.patch" + "libevent-2.0-evdns-fix-searching-empty-hostnames.patch")))))) + (define-public libev (package (name "libev") |