diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-17 06:01:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 06:01:51 +0000 |
| commit | 97d01825832a1071966c64e7f624bd3e39ddac34 (patch) | |
| tree | aae6981a71e0943b48663582dc0553ca9da8289a /pkgs/build-support | |
| parent | ba519bf3b17452d3abb828cdf86d3a4c84e7b835 (diff) | |
| parent | c61915bc9615d3995d4f4dae505ae68a359eab7b (diff) | |
| download | nixpkgs-97d01825832a1071966c64e7f624bd3e39ddac34.tar nixpkgs-97d01825832a1071966c64e7f624bd3e39ddac34.tar.gz nixpkgs-97d01825832a1071966c64e7f624bd3e39ddac34.tar.bz2 nixpkgs-97d01825832a1071966c64e7f624bd3e39ddac34.tar.lz nixpkgs-97d01825832a1071966c64e7f624bd3e39ddac34.tar.xz nixpkgs-97d01825832a1071966c64e7f624bd3e39ddac34.tar.zst nixpkgs-97d01825832a1071966c64e7f624bd3e39ddac34.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
4 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index 6aecf434577..1386fc6188c 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/build-composer-project.nix @@ -53,6 +53,13 @@ let runHook postInstall ''; + doInstallCheck = previousAttrs.doInstallCheck or false; + installCheckPhase = previousAttrs.installCheckPhase or '' + runHook preCheckInstall + + runHook postCheckInstall + ''; + composerRepository = phpDrv.mkComposerRepository { inherit composer composer-local-repo-plugin; inherit (finalAttrs) patches pname src vendorHash version; diff --git a/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/build-composer-repository.nix index 30b0b48de75..55f427bbca7 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/pkgs/build-support/php/build-composer-repository.nix @@ -74,6 +74,13 @@ let runHook postInstall ''; + doInstallCheck = previousAttrs.doInstallCheck or false; + installCheckPhase = previousAttrs.installCheckPhase or '' + runHook preCheckInstall + + runHook postCheckInstall + ''; + COMPOSER_CACHE_DIR = "/dev/null"; COMPOSER_MIRROR_PATH_REPOS = "1"; COMPOSER_HTACCESS_PROTECT = "0"; diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index b1b5e2ac553..49ff0449719 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -77,9 +77,9 @@ composerInstallBuildHook() { # because the file contains hardcoded nix store paths, we generate it here. composer-local-repo-plugin --no-ansi build-local-repo -m "${composerRepository}" . - # Remove all the repositories of type "composer" + # Remove all the repositories of type "composer" and "vcs" # from the composer.json file. - jq -r -c 'del(try .repositories[] | select(.type == "composer"))' composer.json | sponge composer.json + jq -r -c 'del(try .repositories[] | select(.type == "composer" or .type == "vcs"))' composer.json | sponge composer.json # Configure composer to disable packagist and avoid using the network. composer config repo.packagist false 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 b18f422dbfa..48d05b7a000 100644 --- a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix @@ -71,7 +71,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { composer global config --quiet minimum-stability dev composer global config --quiet prefer-stable true - composer global config --quiet autoloader-suffix "nixPredictableAutoloaderSuffix" composer global config --quiet apcu-autoloader false composer global config --quiet allow-plugins.nix-community/composer-local-repo-plugin true composer global config --quiet repo.packagist false |