Merge master into staging-next

2020-12-20 00:43:57 +00:00
parent 9f677fc6b8 3c6445b97e
commit d491b49037
25 changed files with 128 additions and 135 deletions
@@ -39,6 +39,7 @@ with pkgs;
  cross = callPackage ./cross {};

  rustCustomSysroot = callPackage ./rust-sysroot {};
+  buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { };

  nixos-functions = callPackage ./nixos-functions {};