Merge master into staging-next

This brings thousands of rebuilds.
Hydra nixpkgs: ?compare=1597944
This commit is contained in:
Vladimír Čunát
2020-07-04 09:15:27 +02:00
160 changed files with 4236 additions and 2376 deletions
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "joker";
version = "0.15.4";
version = "0.15.5";
src = fetchFromGitHub {
rev = "v${version}";
owner = "candid82";
repo = "joker";
sha256 = "1ad6cdqadd1zs9zh85zyhdiiv6ir28k28w034vzsx5zaipvy4kml";
sha256 = "0v4mamd5zkw7r9gfl4rzy4mr1d7ni9klryd93izqssgps954bikz";
};
vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl";
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
version = "9.2.11.1";
version = "9.2.12.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "1p4ml5rqidqllc7z85zn2q4pyyih71j0gb71wl43j4v74p44j17i";
sha256 = "013c1q1n525y9ghp369z1jayivm9bw8c1x0g5lz7479hqhj62zrh";
};
buildInputs = [ makeWrapper ];
@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "0.17.0";
version = "0.18.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
fetchSubmodules = true;
};
cargoSha256 = "149nav392wf4sr50dpdlnvfq3vfrrl9lqgr98g5dyzfjrf5jbzm3";
cargoSha256 = "0r92jafxbji2sgc5a4syycsk705zcx4wqfwgg73sx568mfxkw225";
nativeBuildInputs = [ python cmake clang ];
buildInputs = [ llvmPackages.libclang ] ++