Merge pull request #81780 from volth/patch-387

libwebsockets: 3.2.0 -> 3.2.2; init as 4.0.0
This commit is contained in:
Peter Hoeg 2020-04-08 22:32:43 +08:00 committed by GitHub
commit 8cbe9f03f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View file

@ -17,6 +17,7 @@ let
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];
NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable";
meta = with stdenv.lib; {
description = "Light, portable C library for websockets";
@ -39,9 +40,12 @@ rec {
};
libwebsockets_3_2 = generic {
version = "3.2.0";
sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8";
version = "3.2.2";
sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna";
};
libwebsockets = libwebsockets_3_2;
libwebsockets_4_0 = generic {
version = "4.0.1";
sha256 = "1pf7km0w5q7dqlwcwqizdpfqgg10prfq8g2c093f5nghwsfv8mmf";
};
}

View file

@ -4929,7 +4929,8 @@ in
inherit (callPackages ../development/libraries/libwebsockets { })
libwebsockets_3_1
libwebsockets_3_2
libwebsockets;
libwebsockets_4_0;
libwebsockets = libwebsockets_3_2;
lidarr = callPackage ../servers/lidarr { };