From 0866ba5e215f6043db4efdc9f59889ad4f926a4e Mon Sep 17 00:00:00 2001 From: whoomee Date: Sun, 27 Sep 2026 10:04:24 +0200 Subject: [PATCH 1/7] fribidi: 1.0.16 -> 1.0.17 --- pkgs/by-name/fr/fribidi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/fribidi/package.nix b/pkgs/by-name/fr/fribidi/package.nix index f8fd5f3171c9..5ba9a58fbfb0 100644 --- a/pkgs/by-name/fr/fribidi/package.nix +++ b/pkgs/by-name/fr/fribidi/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fribidi"; - version = "1.0.16"; + version = "1.0.17"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GxzeWyNdQEeekb4vDoijCeMhTIq0cOyKJ0TYKlqeoFw="; + sha256 = "sha256-aUnc3ifUHOutH9dB/K/DbVWhAg0thy1KbrORTKq7raI="; }; postPatch = '' From 3b39b2d0dab31bd72cb1d851df4c923a181fd6b5 Mon Sep 17 00:00:00 2001 From: whoomee Date: Sun, 27 Sep 2026 10:13:23 +0200 Subject: [PATCH 2/7] fribidi: add pango/libass in passthru.tests --- pkgs/by-name/fr/fribidi/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/fr/fribidi/package.nix b/pkgs/by-name/fr/fribidi/package.nix index 5ba9a58fbfb0..6d36dd5cb5f1 100644 --- a/pkgs/by-name/fr/fribidi/package.nix +++ b/pkgs/by-name/fr/fribidi/package.nix @@ -9,6 +9,10 @@ fixDarwinDylibNames, python3, testers, + + # for passthru.tests + pango, + libass, }: stdenv.mkDerivation (finalAttrs: { @@ -49,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + inherit pango libass; }; meta = { From 7b9d55b6272476983ccc9a0239edc8279c7d4a82 Mon Sep 17 00:00:00 2001 From: whoomee Date: Sun, 27 Sep 2026 10:13:41 +0200 Subject: [PATCH 3/7] fribidi: modernize --- pkgs/by-name/fr/fribidi/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/fr/fribidi/package.nix b/pkgs/by-name/fr/fribidi/package.nix index 6d36dd5cb5f1..ebf1a65970c7 100644 --- a/pkgs/by-name/fr/fribidi/package.nix +++ b/pkgs/by-name/fr/fribidi/package.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "fribidi"; version = "1.0.17"; + __structuredAttrs = true; + strictDeps = true; + outputs = [ "out" "dev" @@ -46,6 +49,13 @@ stdenv.mkDerivation (finalAttrs: { depsBuildBuild = [ buildPackages.stdenv.cc ]; + mesonFlags = lib.mapAttrsToList lib.mesonBool { + tests = finalAttrs.finalPackage.doCheck; + docs = true; + bin = true; + deprecated = true; + }; + doCheck = true; nativeCheckInputs = [ python3 ]; From 5c51fed8c5123fb774009b429b7c11e41f9de8ad Mon Sep 17 00:00:00 2001 From: whoomee Date: Sun, 27 Sep 2026 10:13:58 +0200 Subject: [PATCH 4/7] fribidi: add maintainer tmarkus --- pkgs/by-name/fr/fribidi/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fr/fribidi/package.nix b/pkgs/by-name/fr/fribidi/package.nix index ebf1a65970c7..2e751e25a0fa 100644 --- a/pkgs/by-name/fr/fribidi/package.nix +++ b/pkgs/by-name/fr/fribidi/package.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl21; platforms = lib.platforms.unix; pkgConfigModules = [ "fribidi" ]; + maintainers = with lib.maintainers; [ tmarkus ]; }; }) From b231de7d5563d412a8d61ba49ee1ea11d8375ee6 Mon Sep 17 00:00:00 2001 From: whoomee Date: Sun, 27 Sep 2026 10:14:14 +0200 Subject: [PATCH 5/7] fribidi: specify meta.changelog --- pkgs/by-name/fr/fribidi/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fr/fribidi/package.nix b/pkgs/by-name/fr/fribidi/package.nix index 2e751e25a0fa..5231148cdc5c 100644 --- a/pkgs/by-name/fr/fribidi/package.nix +++ b/pkgs/by-name/fr/fribidi/package.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/fribidi/fribidi"; + changelog = "https://github.com/fribidi/fribidi/releases/tag/v${finalAttrs.version}"; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; mainProgram = "fribidi"; license = lib.licenses.lgpl21; From a82a2223107ebc112d76c44b4897466a03ef9779 Mon Sep 17 00:00:00 2001 From: whoomee Date: Sun, 27 Sep 2026 10:38:09 +0200 Subject: [PATCH 6/7] fribidi: add comment about depsBuildBuild --- pkgs/by-name/fr/fribidi/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/fr/fribidi/package.nix b/pkgs/by-name/fr/fribidi/package.nix index 5231148cdc5c..e477ea043979 100644 --- a/pkgs/by-name/fr/fribidi/package.nix +++ b/pkgs/by-name/fr/fribidi/package.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + # necessary to compile helper which runs during build to generate tables + # see gen.tab/meson.build for details depsBuildBuild = [ buildPackages.stdenv.cc ]; mesonFlags = lib.mapAttrsToList lib.mesonBool { From 48ba5d38f2ae5b71ad7f53f68d5ee8aec40ac857 Mon Sep 17 00:00:00 2001 From: whoomee Date: Sun, 27 Sep 2026 10:57:02 +0200 Subject: [PATCH 7/7] fribidi: specify identifiers.cpeParts --- pkgs/by-name/fr/fribidi/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fr/fribidi/package.nix b/pkgs/by-name/fr/fribidi/package.nix index e477ea043979..fa1e16a936fd 100644 --- a/pkgs/by-name/fr/fribidi/package.nix +++ b/pkgs/by-name/fr/fribidi/package.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; pkgConfigModules = [ "fribidi" ]; maintainers = with lib.maintainers; [ tmarkus ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gnu" finalAttrs.version; }; })