Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1523028
This commit is contained in:
Vladimír Čunát
2019-06-03 10:00:49 +02:00
392 changed files with 11536 additions and 4972 deletions

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "janet-lang";
repo = "janet";
rev = "v${version}";
sha256 = "00lrj21k85sqyn4hv2rc5sny9vxghafjxyvs0dq4zp68461s3l7c";
sha256 = "1w6d5a4akd868x89bgyvw3cnadfva7gnyvhmxx5ixxd580n5ba6v";
};
JANET_BUILD=''\"release\"'';

View File

@@ -258,24 +258,24 @@ let
in {
php71 = generic {
version = "7.1.29";
sha256 = "0dc3p3xq430vawcryw3xb4d1ckkz44rdnvfr833jsrl2zrzd2a45";
version = "7.1.30";
sha256 = "1czcf5qwk727sdzx5n4wvsxvl50jx6d5x8ws1dqx46fa9xvm0j36";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;
};
php72 = generic {
version = "7.2.18";
sha256 = "0wjb9j5slqjx1fn00ljwgy4vlxvz9a6s9677h5z20wqi5nqjf6ps";
version = "7.2.19";
sha256 = "16d0j0d4563bcrxlw5yysldscxpgyp917hmc4m4ys1zyfprv3l7b";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
};
php73 = generic {
version = "7.3.5";
sha256 = "0pn3c9fj24v0r57d3cz67nisg6vjyw2yn5il7j1c6rw2z47bi023";
version = "7.3.6";
sha256 = "0xvgdxmhk0hsx8gh3ircm2s7pf59gm8i9a73204mr0sl05qchnhy";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

View File

@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date
cargoSha256 = "1jvk9n324p3x3j6q6x0p5diig3b5c683k74cfflff25i7gsmmvc7";
cargoSha256 = "073dnn80sl4adh7vi6q9sx2vkmy27gxy7ysxz17iz12p7pfcagm2";
meta = with stdenv.lib; {
description = "gc-sections for wasm";