Merge pull request #180740 from helsinki-systems/upd/php

php8*: 8.0.20 -> 8.0.21, 8.1.7 -> 8.1.8
This commit is contained in:
Elis Hirwing 2022-07-09 09:00:41 +02:00 committed by GitHub
commit cffa3d2d65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View file

@ -2,8 +2,8 @@
let let
base = callPackage ./generic.nix (_args // { base = callPackage ./generic.nix (_args // {
version = "8.0.20"; version = "8.0.21";
sha256 = "y3Zmv2ftn2yYfUg2yvA9SzZFN+anXlbNXJhnYOzC/dg="; hash = "sha256-HLd2LR/+zOruuvufbiQTLKI/sUQ8tWMND8z1PwTPoSY=";
}); });
in in

View file

@ -2,8 +2,8 @@
let let
base = callPackage ./generic.nix (_args // { base = callPackage ./generic.nix (_args // {
version = "8.1.7"; version = "8.1.8";
sha256 = "uBZ1PrAFUR5pXZCUXCcJPDI2zHPbEmJlbZ+t1z6tfp0="; hash = "sha256-uIFaWgJDFFPUJh41mL0fKFFuTANU8yjBKJDyV4cOTAE=";
}); });
in in

View file

@ -29,7 +29,7 @@ let
, xcbuild , xcbuild
, version , version
, sha256 , hash
, extraPatches ? [ ] , extraPatches ? [ ]
, packageOverrides ? (final: prev: { }) , packageOverrides ? (final: prev: { })
, phpAttrsOverrides ? (attrs: { }) , phpAttrsOverrides ? (attrs: { })
@ -290,7 +290,7 @@ let
src = fetchurl { src = fetchurl {
url = "https://www.php.net/distributions/php-${version}.tar.bz2"; url = "https://www.php.net/distributions/php-${version}.tar.bz2";
inherit sha256; inherit hash;
}; };
patches = [ ./fix-paths-php7.patch ] ++ extraPatches; patches = [ ./fix-paths-php7.patch ] ++ extraPatches;