From 8dac2c361f6060656d1a47e453ad1257a05e680d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 13 Sep 2023 04:20:00 +0000 Subject: [PATCH 1/3] llhttp: use finalAttrs pattern --- pkgs/development/libraries/llhttp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/llhttp/default.nix b/pkgs/development/libraries/llhttp/default.nix index 11bc220aeeaf..c8b5ca89fa2e 100644 --- a/pkgs/development/libraries/llhttp/default.nix +++ b/pkgs/development/libraries/llhttp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "llhttp"; version = "9.1.0"; src = fetchFromGitHub { owner = "nodejs"; repo = "llhttp"; - rev = "release/v${version}"; + rev = "release/v${finalAttrs.version}"; hash = "sha256-DWRo9mVpmty/Ec+pKqPTZqwOlYJD+SmddwEui7P/694="; }; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Port of http_parser to llparse"; homepage = "https://llhttp.org/"; - changelog = "https://github.com/nodejs/llhttp/releases/tag/${src.rev}"; + changelog = "https://github.com/nodejs/llhttp/releases/tag/release/v${finalAttrs.version}"; license = licenses.mit; maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -} +}) From 9bb89d58c0515c7fdbde9e99651f0961c586b67d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 13 Sep 2023 04:20:00 +0000 Subject: [PATCH 2/3] llhttp: add pkg-config tester --- pkgs/development/libraries/llhttp/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/llhttp/default.nix b/pkgs/development/libraries/llhttp/default.nix index c8b5ca89fa2e..39f06104033e 100644 --- a/pkgs/development/libraries/llhttp/default.nix +++ b/pkgs/development/libraries/llhttp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, testers }: stdenv.mkDerivation (finalAttrs: { pname = "llhttp"; @@ -19,11 +19,16 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_STATIC_LIBS=ON" ]; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "Port of http_parser to llparse"; homepage = "https://llhttp.org/"; changelog = "https://github.com/nodejs/llhttp/releases/tag/release/v${finalAttrs.version}"; license = licenses.mit; + pkgConfigModules = [ "libllhttp" ]; maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; From 79de0c0200be08bcfac634c8f86bb37d76f31d1e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 13 Sep 2023 04:20:00 +0000 Subject: [PATCH 3/3] llhttp: 9.1.0 -> 9.1.2 Diff: https://github.com/nodejs/llhttp/compare/release/v9.1.0...release/v9.1.2 Changelog: https://github.com/nodejs/llhttp/releases/tag/release/v9.1.2 --- pkgs/development/libraries/llhttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/llhttp/default.nix b/pkgs/development/libraries/llhttp/default.nix index 39f06104033e..8aac286c80ac 100644 --- a/pkgs/development/libraries/llhttp/default.nix +++ b/pkgs/development/libraries/llhttp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "llhttp"; - version = "9.1.0"; + version = "9.1.2"; src = fetchFromGitHub { owner = "nodejs"; repo = "llhttp"; rev = "release/v${finalAttrs.version}"; - hash = "sha256-DWRo9mVpmty/Ec+pKqPTZqwOlYJD+SmddwEui7P/694="; + hash = "sha256-kW6u9ETZJcJBh150chfE3SEwFpT7evZ0cqz8caM7fbQ="; }; nativeBuildInputs = [