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

Commits on Oct 11, 2018

  1. Copy the full SHA
    36e3fdd View commit details
  2. Copy the full SHA
    b9773bd View commit details

Commits on Oct 13, 2018

  1. Merge pull request #48228 from etu/php-upgrades

    php: 7.1.22 -> 7.1.23, 7.2.10 -> 7.2.11
    xeji authored Oct 13, 2018
    Copy the full SHA
    20c4986 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/development/interpreters/php/default.nix
10 changes: 5 additions & 5 deletions pkgs/development/interpreters/php/default.nix
Original file line number Diff line number Diff line change
@@ -227,7 +227,7 @@ in {
# We can't update the darwin versions because they simply don't compile at
# all due to a bug in the intl extensions.
#
# The bug so far is present in 7.1.21, 7.1.22, 7.2.9, 7.2.10.
# The bug so far is present in 7.1.21, 7.1.22, 7.1.23, 7.2.9, 7.2.10, 7.2.11.

php71 = generic (
if stdenv.isDarwin then
@@ -237,8 +237,8 @@ in {
}
else
{
version = "7.1.22";
sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
version = "7.1.23";
sha256 = "0jyc5q666xh808sgy78cfylkhy5ma2zdg88jlxhagyphv23aly9d";
}
);

@@ -250,8 +250,8 @@ in {
}
else
{
version = "7.2.10";
sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
version = "7.2.11";
sha256 = "1idlv04j1l2d0bn5nvfrapcpjh6ayj1n4y80lqvnp5h75m07y3aa";
}
);
}