From 7caed32d0bf01d8c43d9b99c67cc45e940e09071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 10 Nov 2024 21:29:34 +0100 Subject: [PATCH] build-support/php/buildComposerRepository: show composer-repository in logs (eg: nix build) when building the vendor derivation --- .../build-support/php/builders/v1/build-composer-repository.nix | 2 +- pkgs/build-support/php/builders/v2/build-composer-vendor.nix | 2 +- 2 files changed, 2 insertions(+), 2 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 c16056ce8fdf..4108c930ea76 100644 --- a/pkgs/build-support/php/builders/v1/build-composer-repository.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-repository.nix @@ -49,7 +49,7 @@ let composerNoScripts = previousAttrs.composerNoScripts or true; composerStrictValidation = previousAttrs.composerStrictValidation or true; - name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository"; + name = "${previousAttrs.pname}-composer-repository-${previousAttrs.version}"; # See https://github.com/NixOS/nix/issues/6660 dontPatchShebangs = previousAttrs.dontPatchShebangs 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 cbbe643d20f1..75f93d066f83 100644 --- a/pkgs/build-support/php/builders/v2/build-composer-vendor.nix +++ b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix @@ -34,7 +34,7 @@ let composerNoScripts = previousAttrs.composerNoScripts or true; composerStrictValidation = previousAttrs.composerStrictValidation or true; - name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository"; + name = "${previousAttrs.pname}-composer-repository-${previousAttrs.version}"; # See https://github.com/NixOS/nix/issues/6660 dontPatchShebangs = previousAttrs.dontPatchShebangs or true;