diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
| commit | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch) | |
| tree | 31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/development/interpreters | |
| parent | 132571454c8162cdefe9e94613137d6a13b950b7 (diff) | |
| parent | df27c35e9a0515146eb7db07e11af59e520214a6 (diff) | |
| download | nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.gz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.bz2 nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.lz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.xz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.zst nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.zip | |
Merge branch 'master' into staging
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 2841a70ddcf1..7c1fe8f29674 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -299,20 +299,13 @@ let }); in { - - php55 = generic { - version = "5.5.38"; - sha256 = "0f1y76whg6yx9a18mh97f8yq8lb64ri1f0zfr9la9374nbmq2g27"; - }; - php56 = generic { - version = "5.6.24"; - sha256 = "1iiqmjgxr10ci69f33fzyhplp06km6ybgqmxr1g142pdqdz628xz"; + version = "5.6.25"; + sha256 = "1pldn4z7pzcjm8li9xryrniz5cz542cbv4nlrr13wzzdmhr61kjq"; }; php70 = generic { - version = "7.0.9"; - sha256 = "0yrv5ijw6bgc0ahplczwhl5nm6l5mnd1i2n5023z7wkmb25rdrif"; + version = "7.0.10"; + sha256 = "1ppn17n5klhs1b2mcbbxxiqq4xvdbmv8p866q0qnk61nlzjvnmc0"; }; - } |