public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2016-05-14 21:37:55 +02:00
parent 468d35fc8e 0561e14c3b
commit b1ac3404e0
106 changed files with 1826 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/groovy/default.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
version = "2.4.5";
version = "2.4.6";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
sha256 = "1ajcrma18z0zr7h69bg4v2brxnxa4ljc9a55pk4q92vi3ypyks47";
sha256 = "0s474wy7db7j1pans5ks986b52bdmn40l29zl6xl44y23fsvagwv";
};
buildInputs = [ unzip makeWrapper ];

4
pkgs/development/interpreters/php/default.nix
View File

@@ -302,8 +302,8 @@ in {
};
php70 = generic {
version = "7.0.5";
sha256 = "1s8xnnxwq5big2rnbp3w7zw7wh5d5ra9p2q9bxwylds5wrzsy29c";
version = "7.0.6";
sha256 = "1dr9cglqvw3n1ln1fmkmp16lmwz2dd2n2akl3s68ap4nm69g3p8l";
};
}