pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #242068 from NixOS/php/bump-july-2023

php: bumps July 2023

authored by

Pol Dellaiera and committed by
GitHub 0ed682c3 94c52940

+7 -36
unified split
+2 -2
pkgs/development/interpreters/php/8.1.nix
··· 2 2 3 3 let 4 4 base = callPackage ./generic.nix (_args // { 5 - version = "8.1.20"; 6 - hash = "sha256-VVeFh1FKJwdQD4UxnlfA1N+biAPNsmVmWVrEv0WdxN0="; 5 + version = "8.1.21"; 6 + hash = "sha256-bqSegzXWMhd/VrUHFgqhUcewIBhXianBSFn85dSgd20="; 7 7 }); 8 8 9 9 in
+2 -2
pkgs/development/interpreters/php/8.2.nix
··· 2 2 3 3 let 4 4 base = callPackage ./generic.nix (_args // { 5 - version = "8.2.7"; 6 - hash = "sha256-W/sqNcZ5Ib3K3VyQyykK11N9JNoROl6LwtZGsC3nSI8="; 5 + version = "8.2.8"; 6 + hash = "sha256-mV7UAJx5F8li0xg3oaNljzbUr081e2c8l//b5kA/hRc="; 7 7 }); 8 8 9 9 in
+3 -3
pkgs/development/interpreters/php/8.3.nix
··· 2 2 3 3 let 4 4 base = (callPackage ./generic.nix (_args // { 5 - version = "8.3.0alpha2"; 5 + version = "8.3.0alpha3"; 6 6 hash = null; 7 7 })).overrideAttrs (oldAttrs: { 8 8 src = fetchurl { 9 - url = "https://downloads.php.net/~eric/php-8.3.0alpha2.tar.xz"; 10 - hash = "sha256-YLCxgiDcsBisOmAodf0h8HyaCIh+4i1Q7QZw/h4KR5I="; 9 + url = "https://downloads.php.net/~jakub/php-8.3.0alpha3.tar.xz"; 10 + hash = "sha256-Ko0SR5ZIsdMyEmeM65zFU4bCU7f7xpiDBMf0od/kv8k="; 11 11 }; 12 12 }); 13 13 in
-14
pkgs/development/interpreters/php/fix-fileinfo-ext-php83.patch
··· 1 - diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c 2 - index a6f3e64db6..c3047233db 100644 3 - --- a/ext/fileinfo/fileinfo.c 4 - +++ b/ext/fileinfo/fileinfo.c 5 - @@ -14,6 +14,9 @@ 6 - +----------------------------------------------------------------------+ 7 - */ 8 - 9 - +#ifdef HAVE_CONFIG_H 10 - +#include "config.h" 11 - +#endif 12 - #include "php.h" 13 - 14 - #include "libmagic/magic.h"
-15
pkgs/top-level/php-packages.nix
··· 339 339 { 340 340 name = "fileinfo"; 341 341 buildInputs = [ pcre2 ]; 342 - patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ 343 - # Fix the extension unable to be loaded due to missing `get_module` function. 344 - # `ZEND_GET_MODULE` macro that creates it is conditional on `COMPILE_DL_FILEINFO` being defined. 345 - # https://github.com/php/php-src/issues/11408#issuecomment-1602106200 346 - ../development/interpreters/php/fix-fileinfo-ext-php83.patch 347 - ]; 348 342 } 349 343 { name = "filter"; buildInputs = [ pcre2 ]; } 350 344 { name = "ftp"; buildInputs = [ openssl ]; } ··· 534 528 } 535 529 { name = "session"; 536 530 doCheck = false; 537 - patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ 538 - # Fix GH-11529: Crash after dealing with an Apache request 539 - # To be removed in next alpha 540 - # See https://github.com/php/php-src/issues/11529 541 - (fetchpatch { 542 - url = "https://github.com/php/php-src/commit/8d4370954ec610164a4503431bb0c52da6954aa7.patch"; 543 - hash = "sha256-w1uF9lRdfhz9I0gux0J4cvMzNS93uSHL1fYG23VLDPc="; 544 - }) 545 - ]; 546 531 } 547 532 { name = "shmop"; } 548 533 {