From 89d9a6079cfd88b27295aeac3da355d44620548f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 17:52:17 -0700
Subject: [PATCH] libmicrohttpd: 0.9.41 -> 0.9.42
---
pkgs/development/libraries/libmicrohttpd/default.nix | 5 +++--
pkgs/top-level/all-packages.nix | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index c7892716c9d..d88b75440bc 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -17,11 +17,11 @@ let
in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "libmicrohttpd-0.9.41";
+ name = "libmicrohttpd-0.9.42";
src = fetchurl {
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
- sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p";
+ sha256 = "0nvxmm6z6wcq1vl6l92rids0i0va184y86bkc10dl0vh6rrj0d80";
};
nativeBuildInputs = [ pkgconfig ];
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
(mkWith true "threads" "posix")
(mkEnable true "doc" null)
(mkEnable false "examples" null)
+ (mkEnable true "poll" "auto")
(mkEnable true "epoll" "auto")
(mkEnable doCheck "curl" null)
(mkEnable hasSpdy "spdy" null)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05d773ade45..6c93d103f59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6919,8 +6919,9 @@ let
libmemcached = callPackage ../development/libraries/libmemcached { };
- libmicrohttpd = callPackage ../development/libraries/libmicrohttpd {
- openssl = null;
+ libmicrohttpd-full = callPackage ../development/libraries/libmicrohttpd { };
+
+ libmicrohttpd = libmicrohttpd-full.override {
gnutls = null;
};