diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-09 10:15:17 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-09 10:15:17 +0100 |
| commit | 7f9e3b8206b8761d98972d08cb7f3bd6d3183337 (patch) | |
| tree | 4e592516f6e1f4e8a9b162c696574214cc18ce6d /pkgs/development/interpreters | |
| parent | 6ae1cc2e624ed7dcc7026b7c134f0e32eca3e1c6 (diff) | |
| parent | baf6ba553f729f063359a59ceb54de11328e0aba (diff) | |
| download | nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.gz nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.bz2 nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.lz nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.xz nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.zst nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/groovy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 6b55f006cd2..dc04e72c741 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "16hj2v6r89s3qrgbnkinwwzv16mphb6jjw8ijgmmd9y2063nchc2"; + sha256 = "14lfxnc03hmakwagvl3sb6c0b298v3awcdr1gafwnmsqv03hhkdn"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3d9235757c6..39f8d251410 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -253,16 +253,16 @@ in { }; php72 = generic { - version = "7.2.14"; - sha256 = "15v5gbdxi6jkgdflpj5rqqzzfvwdb55hls4azh71xgy793934qgm"; + version = "7.2.15"; + sha256 = "0m05dmad138qfxcb2z4czf9pfv1746g9yzlch48kjikajhb7cgn9"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.1"; - sha256 = "13iqfkz9rmx9vy106lvw1nbk88qgwdkvxam0l5s14r7jsw62pvxg"; + version = "7.3.2"; + sha256 = "1p8amf91i6lrrphd6ypfh3kic64bpqf04dxp7dj1xxnjrgd50vwl"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; |