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: 3d9c143b772c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2423213b95f5
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 11, 2020

  1. php74: 7.4.7 -> 7.4.8 

    Changelog: https://www.php.net/ChangeLog-7.php#7.4.8
    @etu
    etu committed Jul 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    GPG key ID: D57EFA625C9A925F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    49316cc View commit details

  2. Merge pull request #92925 from etu/php74-update 

    php74: 7.4.7 -> 7.4.8
    @Ma27
    Ma27 authored Jul 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2423213 View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −2 pkgs/development/interpreters/php/default.nix
  2. +1 −0 pkgs/top-level/php-packages.nix
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -284,8 +284,8 @@ let
});

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

defaultPhpExtensions = { all, ... }: with all; ([
1 change: 1 addition & 0 deletions pkgs/top-level/php-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1014,6 +1014,7 @@ in
+----------------------------------------------------------------------+
| Copyright (c) The PHP Group |
'')
] ++ lib.optional (lib.versionOlder php.version "7.4.8") [
(pkgs.writeText "mysqlnd_fix_compression.patch" ''
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h