From 6ca2dfeaec7e8ccb6bb6261a49aa35cd3b09f378 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 5 May 2024 18:45:27 +0200 Subject: [PATCH 1/5] build-support/php: remove obsolete parameters --- pkgs/build-support/php/build-composer-project.nix | 3 --- pkgs/build-support/php/build-composer-repository.nix | 1 - 2 files changed, 4 deletions(-) diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index 5a21eda03544..92d9cf9f633f 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/build-composer-project.nix @@ -2,11 +2,8 @@ callPackage, stdenvNoCC, lib, - writeTextDir, php, - makeBinaryWrapper, fetchFromGitHub, - fetchurl, }: let diff --git a/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/build-composer-repository.nix index a5b02fd95e04..6edaf513bad0 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/pkgs/build-support/php/build-composer-repository.nix @@ -2,7 +2,6 @@ callPackage, stdenvNoCC, lib, - writeTextDir, fetchFromGitHub, php, }: From b5855e4e666231507bdde8982190d5e0486f4c47 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 5 May 2024 18:45:52 +0200 Subject: [PATCH 2/5] build-support/php: move environment variables under `env` attribute --- pkgs/build-support/php/build-composer-project.nix | 8 +++++--- pkgs/build-support/php/build-composer-repository.nix | 10 ++++++---- .../php/pkgs/composer-local-repo-plugin.nix | 10 ++++++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index 92d9cf9f633f..4a8a94591cc0 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/build-composer-project.nix @@ -89,9 +89,11 @@ let composerStrictValidation = previousAttrs.composerStrictValidation or true; }; - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_DISABLE_NETWORK = "1"; - COMPOSER_MIRROR_PATH_REPOS = "1"; + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_DISABLE_NETWORK = "1"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + }; meta = previousAttrs.meta or { } // { platforms = lib.platforms.all; diff --git a/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/build-composer-repository.nix index 6edaf513bad0..03ac2ac7d5f9 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/pkgs/build-support/php/build-composer-repository.nix @@ -106,10 +106,12 @@ let runHook postInstallCheck ''; - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "0"; + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + COMPOSER_HTACCESS_PROTECT = "0"; + COMPOSER_DISABLE_NETWORK = "0"; + }; outputHashMode = "recursive"; outputHashAlgo = diff --git a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix index 5351a3e51f4d..601640b6f0bb 100644 --- a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix @@ -43,10 +43,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-edbn07r/Uc1g0qOuVBZBs6N1bMN5kIfA1b4FCufdw5M="; }; - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "1"; + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + COMPOSER_HTACCESS_PROTECT = "0"; + COMPOSER_DISABLE_NETWORK = "1"; + }; nativeBuildInputs = [ makeBinaryWrapper ]; From 409e640ceff14b130bc65faa1065a008249432fe Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 5 May 2024 18:46:33 +0200 Subject: [PATCH 3/5] build-support/php: use `lib.getExe` --- pkgs/build-support/php/pkgs/composer-phar.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix index a03adc6e6ab0..f0f66fba24bf 100644 --- a/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/pkgs/build-support/php/pkgs/composer-phar.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar - makeWrapper ${php}/bin/php $out/bin/composer \ + makeWrapper ${lib.getExe php} $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ --prefix PATH : ${ lib.makeBinPath [ From d8f509a4706287a973cd37398ea683076b241650 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 5 May 2024 18:46:46 +0200 Subject: [PATCH 4/5] build-support/php: composer, add `meta.mainProgram` --- pkgs/build-support/php/pkgs/composer-phar.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix index f0f66fba24bf..d278810091ef 100644 --- a/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/pkgs/build-support/php/pkgs/composer-phar.nix @@ -53,6 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Dependency Manager for PHP, shipped from the PHAR file"; homepage = "https://getcomposer.org/"; license = lib.licenses.mit; + mainProgram = "composer"; maintainers = with lib.maintainers; [ drupol ]; platforms = lib.platforms.all; }; From 31bdcac6a000b97719aa3de19ae554ba31655ea6 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 5 May 2024 18:49:09 +0200 Subject: [PATCH 5/5] build-support/php: add missing binding --- .../php/build-composer-project.nix | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index 4a8a94591cc0..4129c2715f68 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/build-composer-project.nix @@ -72,22 +72,23 @@ let runHook postInstallCheck ''; - composerRepository = phpDrv.mkComposerRepository { - inherit composer composer-local-repo-plugin; - inherit (finalAttrs) - patches - pname - src - vendorHash - version - ; + composerRepository = + previousAttrs.composerRepository or (phpDrv.mkComposerRepository { + inherit composer composer-local-repo-plugin; + inherit (finalAttrs) + patches + pname + src + vendorHash + version + ; - composerLock = previousAttrs.composerLock or null; - composerNoDev = previousAttrs.composerNoDev or true; - composerNoPlugins = previousAttrs.composerNoPlugins or true; - composerNoScripts = previousAttrs.composerNoScripts or true; - composerStrictValidation = previousAttrs.composerStrictValidation or true; - }; + composerLock = previousAttrs.composerLock or null; + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + }); env = { COMPOSER_CACHE_DIR = "/dev/null";