Unverified Commit ad3d0962 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

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

parents aa1c5760 1c840ff2

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

+3 −7
Original line number Diff line number Diff line
@@ -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 = {

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

+2 −5
Original line number Diff line number Diff line
@@ -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 = {

pkgs/build-support/trivial-builders/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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 =