talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

build-support/php: drop unused moreutils dependency (#425760)

Browse Source
This commit is contained in:
Philip Taron 2025-07-16 08:28:59 -07:00 committed by GitHub
commit ad3d096295
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/build-support/php/builders/v1/hooks/default.nix
View File

@ -3,7 +3,6 @@
makeSetupHook,
jq,
writeShellApplication,
moreutils,
cacert,
buildPackages,
}:
@ -18,9 +17,8 @@ in
{
composerRepositoryHook = makeSetupHook {
name = "composer-repository-hook.sh";
propagatedBuildInputs = [
propagatedNativeBuildInputs = [
jq
moreutils
cacert
];
substitutions = {
@ -30,9 +28,8 @@ in
composerInstallHook = makeSetupHook {
name = "composer-install-hook.sh";
propagatedBuildInputs = [
propagatedNativeBuildInputs = [
jq
moreutils
cacert
];
substitutions = {
@ -45,9 +42,8 @@ in
composerWithPluginVendorHook = makeSetupHook {
name = "composer-with-plugin-vendor-hook.sh";
propagatedBuildInputs = [
propagatedNativeBuildInputs = [
jq
moreutils
cacert
];
substitutions = {

7
pkgs/build-support/php/builders/v2/hooks/default.nix
View File

@ -3,7 +3,6 @@
makeSetupHook,
jq,
writeShellApplication,
moreutils,
cacert,
buildPackages,
}:
@ -18,9 +17,8 @@ in
{
composerVendorHook = makeSetupHook {
name = "composer-vendor-hook.sh";
propagatedBuildInputs = [
propagatedNativeBuildInputs = [
jq
moreutils
cacert
];
substitutions = {
@ -30,9 +28,8 @@ in
composerInstallHook = makeSetupHook {
name = "composer-install-hook.sh";
propagatedBuildInputs = [
propagatedNativeBuildInputs = [
jq
moreutils
cacert
];
substitutions = {

2
pkgs/build-support/trivial-builders/default.nix
View File

@ -740,6 +740,7 @@ rec {
name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook",
# hooks go in nativeBuildInputs so these will be nativeBuildInputs
propagatedBuildInputs ? [ ],
propagatedNativeBuildInputs ? [ ],
# these will be buildInputs
depsTargetTargetPropagated ? [ ],
meta ? { },
@ -758,6 +759,7 @@ rec {
inherit meta;
inherit depsTargetTargetPropagated;
inherit propagatedBuildInputs;
inherit propagatedNativeBuildInputs;
strictDeps = true;
# TODO 2023-01, no backport: simplify to inherit passthru;
passthru =