From 14d54882216532cf1eb3c7eee262e6f854aca996 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sun, 1 May 2022 22:48:45 +0200 Subject: [PATCH 1/2] libwebsockets: drop unmaintained older versions Not used in nixpkgs anymore and not maintained upstream. --- .../libraries/libwebsockets/default.nix | 15 --------------- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 18 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index e0ee94faf0d4..8b059d58a72d 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -63,21 +63,6 @@ let }; in { - libwebsockets_3_1 = generic { - sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl"; - version = "3.1.0"; - }; - - libwebsockets_3_2 = generic { - version = "3.2.2"; - sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna"; - }; - - libwebsockets_4_2 = generic { - version = "4.2.1"; - sha256 = "sha256-C+WGfNF4tAgbp/7aRraBgjNOe4I5ihm+8CGelXzfxbU="; - }; - libwebsockets_4_3 = generic { version = "4.3.1"; sha256 = "sha256-lB3JHh058cQc5rycLnHk3JAOgtku0nRCixN5U6lPKq8="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfca44e2701d..4496ad4892e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8032,9 +8032,6 @@ with pkgs; librest_1_0 = callPackage ../development/libraries/librest/1.0.nix { }; inherit (callPackages ../development/libraries/libwebsockets { }) - libwebsockets_3_1 - libwebsockets_3_2 - libwebsockets_4_2 libwebsockets_4_3; libwebsockets = libwebsockets_4_3; From d9d51eec4f3eb119bdb397d96893a1f1a3cd3ac6 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 3 May 2022 22:09:51 +0200 Subject: [PATCH 2/2] libwebsockets: disable -Werror Doesn't make sense to enable that in nixpkgs. --- pkgs/development/libraries/libwebsockets/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 8b059d58a72d..82f5614458f0 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -32,13 +32,12 @@ let "-DLWS_WITH_PLUGINS=ON" "-DLWS_WITH_IPV6=ON" "-DLWS_WITH_SOCKS5=ON" + "-DDISABLE_WERROR=ON" # Required since v4.2.0 "-DLWS_BUILD_HASH=no_hash" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON" ++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON"; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; - postInstall = '' rm -r ${placeholder "out"}/share/libwebsockets-test-server '';