cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #156179 from drupol/php/bump-to-8.1.2

Browse source
This commit is contained in:
Sandro 2022-01-25 16:00:14 +01:00 committed by GitHub
commit 4c6f9a4ad8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/interpreters/php/8.1.nix
View file

@ -2,8 +2,8 @@
let let
base = callPackage ./generic.nix (_args // { base = callPackage ./generic.nix (_args // {
version = "8.1.1"; version = "8.1.2";
sha256 = "sha256-j4vJytbNEk7cER99sKEJdF4vY4dwoQGzwiopU/eptA4="; sha256 = "1aakbfgjffha4v7fl6229wwzavw59s1qkb547sipyhl88gfwfgci";
}); });
in in

10
pkgs/top-level/php-packages.nix
View file

@ -540,7 +540,15 @@ lib.makeScope pkgs.newScope (self: with self; {
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
doCheck = false; 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 = "sodium"; buildInputs = [ libsodium ]; }
{ name = "sqlite3"; buildInputs = [ sqlite ]; } { name = "sqlite3"; buildInputs = [ sqlite ]; }
{ name = "sysvmsg"; } { name = "sysvmsg"; }