diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-12-04 18:18:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-04 18:18:32 -0500 |
commit | 4b995ddfe70c80bc89c3abc166975683c97e4015 (patch) | |
tree | fde14e96a2eaf7716fb05a69d46e5e32d345b204 /pkgs/top-level/all-packages.nix | |
parent | b07e7909630642c35f8f21dcf1b8fe814d6b7bdb (diff) | |
parent | a4cf20c68f81e331bd663fa4cb3d381145de501f (diff) | |
download | nixpkgs-4b995ddfe70c80bc89c3abc166975683c97e4015.tar nixpkgs-4b995ddfe70c80bc89c3abc166975683c97e4015.tar.gz nixpkgs-4b995ddfe70c80bc89c3abc166975683c97e4015.tar.bz2 nixpkgs-4b995ddfe70c80bc89c3abc166975683c97e4015.tar.lz nixpkgs-4b995ddfe70c80bc89c3abc166975683c97e4015.tar.xz nixpkgs-4b995ddfe70c80bc89c3abc166975683c97e4015.tar.zst nixpkgs-4b995ddfe70c80bc89c3abc166975683c97e4015.zip |
Merge pull request #73883 from etu/init-php74
php74: init at 7.4.0
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15f43e0977f..c6130718ceb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9093,6 +9093,10 @@ in php = php73; }); + php74Packages = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php74; + }); + phpPackages-unit = php72Packages-unit; php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { @@ -9103,11 +9107,16 @@ in php = php73-unit; }); + php74Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php74-unit; + }); + inherit (callPackages ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }) - php72 - php73; + php74 + php73 + php72; php-embed = php73-embed; @@ -9121,6 +9130,11 @@ in config.php.apxs2 = false; }; + php74-embed = php74.override { + config.php.embed = true; + config.php.apxs2 = false; + }; + php-unit = php73-unit; php72-unit = php72.override { @@ -9141,6 +9155,15 @@ in config.php.fpm = false; }; + php74-unit = php74.override { + config.php.embed = true; + config.php.apxs2 = false; + config.php.systemd = false; + config.php.phpdbg = false; + config.php.cgi = false; + config.php.fpm = false; + }; + picoc = callPackage ../development/interpreters/picoc {}; picolisp = callPackage ../development/interpreters/picolisp {}; |