Merge branch 'master' into staging-next

2020-04-16 10:09:43 +02:00
parent a04625379a 342eaba9eb
commit 3d8e436917
277 changed files with 8102 additions and 4662 deletions
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,12 +2,12 @@

 rustPlatform.buildRustPackage rec {
  pname = "wasmtime";
-  version = "v0.12.0";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "bytecodealliance";
    repo = "${pname}";
-    rev = "${version}";
+    rev = "v${version}";
    sha256 = "08dhk5s8rv41mjqbwfqwqmp6p6p9y7qc5yc76ljjd9l7j1phl7mr";
    fetchSubmodules = true;
  };