diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-19 12:01:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-19 12:01:22 +0000 |
commit | e22ad0ef4c68062b7dc59394bdaf996b82272027 (patch) | |
tree | 25e8cc99dce3b15b4f91cc78abbcceeff1980a75 /pkgs/build-support | |
parent | 3245a21e716da07d541cbc5aa488f8806d159e74 (diff) | |
parent | 85fd87463918c383c46f8725b96eea6e63cf5d4f (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/php/hooks/composer-install-hook.sh | 2 | ||||
-rw-r--r-- | pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index bb6cb47e861b9..86d17d0f50f79 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -41,7 +41,7 @@ composerInstallBuildHook() { # Since this file cannot be generated in the composer-repository-hook.sh # because the file contains hardcoded nix store paths, we generate it here. - composer-local-repo-plugin --no-ansi build-local-repo -p "${composerRepository}" > packages.json + composer-local-repo-plugin --no-ansi build-local-repo -m "${composerRepository}" . # Remove all the repositories of type "composer" # from the composer.json file. 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 67edbf1f44f9a..f4f1cc1ff72ed 100644 --- a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix @@ -27,13 +27,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer-local-repo-plugin"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "composer-local-repo-plugin"; rev = finalAttrs.version; - hash = "sha256-sjWV4JXK8YJ5XLASMPipKlk9u57352wIDV2PPFIP+sk="; + hash = "sha256-L1DPAINlYiC/HdcgDpI72OI58v8LWfhZVuS1vtNDnEw="; }; COMPOSER_CACHE_DIR = "/dev/null"; |