Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-02-05 12:19:39 +00:00
committed by GitHub
24 changed files with 124 additions and 66 deletions
@@ -1,21 +1,22 @@
{ lib, stdenv, ncurses5, fetchFromGitHub, rustPlatform, libiconv, Security }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
rustPlatform.buildRustPackage rec {
pname = "git-interactive-rebase-tool";
version = "1.2.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "MitMaro";
repo = pname;
rev = version;
sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q";
sha256 = "117zwxyq2vc33nbnfpjbdr5vc2l5ymf6ln1dm5551ha3y3gdq3bf";
};
cargoSha256 = "0jc6mhszxmwsdjk73wkfi0jjp9vkzzl9kk0dbnry6w7dyr5if8cc";
cargoSha256 = "051llwk9swq03xdqwyj0hlyv2ywq2f1cnks95nygyy393q7v930x";
buildInputs = [ ncurses5 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
cargoParallelTestThreads = false;
# external_editor::tests::* tests fail
doCheck = false;
meta = with lib; {
homepage = "https://github.com/MitMaro/git-interactive-rebase-tool";