Unverified Commit 51c3426a authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

php83: 8.3.11 -> 8.3.12, php82: 8.2.23 -> 8.2.24, php81: 8.1.29 -> 8.1.30 (#344937)

parents 383977f4 5c8b1b25

pkgs/development/interpreters/php/8.1.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


let

  base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // {

    version = "8.1.29";

    hash = "sha256-h6YDEyY/L1M/GA5xknLKXkfNmITU7DyTcgGY6v+uCCc=";

    version = "8.1.30";

    hash = "sha256-yxYl5axJuRA3R34+d2e7BiQ0OXGuuZL0eRthivVx0j4=";

    extraPatches = [

      # Fix build with libxml2 2.12+.

      # Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082

pkgs/development/interpreters/php/8.2.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


let

  base = callPackage ./generic.nix (_args // {

    version = "8.2.23";

    hash = "sha256-98kM2no8HeAfO/t7Rp1S3snrovO4MyCDYAT5wu7K4ms=";

    version = "8.2.24";

    hash = "sha256-TMduxkTu6X0XySv+jQ6EcU/t8pmlOLffrcBjndDcQy8=";

  });

in

base.withExtensions ({ all, ... }: with all; ([

pkgs/development/interpreters/php/8.3.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


let

  base = callPackage ./generic.nix (_args // {

    version = "8.3.11";

    hash = "sha256-ZkDiRVCAqJrcQdTle7BPjCv7fuxif+GZr5c7/zTX8O4=";

    version = "8.3.12";

    hash = "sha256-gHYzSWzNs3CokFRY24K9ZzZumKbVlyiRS3l7h+nK7L8=";

  });

in

base.withExtensions ({ all, ... }: with all; ([

pkgs/top-level/php-packages.nix

+0 −6
Original line number Diff line number Diff line
@@ -705,12 +705,6 @@ in { 
              url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";

              hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";

            })

          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2") [

            # Fix test 'bug55639.phpt'

            (fetchpatch {

              url = "https://github.com/php/php-src/commit/1b52ecd78ad1a211a4a9db65975df34d2539125b.patch";

              hash = "sha256-LVk9sfwl5D+rHzyYjfV4pAuhBjSPXj1WjTfnrzBJXhY";

            })

          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [

            (fetchpatch {

              url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";