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

Commits on Nov 26, 2020

  1. php73: 7.3.24 -> 7.3.25 

    https://www.php.net/ChangeLog-7.php#7.3.25
    @ajs124
    ajs124 committed Nov 26, 2020

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: E315A75846131564
    Learn about vigilant mode
    Copy the full SHA
    eec6063 View commit details

  2. php74: 7.4.12 -> 7.4.13 

    https://www.php.net/ChangeLog-7.php#7.4.13
    @ajs124
    ajs124 committed Nov 26, 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
    1eb55d4 View commit details

Commits on Nov 27, 2020

  1. Merge pull request #105040 from helsinki-systems/upd/php 

    php: 7.3.24 -> 7.3.25, 7.4.12 -> 7.4.13
    @etu
    etu authored Nov 27, 2020
    Copy the full SHA
    1d2835c View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/interpreters/php/7.3.nix
  2. +2 −2 pkgs/development/interpreters/php/7.4.nix
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/php/7.3.nix
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;

base = callPackage generic (_args // {
version = "7.3.24";
sha256 = "1655rj4w63n5fkvdj3kz9f5jfyjgvzw8a6j8zkzgic1p42xszdsm";
version = "7.3.25";
sha256 = "1yq2fwpg9jgcafcrq4ffqm52r0f80pi6zy7fj1yb1qwim96mlcb9";

# https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/php/7.4.nix
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;

base = callPackage generic (_args // {
version = "7.4.12";
sha256 = "0rwrl7xgfq2bbgmy34klgfsqa7v935074ibanmic9pwy4g676vvf";
version = "7.4.13";
sha256 = "1nhzldjp8jfd1hivfyn5wydim5daibz0vkfxgys2xj8igs2kk8qm";
});

in base.withExtensions ({ all, ... }: with all; ([