From b02b889255f7c4ee94d9eb89c720e91c4213817c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 16 Sep 2019 12:28:30 +0800 Subject: [PATCH] libwebsockets: re-init 3.1 --- .../libraries/libwebsockets/default.nix | 61 ++++++++++++------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index a297bf61f786..732a529c21f4 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -1,28 +1,47 @@ { fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }: -stdenv.mkDerivation rec { - pname = "libwebsockets"; - version = "3.2.0"; +let + generic = { version, sha256 }: stdenv.mkDerivation rec { + pname = "libwebsockets"; + inherit version; - src = fetchFromGitHub { - owner = "warmcat"; - repo = "libwebsockets"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "warmcat"; + repo = "libwebsockets"; + rev = "v${version}"; + inherit sha256; + }; + + buildInputs = [ openssl zlib libuv ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; + + meta = with stdenv.lib; { + description = "Light, portable C library for websockets"; + longDescription = '' + Libwebsockets is a lightweight pure C library built to + use minimal CPU and memory resources, and provide fast + throughput in both directions. + ''; + homepage = "https://libwebsockets.org/"; + license = licenses.lgpl21; + platforms = platforms.all; + }; + }; + +in +rec { + libwebsockets_3_1 = generic { + sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl"; + version = "3.1.0"; + }; + + libwebsockets_3_2 = generic { + version = "3.2.0"; sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8"; }; - buildInputs = [ cmake openssl zlib libuv ]; - cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; - - meta = { - description = "Light, portable C library for websockets"; - longDescription = '' - Libwebsockets is a lightweight pure C library built to - use minimal CPU and memory resources, and provide fast - throughput in both directions. - ''; - homepage = https://github.com/warmcat/libwebsockets; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.all; - }; + libwebsockets = libwebsockets_3_2; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca37025f7f31..a1323af6ef47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4581,7 +4581,10 @@ in librest = callPackage ../development/libraries/librest { }; - libwebsockets = callPackage ../development/libraries/libwebsockets { }; + inherit (callPackages ../development/libraries/libwebsockets { }) + libwebsockets_3_1 + libwebsockets_3_2 + libwebsockets; lidarr = callPackage ../servers/lidarr { };