JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "libmicrohttpd: 0.9.41 -> 0.9.42"

Browse Source 
This reverts commit 89d9a6079c.
This commit is contained in:
William A. Kennington III 2015-06-06 12:02:49 -07:00
parent d30d0c783d
commit 40b66f6131
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libmicrohttpd/default.nix
View File

@ -17,11 +17,11 @@ let
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libmicrohttpd-0.9.42"; name = "libmicrohttpd-0.9.41";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
sha256 = "0nvxmm6z6wcq1vl6l92rids0i0va184y86bkc10dl0vh6rrj0d80"; sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
(mkWith true "threads" "posix") (mkWith true "threads" "posix")
(mkEnable true "doc" null) (mkEnable true "doc" null)
(mkEnable false "examples" null) (mkEnable false "examples" null)
(mkEnable true "poll" "auto")
(mkEnable true "epoll" "auto") (mkEnable true "epoll" "auto")
(mkEnable doCheck "curl" null) (mkEnable doCheck "curl" null)
(mkEnable hasSpdy "spdy" null) (mkEnable hasSpdy "spdy" null)

5
pkgs/top-level/all-packages.nix
View File

@ -6927,9 +6927,8 @@ let
libmemcached = callPackage ../development/libraries/libmemcached { }; libmemcached = callPackage ../development/libraries/libmemcached { };
libmicrohttpd-full = callPackage ../development/libraries/libmicrohttpd { }; libmicrohttpd = callPackage ../development/libraries/libmicrohttpd {
openssl = null;
libmicrohttpd = libmicrohttpd-full.override {
gnutls = null; gnutls = null;
}; };