Merge master into staging-next

2021-03-25 12:06:22 +00:00
parent 8cebf1dc19 c0e8818520
commit 4dc869e403
45 changed files with 1471 additions and 1082 deletions
@@ -12,13 +12,14 @@ rustPlatform.buildRustPackage rec {
  pname = "crate2nix";
  version = "0.9.0";

-  src = fetchFromGitHub
-    {
-      owner = "kolloch";
-      repo = pname;
-      rev = version;
-      sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
-    } + "/crate2nix";
+  src = fetchFromGitHub {
+    owner = "kolloch";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
+  };
+
+  sourceRoot = "source/crate2nix";

  cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik=";