nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-07 20:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

composer-local-repo-plugin: Stop exposing this internal tool

Browse Source
This commit is contained in:
Elis Hirwing 2023-08-09 21:07:30 +02:00 committed by Pol Dellaiera
parent c0c01910ce
commit 9e701e6328
No known key found for this signature in database
GPG Key ID: D476DFE9C67467CA
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/php/build-composer-project.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, lib, writeTextDir, php, makeBinaryWrapper, fetchFromGitHub, fetchurl, composer-local-repo-plugin }: { callPackage, stdenvNoCC, lib, writeTextDir, php, makeBinaryWrapper, fetchFromGitHub, fetchurl }:
let let
buildComposerProjectOverride = finalAttrs: previousAttrs: buildComposerProjectOverride = finalAttrs: previousAttrs:
@ -6,6 +6,7 @@ let
let let
phpDrv = finalAttrs.php or php; phpDrv = finalAttrs.php or php;
composer = finalAttrs.composer or phpDrv.packages.composer; composer = finalAttrs.composer or phpDrv.packages.composer;
composer-local-repo-plugin = callPackage ./composer-local-repo-plugin.nix { };
composerLock = finalAttrs.composerLock or null; composerLock = finalAttrs.composerLock or null;
in in
{ {

3
pkgs/build-support/php/build-composer-repository.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, lib, writeTextDir, fetchFromGitHub, php, composer-local-repo-plugin }: { callPackage, stdenvNoCC, lib, writeTextDir, fetchFromGitHub, php }:
let let
mkComposerRepositoryOverride = mkComposerRepositoryOverride =
@ -19,6 +19,7 @@ let
let let
phpDrv = finalAttrs.php or php; phpDrv = finalAttrs.php or php;
composer = finalAttrs.composer or phpDrv.packages.composer; composer = finalAttrs.composer or phpDrv.packages.composer;
composer-local-repo-plugin = callPackage ./composer-local-repo-plugin.nix { };
in in
assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument.");
assert (lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument."); assert (lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument.");

3
pkgs/top-level/all-packages.nix
View File

@ -17991,11 +17991,8 @@ with pkgs;
# PHP interpreters, packages and extensions. # PHP interpreters, packages and extensions.
composer = callPackage ../development/tools/misc/composer { }; composer = callPackage ../development/tools/misc/composer { };
composer-local-repo-plugin = callPackage ../build-support/php/composer-local-repo-plugin.nix {};
# #
# Set default PHP interpreter, extensions and packages # Set default PHP interpreter, extensions and packages
php = php82; php = php82;