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

Commits on Nov 2, 2017

  1. phpPackages.redis: rev 4a37e4 -> 3.1.4

    @jbboehr
    jbboehr committed Nov 2, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    jbboehr John Boehr
    GPG key ID: 73B8EFB60708F699
    Verified
    Learn about vigilant mode
    Copy the full SHA
    994cff6 View commit details

Commits on Nov 3, 2017

  1. Merge pull request #31158 from jbboehr/fix/php-redis-3.1.4-m 

    phpPackages.redis: rev 4a37e4 -> 3.1.4
    @Mic92
    Mic92 authored Nov 3, 2017

    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
    ddec346 View commit details
Showing with 4 additions and 10 deletions.
  1. +4 −10 pkgs/top-level/php-packages.nix
14 changes: 4 additions & 10 deletions pkgs/top-level/php-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -269,22 +269,16 @@ let
buildInputs = [ pkgs.geoip ];
};

redis = if isPhp7 then redisPhp7 else redis22;
redis = if isPhp7 then redis31 else redis22;

redis22 = assert !isPhp7; buildPecl {
name = "redis-2.2.7";
sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm";
};

# Not released yet
redisPhp7 = assert isPhp7; buildPecl rec {
name = "redis-php7";

src = fetchgit {
url = "https://github.com/phpredis/phpredis";
rev = "4a37e47d0256581ce2f7a3b15b5bb932add09f36";
sha256 = "1qm2ifa0zf95l1g967iiabmja17srpwz73lfci7z13ffdw1ayhfd";
};
redis31 = assert isPhp7; buildPecl {
name = "redis-3.1.4";
sha256 = "0rgjdrqfif8pfn3ipk1v4gyjkkdcdrdk479qbpda89w25vaxzsxd";
};

v8 = assert isPhp7; buildPecl rec {