+13
-2
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+13
-2
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
······
······
+5
nixos/doc/manual/release-notes/rl-2111.section.md
+5
nixos/doc/manual/release-notes/rl-2111.section.md
······
-1
nixos/tests/all-tests.nix
-1
nixos/tests/all-tests.nix
···
+18
-28
nixos/tests/web-servers/unit-php.nix
+18
-28
nixos/tests/web-servers/unit-php.nix
·········
·········
-1
pkgs/applications/misc/rss-bridge-cli/default.nix
-1
pkgs/applications/misc/rss-bridge-cli/default.nix
-20
pkgs/development/interpreters/php/7.3.nix
-20
pkgs/development/interpreters/php/7.3.nix
···
···
+7
-9
pkgs/development/interpreters/php/generic.nix
+7
-9
pkgs/development/interpreters/php/generic.nix
···············-++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre'.dev}" ]
···············+++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ]
-60
pkgs/development/interpreters/php/php73-darwin-isfinite.patch
-60
pkgs/development/interpreters/php/php73-darwin-isfinite.patch
···-+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)-+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)-+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)-+#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)-+#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)-+#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
···
+2
-2
pkgs/development/php-packages/apcu/default.nix
+2
-2
pkgs/development/php-packages/apcu/default.nix
······
······
+2
-2
pkgs/development/php-packages/apcu_bc/default.nix
+2
-2
pkgs/development/php-packages/apcu_bc/default.nix
-34
pkgs/development/php-packages/composer/1.x.nix
-34
pkgs/development/php-packages/composer/1.x.nix
···
···
+1
-1
pkgs/development/php-packages/couchbase/default.nix
+1
-1
pkgs/development/php-packages/couchbase/default.nix
······
······
+2
-2
pkgs/development/php-packages/imagick/default.nix
+2
-2
pkgs/development/php-packages/imagick/default.nix
+2
-2
pkgs/development/php-packages/mongodb/default.nix
+2
-2
pkgs/development/php-packages/mongodb/default.nix
+2
-2
pkgs/development/php-packages/pcov/default.nix
+2
-2
pkgs/development/php-packages/pcov/default.nix
+2
-1
pkgs/development/php-packages/php_excel/default.nix
+2
-1
pkgs/development/php-packages/php_excel/default.nix
+5
-14
pkgs/development/php-packages/pinba/default.nix
+5
-14
pkgs/development/php-packages/pinba/default.nix
···
···
+2
-2
pkgs/development/php-packages/protobuf/default.nix
+2
-2
pkgs/development/php-packages/protobuf/default.nix
-28
pkgs/development/php-packages/pthreads/default.nix
-28
pkgs/development/php-packages/pthreads/default.nix
···
···
+2
-2
pkgs/development/php-packages/rdkafka/default.nix
+2
-2
pkgs/development/php-packages/rdkafka/default.nix
+2
-2
pkgs/development/php-packages/snuffleupagus/default.nix
+2
-2
pkgs/development/php-packages/snuffleupagus/default.nix
+2
-2
pkgs/development/php-packages/swoole/default.nix
+2
-2
pkgs/development/php-packages/swoole/default.nix
······
······
+2
-2
pkgs/development/tools/misc/drush/default.nix
+2
-2
pkgs/development/tools/misc/drush/default.nix
······-wrapProgram "$out/src/drush" --prefix PATH : "${lib.makeBinPath [ which php73 bash coreutils ncurses ]}"
······+wrapProgram "$out/src/drush" --prefix PATH : "${lib.makeBinPath [ which php bash coreutils ncurses ]}"
+6
-6
pkgs/servers/http/unit/default.nix
+6
-6
pkgs/servers/http/unit/default.nix
············${optionalString withPython2 "./configure python --module=python2 --config=python2-config --lib-path=${python2}/lib"}${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"}-${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"}${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"}
············${optionalString withPython2 "./configure python --module=python2 --config=python2-config --lib-path=${python2}/lib"}${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"}${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"}+${optionalString withPHP80 "./configure php --module=php80 --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"}
+7
-2
pkgs/top-level/aliases.nix
+7
-2
pkgs/top-level/aliases.nix
·········
···+php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases."; # added 2021-06-03······
+4
-11
pkgs/top-level/all-packages.nix
+4
-11
pkgs/top-level/all-packages.nix
···············
···············
+9
-71
pkgs/top-level/php-packages.nix
+9
-71
pkgs/top-level/php-packages.nix
············-meta.broken = lib.versionAtLeast php.version "7.3"; # Runtime failure on 7.3, build error on 7.4···············{ name = "mbstring"; buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [···-buildInputs = [ pcre' ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [·········
···························{ name = "mbstring"; buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [···+buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [·········