From aeec6cbdb18ea8b5df94778483da1320c2a60c3c Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 15 May 2021 18:50:55 +0200 Subject: [PATCH 1/3] libwebsockets: add 4.2.0 --- pkgs/development/libraries/libwebsockets/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index c62aa77c61a9..c4703aeb6325 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -20,6 +20,8 @@ let "-DLWS_WITH_PLUGINS=ON" "-DLWS_WITH_IPV6=ON" "-DLWS_WITH_SOCKS5=ON" + # Required since v4.2.0 + "-DLWS_BUILD_HASH=no_hash" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; @@ -61,4 +63,9 @@ rec { version = "4.1.6"; sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg"; }; + + libwebsockets_4_2 = generic { + version = "4.2.0"; + sha256 = "glnLGXniero/5CW/1TBPZngdOM6gww8DnT5wiX66sW0="; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 177e25ea3c99..2a8309fbe87b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6502,7 +6502,8 @@ in libwebsockets_3_1 libwebsockets_3_2 libwebsockets_4_0 - libwebsockets_4_1; + libwebsockets_4_1 + libwebsockets_4_2; libwebsockets = libwebsockets_3_2; licensee = callPackage ../tools/package-management/licensee { }; From 7d0eb78bee718f96a13ab6520b985a3d0165343b Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 15 May 2021 18:52:29 +0200 Subject: [PATCH 2/3] libwebsockets: 3.2.2 -> 4.2.0 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a8309fbe87b..66481c5e0379 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6504,7 +6504,7 @@ in libwebsockets_4_0 libwebsockets_4_1 libwebsockets_4_2; - libwebsockets = libwebsockets_3_2; + libwebsockets = libwebsockets_4_2; licensee = callPackage ../tools/package-management/licensee { }; From 0891da9bf52c7da1c56b63be036e822ec2135cbc Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 15 May 2021 20:34:01 +0200 Subject: [PATCH 3/3] libwebsockets: remove older 4.x packages --- pkgs/development/libraries/libwebsockets/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index c4703aeb6325..7d8355112db6 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -54,16 +54,6 @@ rec { sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna"; }; - libwebsockets_4_0 = generic { - version = "4.0.21"; - sha256 = "01k05x4711ngin598jr9dag4ml3m7hi6pkgr4dsb02ryh1kc6146"; - }; - - libwebsockets_4_1 = generic { - version = "4.1.6"; - sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg"; - }; - libwebsockets_4_2 = generic { version = "4.2.0"; sha256 = "glnLGXniero/5CW/1TBPZngdOM6gww8DnT5wiX66sW0="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66481c5e0379..ca15eef8dfbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6501,8 +6501,6 @@ in inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets_4_0 - libwebsockets_4_1 libwebsockets_4_2; libwebsockets = libwebsockets_4_2;