Merge master into staging-next

2020-11-03 12:06:06 +01:00
parent fe9f55907e 72c32ad3d7
commit 237966224d
317 changed files with 3210 additions and 2827 deletions
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "acl2-devel";
    repo = "acl2-devel";
-    rev = "${version}";
+    rev = version;
    sha256 = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5";
  };

@@ -145,7 +145,7 @@ stdenv.mkDerivation {

  src = fetchgit {
    url = "https://github.com/anmonteiro/lumo.git";
-    rev = "${version}";
+    rev = version;
    sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p";
  };

@@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {

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