git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #123137 from Mindavi/libwebsockets/4.2.0

Libwebsockets: add and use 4.2.0 as default

commit2bd1e823a96d1f21afae8b352ba70b655f2b8b4a authorGuillaume Girol <symphorien@users.noreply.github.com> dateWed 14 Jul 2021, 12:41 (5 years ago) parentc4bfe870891da9
2 files changed+7−11
pkgs/development/libraries/libwebsockets/default.nix+5−8 pkgs/top-level/all-packages.nix+2−3
pkgs/development/libraries/libwebsockets/default.nix+5−8
@@ -20,6 +20,8 @@ let
2020 "-DLWS_WITH_PLUGINS=ON"
2121 "-DLWS_WITH_IPV6=ON"
2222 "-DLWS_WITH_SOCKS5=ON"
23+ # Required since v4.2.0
24+ "-DLWS_BUILD_HASH=no_hash"
2325 ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON";
2426
2527 NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
@@ -52,13 +54,8 @@ rec {
5254 sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna";
5355 };
5456
55− libwebsockets_4_0 = generic {
56− version = "4.0.21";
57− sha256 = "01k05x4711ngin598jr9dag4ml3m7hi6pkgr4dsb02ryh1kc6146";
58− };
59−
60− libwebsockets_4_1 = generic {
61− version = "4.1.6";
62− sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg";
57+ libwebsockets_4_2 = generic {
58+ version = "4.2.0";
59+ sha256 = "glnLGXniero/5CW/1TBPZngdOM6gww8DnT5wiX66sW0=";
6360 };
6461}
pkgs/top-level/all-packages.nix+2−3
@@ -6790,9 +6790,8 @@ in
67906790 inherit (callPackages ../development/libraries/libwebsockets { })
67916791 libwebsockets_3_1
67926792 libwebsockets_3_2
6793− libwebsockets_4_0
6794− libwebsockets_4_1;
6795− libwebsockets = libwebsockets_3_2;
6793+ libwebsockets_4_2;
6794+ libwebsockets = libwebsockets_4_2;
67966795
67976796 licensee = callPackage ../tools/package-management/licensee { };
67986797