Merge master into staging-next

2021-02-26 10:25:13 +01:00
parent babf9d6100 6d7128414c
commit c456a2512f
579 changed files with 9802 additions and 3062 deletions
@@ -25,6 +25,9 @@
  # Legacy hash
 , cargoSha256 ? ""

+  # Name for the vendored dependencies tarball
+, cargoDepsName ? name
+
 , src ? null
 , srcs ? null
 , unpackPhase ? null
@@ -59,7 +62,8 @@ let

  cargoDeps = if cargoVendorDir == null
    then fetchCargoTarball ({
-        inherit name src srcs sourceRoot unpackPhase cargoUpdateHook;
+        inherit src srcs sourceRoot unpackPhase cargoUpdateHook;
+        name = cargoDepsName;
        hash = cargoHash;
        patches = cargoPatches;
        sha256 = cargoSha256;