Unverified Commit 1173a34d authored by Pol Dellaiera's avatar Pol Dellaiera
Browse files

build-support/php: move internal tools in `php/build-support/php/pkgs`

parent 1e238b8a

pkgs/build-support/php/build-composer-project.nix

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ let 
    let

      phpDrv = finalAttrs.php or php;

      composer = finalAttrs.composer or phpDrv.packages.composer;

      composer-local-repo-plugin = callPackage ./composer-local-repo-plugin.nix { };

      composer-local-repo-plugin = callPackage ./pkgs/composer-local-repo-plugin.nix { };

      composerLock = finalAttrs.composerLock or null;

    in

    {

pkgs/build-support/php/build-composer-repository.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ let 
    let

      phpDrv = finalAttrs.php or php;

      composer = finalAttrs.composer or phpDrv.packages.composer;

      composer-local-repo-plugin = callPackage ./composer-local-repo-plugin.nix { };

      composer-local-repo-plugin = callPackage ./pkgs/composer-local-repo-plugin.nix { };

    in

    assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument.");

    assert (lib.assertMsg (previousAttrs ? vendorHash) "mkComposerRepository expects vendorHash argument.");

pkgs/build-support/php/composer-local-repo-plugin.nix→pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix

+1 −1
Original line number Diff line number Diff line 
{ callPackage, stdenvNoCC, lib, fetchFromGitHub, makeBinaryWrapper }:



let

  composer = callPackage ../../development/tools/misc/composer { };

  composer = callPackage ./composer-phar.nix { };



  composerKeys = stdenvNoCC.mkDerivation (finalComposerKeysAttrs: {

    pname = "composer-keys";

pkgs/build-support/php/pkgs/composer-phar.nix

0 → 100644
+48 −0
Original line number Diff line number Diff line 
{

  _7zz

  , cacert

  , curl

  , fetchurl

  , git

  , lib

  , makeBinaryWrapper

  , php

  , stdenvNoCC

  , unzip

  , xz

}:



stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "composer-phar";

  version = "2.6.2";



  src = fetchurl {

    url = "https://github.com/composer/composer/releases/download/${finalAttrs.version}/composer.phar";

    hash = "sha256-iMhNSlP88cJ9Z2Lh1da3DVfG3J0uIxT9Cdv4a/YeGu8=";

  };



  dontUnpack = true;



  nativeBuildInputs = [ makeBinaryWrapper ];



  installPhase = ''

    runHook preInstall



    mkdir -p $out/bin

    install -D $src $out/libexec/composer/composer.phar

    makeWrapper ${php}/bin/php $out/bin/composer \

      --add-flags "$out/libexec/composer/composer.phar" \

      --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]}



    runHook postInstall

  '';



  meta = {

    changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";

    description = "Dependency Manager for PHP, shipped from the PHAR file";

    homepage = "https://getcomposer.org/";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ drupol ];

    platforms = lib.platforms.all;

  };

})

pkgs/development/php-packages/composer/default.nix

+1 −1
Original line number Diff line number Diff line 
{ lib, callPackage, fetchFromGitHub, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }:



php.buildComposerProject (finalAttrs: {

  composer = callPackage ../../tools/misc/composer { };

  composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { };



  pname = "composer";

  version = "2.6.2";