From b447ec0d0597ea72431b8ca4f12dbfd80013da7d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 22 Jan 2022 18:12:21 +0100 Subject: [PATCH] php81: 8.1.1 -> 8.1.2 (cherry picked from commit 6794a2c3f67a92f374e02c52edf6442b21a52ecb) --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- pkgs/top-level/php-packages.nix | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 736d6c808cde..d339e7801018 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.1"; - sha256 = "sha256-j4vJytbNEk7cER99sKEJdF4vY4dwoQGzwiopU/eptA4="; + version = "8.1.2"; + sha256 = "1aakbfgjffha4v7fl6229wwzavw59s1qkb547sipyhl88gfwfgci"; }); in diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ea36bf278c03..c6df621c8436 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -538,7 +538,15 @@ lib.makeScope pkgs.newScope (self: with self; { ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; doCheck = false; } - { name = "sockets"; doCheck = false; } + { + name = "sockets"; + doCheck = false; + patches = lib.optional (php.version == "8.1.2") + (fetchpatch { + url = "https://github.com/php/php-src/commit/07aaa34cd418c44f7bc653fafbf49f07fc71b2bf.patch"; + sha256 = "sha256-EwVb09/zV2vJ8PuyLpKFCovxe6yKct0UBvishZaordM="; + }); + } { name = "sodium"; buildInputs = [ libsodium ]; } { name = "sqlite3"; buildInputs = [ sqlite ]; } { name = "sysvmsg"; }