Merge staging-next into staging

2021-02-27 00:37:54 +00:00
parent 403c2803dc 84d3bc409b
commit e8162c62e3
62 changed files with 2643 additions and 2530 deletions
@@ -21,14 +21,6 @@ buildRustPackage rec {

  SODIUM_USE_PKG_CONFIG = "yes";

-  installPhase = ''
-    runHook preInstall
-
-    install -D $releaseDir/tox-node $out/bin/tox-node
-
-    runHook postInstall
-  '';
-
  doCheck = false;

  cargoSha256 = "sha256-kCT2ulB+c2OlsABkyXyzrHfD/G92EPCdTO34FR5oSws=";