Merge branch 'staging-next' into staging

2020-09-29 00:12:29 +02:00
parent a7218d6914 695fd81e02
commit 32b4375f10
306 changed files with 4799 additions and 1779 deletions
@@ -15,8 +15,7 @@ rustPlatform.buildRustPackage rec {

  buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];

-  #checkFlagsArray = [ "--test-threads=1" ];
-  doCheck = false;
+  cargoParallelTestThreads = false;

  meta = with stdenv.lib; {
    homepage = "https://github.com/MitMaro/git-interactive-rebase-tool";