From 2df0ae942dde43b5d5479357b8af613da754a7b5 Mon Sep 17 00:00:00 2001 From: Matt Whiteley Date: Fri, 27 Oct 2023 18:08:13 +0000 Subject: [PATCH 1/2] wslay: init at 1.1.1 Grabbed from #170919 --- pkgs/by-name/ws/wslay/package.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/by-name/ws/wslay/package.nix diff --git a/pkgs/by-name/ws/wslay/package.nix b/pkgs/by-name/ws/wslay/package.nix new file mode 100644 index 000000000000..e9111bbb7a3e --- /dev/null +++ b/pkgs/by-name/ws/wslay/package.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, cmake, cunit }: + +stdenv.mkDerivation rec { + pname = "wslay"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "tatsuhiro-t"; + repo = "wslay"; + rev = "release-${version}"; + hash = "sha256-xKQGZO5hNzMg+JYKeqOBsu73YO+ucBEOcNhG8iSNYvA="; + }; + + checkInputs = [ cunit ]; + doCheck = true; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://tatsuhiro-t.github.io/wslay/"; + description = "The WebSocket library in C"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ pingiun ]; + platforms = platforms.unix; + }; +} From fd607d72ade44d86be5d4378674611ce457d3179 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 28 Oct 2023 18:16:59 +0200 Subject: [PATCH 2/2] swlay: actually enable tests --- pkgs/by-name/ws/wslay/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ws/wslay/package.nix b/pkgs/by-name/ws/wslay/package.nix index e9111bbb7a3e..ed6c0c9b6735 100644 --- a/pkgs/by-name/ws/wslay/package.nix +++ b/pkgs/by-name/ws/wslay/package.nix @@ -11,11 +11,18 @@ stdenv.mkDerivation rec { hash = "sha256-xKQGZO5hNzMg+JYKeqOBsu73YO+ucBEOcNhG8iSNYvA="; }; - checkInputs = [ cunit ]; - doCheck = true; + strictDeps = true; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + (lib.cmakeBool "WSLAY_TESTS" true) + ]; + + doCheck = true; + + checkInputs = [ cunit ]; + meta = with lib; { homepage = "https://tatsuhiro-t.github.io/wslay/"; description = "The WebSocket library in C";