Merge branch 'master' into staging

2020-05-22 09:13:23 +00:00
parent eae4f22176 5de1e307f2
commit 16d7f7edae
290 changed files with 7699 additions and 2328 deletions
@@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "gitui";
-  version = "0.2.5";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "extrawurst";
    repo = pname;
    rev = "v${version}";
-    sha256 = "12zqsnkask2hhbvvyym4w21yx9rgwpqx2mnj6qds3y2qmcy1yhi4";
+    sha256 = "0rdaschf6030zprz81g7xnx57idjsq3bjhjp5d9387ha5njq0bp1";
  };

-  cargoSha256 = "1kbaqpfj7b9asyyqjdljyga3v428yzlsgpnn9187hf4ydhpr6zrz";
+  cargoSha256 = "1k24xabhgwwdvslq81w6b8jnnjxbafj4s0zpcq2c4hals2xxwfy4";

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