Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8a5317f25bf4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5699e8edc724
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 24, 2019

  1. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    afa88c8 View commit details
  2. phpPackages.composer: Add unzip to path

    Unzip is used by composer to install dependencies etc. If it's not
    there it defaults to using PHP's built in zip functions. But they are
    slower and composer complains to the user if this happens.
    etu committed Mar 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    52fa2d4 View commit details
  3. Merge pull request #58201 from etu/php-composer-update

    phpPackages.composer: 1.8.0 -> 1.8.4
    etu authored Mar 24, 2019
    Copy the full SHA
    5699e8e View commit details
Showing with 6 additions and 5 deletions.
  1. +6 −5 pkgs/top-level/php-packages.nix
11 changes: 6 additions & 5 deletions pkgs/top-level/php-packages.nix
Original file line number Diff line number Diff line change
@@ -253,23 +253,24 @@ let
};

composer = pkgs.stdenv.mkDerivation rec {
name = "composer-${version}";
version = "1.8.0";
pname = "composer";
version = "1.8.4";

src = pkgs.fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "19pg9ip2mpyf5cyq34fld7qwl77mshqw3c4nif7sxmpnar6sh089";
sha256 = "12h5vqwhklxvwrplggzjl21n6kb972pwkj9ivmn2vbxyixn848hp";
};

unpackPhase = ":";

buildInputs = [ pkgs.makeWrapper ];
nativeBuildInputs = [ pkgs.makeWrapper ];

installPhase = ''
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"
--add-flags "$out/libexec/composer/composer.phar" \
--prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
'';

meta = with pkgs.lib; {