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

Commits on Jul 11, 2020

  1. php72: 7.2.31 -> 7.2.32 

    Changelog: https://www.php.net/ChangeLog-7.php#7.2.32
(cherry picked from commit 86ed3bf)
    @etu @Ma27
    etu authored and Ma27 committed Jul 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    siriobalmelli Sirio Balmelli
    GPG key ID: 0437A96EFE4C426E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2dc7ead View commit details

  2. php73: 7.3.19 -> 7.3.20 

    Changelog: https://www.php.net/ChangeLog-7.php#7.3.20
(cherry picked from commit ef4f6db)
    @etu @Ma27
    etu authored and Ma27 committed Jul 11, 2020
    Copy the full SHA
    7c89d08 View commit details

  3. php74: 7.4.7 -> 7.4.8 

    Changelog: https://www.php.net/ChangeLog-7.php#7.4.8
(cherry picked from commit 49316cc)
    @etu @Ma27
    etu authored and Ma27 committed Jul 11, 2020
    Copy the full SHA
    b2459a1 View commit details

  4. matrix-synapse: 1.15.2 -> 1.16.1 

    https://github.com/matrix-org/synapse/releases/tag/v1.16.0
https://github.com/matrix-org/synapse/releases/tag/v1.16.1
(cherry picked from commit 9deee36)
    @Ma27
    Ma27 committed Jul 11, 2020

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    5ca87e2 View commit details
Showing with 8 additions and 8 deletions.
  1. +6 −6 pkgs/development/interpreters/php/default.nix
  2. +2 −2 pkgs/servers/matrix-synapse/default.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
@@ -263,23 +263,23 @@ let

in {
php72 = generic {
version = "7.2.31";
sha256 = "0057x1s43f9jidmrl8daka6wpxclxc1b1pm5cjbz616p8nbmb9qv";
version = "7.2.32";
sha256 = "19wqbpvsd6c6iaad00h0m0xnx4r8fj56pwfhki2cw5xdfi10lp3i";

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

php73 = generic {
version = "7.3.19";
sha256 = "199l1lr7ima92icic7b1bqlb036md78m305lc3v6zd4zw8qix70d";
version = "7.3.20";
sha256 = "1pl9bjwvdva2yx4sh465z9cr4bnr8mvv008w71sy1kqsj6a7ivf6";

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

php74 = generic {
version = "7.4.7";
sha256 = "0ynq4fz54jpzh9nxvbgn3vrdad2clbac0989ai0yrj2ryc0hs3l0";
version = "7.4.8";
sha256 = "0ql01sfg8l7y2bfwmnjxnfw9irpibnz57ssck24b00y00nkd6j3a";
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.15.2";
version = "1.16.1";

src = fetchPypi {
inherit pname version;
sha256 = "1qsrpzq6i2zakpi9sa5sjnjd4bk92n7zgkpcmpaa4sd9ya1wqifb";
sha256 = "0kkja67h5ky94q5zj3790zx0nw5r8qksndvdg6gk6h0s1xb74iqa";
};

patches = [