Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3232fd93f1c0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 860c5ca4a7a7
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 25, 2020

  1. php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7 

    Point releases contain several security updates and bugfixes.

Changelog: https://www.php.net/ChangeLog-7.php#7.4.7

Fixes #88381
    Christian Kauhaus committed Jun 25, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1d805c9 View commit details

  2. php7{2,3}: intl: fix aarch64 build

    @Ma27
    Ma27 committed Jun 25, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    30e812c View commit details

  3. Merge pull request #91495 from ckauhaus/secfix-php 

    php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7
    @Ma27
    Ma27 authored Jun 25, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    860c5ca View commit details
Showing with 14 additions and 8 deletions.
  1. +6 −6 pkgs/development/interpreters/php/default.nix
  2. +8 −2 pkgs/top-level/php-packages.nix
12 changes: 6 additions & 6 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -264,24 +264,24 @@ let
};

php72base = callPackage generic (_args // {
version = "7.2.29";
sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga";
version = "7.2.31";
sha256 = "0057x1s43f9jidmrl8daka6wpxclxc1b1pm5cjbz616p8nbmb9qv";

# https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
});

php73base = callPackage generic (_args // {
version = "7.3.16";
sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq";
version = "7.3.19";
sha256 = "199l1lr7ima92icic7b1bqlb036md78m305lc3v6zd4zw8qix70d";

# https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
});

php74base = callPackage generic (_args // {
version = "7.4.6";
sha256 = "0j133pfwa823d4jhx2hkrrzjl4hswvz00b1z58r5c82xd5sr9vd6";
version = "7.4.7";
sha256 = "0ynq4fz54jpzh9nxvbgn3vrdad2clbac0989ai0yrj2ryc0hs3l0";
});

defaultPhpExtensions = { all, ... }: with all; ([
10 changes: 8 additions & 2 deletions pkgs/top-level/php-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
, html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl
, uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng
, freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit
, readline, rsync
, readline, rsync, fetchpatch
}:

let
@@ -965,7 +965,13 @@ in
# uwimap doesn't build on darwin.
enable = (!stdenv.isDarwin); }
# interbase (7.3, 7.2)
{ name = "intl"; buildInputs = [ icu ]; }
{ name = "intl";
buildInputs = [ icu ];
patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch {
url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch";
sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4";
});
}
{ name = "json"; }
{ name = "ldap";
buildInputs = [ openldap cyrus_sasl ];