JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34496 from etu/php722

Browse Source 
php: 7.2.1 -> 7.2.2, xdebug: 2.6.0beta1 -> 2.6.0
This commit is contained in:
adisbladis 2018-02-03 22:32:42 +08:00 committed by GitHub
commit c56b13a06f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/php/default.nix
View File

@ -348,12 +348,12 @@ in {
};
php71 = generic {
version = "7.1.13";
sha256 = "18cqry8jy7q9fp82p3n9ndxffyba6f6q3maz3100jq245lfsbz9m";
version = "7.1.14";
sha256 = "1x41qmq66r0ff0573ln34d3qbzwg5z20nagsn1b6frfpkq9zvck3";
};
php72 = generic {
version = "7.2.1";
sha256 = "0ygbcilbp3fiswd240ib2mvnhy0yy0az8kjzpjfd4kca4qzpj1py";
version = "7.2.2";
sha256 = "1vjaixm4f7rz9vz1yrlzmn9rpp01vd7b74m83qjg4wblw5caqhgq";
};
}

19
pkgs/top-level/php-packages.nix
View File

@ -8,8 +8,6 @@ let
};
isPhpOlder55 = pkgs.lib.versionOlder php.version "5.5";
isPhp7 = pkgs.lib.versionAtLeast php.version "7.0";
isPhp72 = pkgs.lib.versionAtLeast php.version "7.2";
isPhpOlder7 = pkgs.lib.versionOlder php.version "7.0";
apcu = if isPhp7 then apcu51 else apcu40;
@ -181,7 +179,7 @@ let
buildInputs = [ pkgs.spidermonkey_1_8_5 ];
};
xdebug = if isPhp72 then xdebug26 else if isPhp7 then xdebug25 else xdebug23;
xdebug = if isPhp7 then xdebug26 else xdebug23;
xdebug23 = assert !isPhp7; buildPecl {
name = "xdebug-2.3.1";
@ -192,19 +190,10 @@ let
checkTarget = "test";
};
xdebug25 = assert !isPhp72; buildPecl {
name = "xdebug-2.5.0";
xdebug26 = assert isPhp7; buildPecl {
name = "xdebug-2.6.0";
sha256 = "03c9y25a3gc3kpav0cdgmhjixcaly6974hx7wgihi0wlchgavmlb";
doCheck = true;
checkTarget = "test";
};
xdebug26 = assert !isPhpOlder7; buildPecl {
name = "xdebug-2.6.0beta1";
sha256 = "0zaj821jbpaqqcbr9a64sa27my9n980pmyy9kxrvvjqq3qg6dpj9";
sha256 = "1p6b54ypi5lq4ka3pyy2gswdf1d5vjb9y8lp9fqcp3zn7g04q9mm";
doCheck = true;
checkTarget = "test";