nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-05 21:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

build-support/php: remove assertMsg usage

Browse Source
This commit is contained in:
Eman Resu
2026-05-26 14:12:38 -04:00
parent 9137068a86
commit 002d961471
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/build-support/php/builders/v1/build-composer-repository.nix
View File

@@ -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;

6
pkgs/build-support/php/builders/v2/build-composer-vendor.nix
View File

@@ -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}";