From 002d961471e5991b8ba8dd5a54f92f97ed98f5d8 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Tue, 26 May 2026 14:12:38 -0400 Subject: [PATCH] build-support/php: remove assertMsg usage --- .../builders/v1/build-composer-repository.nix | 22 ++++++++----------- .../php/builders/v2/build-composer-vendor.nix | 6 ++--- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/build-support/php/builders/v1/build-composer-repository.nix b/pkgs/build-support/php/builders/v1/build-composer-repository.nix index 4108c930ea76..25cdc4459f7d 100644 --- a/pkgs/build-support/php/builders/v1/build-composer-repository.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-repository.nix @@ -24,24 +24,20 @@ let phpDrv = finalAttrs.php or php; composer = finalAttrs.composer or phpDrv.packages.composer-local-repo-plugin; in - assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); + assert previousAttrs ? src || throw "mkComposerRepository expects src argument."; + assert previousAttrs ? vendorHash || throw "mkComposerRepository expects vendorHash argument."; + assert previousAttrs ? version || throw "mkComposerRepository expects version argument."; + assert previousAttrs ? pname || throw "mkComposerRepository expects pname argument."; assert ( - lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument." - ); - assert (lib.assertMsg (previousAttrs ? version) "mkComposerRepository expects version argument."); - assert (lib.assertMsg (previousAttrs ? pname) "mkComposerRepository expects pname argument."); - assert ( - lib.assertMsg (previousAttrs ? composerNoDev) "mkComposerRepository expects composerNoDev argument." + previousAttrs ? composerNoDev || throw "mkComposerRepository expects composerNoDev argument." ); assert ( - lib.assertMsg ( - previousAttrs ? composerNoPlugins - ) "mkComposerRepository expects composerNoPlugins argument." + previousAttrs ? composerNoPlugins + || throw "mkComposerRepository expects composerNoPlugins argument." ); assert ( - lib.assertMsg ( - previousAttrs ? composerNoScripts - ) "mkComposerRepository expects composerNoScripts argument." + previousAttrs ? composerNoScripts + || throw "mkComposerRepository expects composerNoScripts argument." ); { composerNoDev = previousAttrs.composerNoDev or true; diff --git a/pkgs/build-support/php/builders/v2/build-composer-vendor.nix b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix index 58d147b2738d..41e2a37759a0 100644 --- a/pkgs/build-support/php/builders/v2/build-composer-vendor.nix +++ b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix @@ -25,9 +25,9 @@ let dontCheckForBrokenSymlinks ? true, ... }@args: - assert (lib.assertMsg (args ? pname) "mkComposerVendor expects pname argument."); - assert (lib.assertMsg (args ? version) "mkComposerVendor expects version argument."); - assert (lib.assertMsg (args ? src) "mkComposerVendor expects src argument."); + assert args ? pname || throw "mkComposerVendor expects pname argument."; + assert args ? version || throw "mkComposerVendor expects version argument."; + assert args ? src || throw "mkComposerVendor expects src argument."; { name = "${args.pname}-composer-vendor-${args.version}";