From e9ee34c806d085109672f42cdd60ea9635af1028 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 26 Jun 2020 04:20:00 -0500 Subject: [PATCH 1/3] starship: install completions --- pkgs/tools/misc/starship/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 3fec20f95bb..5352b13675f 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, installShellFiles , libiconv, Security }: rustPlatform.buildRustPackage rec { @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "17wc9f07308a97dsmrkq74w2r639sqms0hwh8gavwxycj7wq7xz2"; }; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -22,6 +22,13 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; + postInstall = '' + for shell in bash fish zsh; do + $out/bin/starship completions $shell > starship.$shell + installShellCompletion starship.$shell + done + ''; + cargoSha256 = "1nvs68qxygi2l43vxw890r40px35dvzbcg6qmrm09g60ykd8pjv2"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; From 10d6387543d1ea442504e670a4440436d4d0020a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 26 Jun 2020 04:20:00 -0500 Subject: [PATCH 2/3] starship: add marsam to maintainers --- pkgs/tools/misc/starship/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 5352b13675f..5ce9898a854 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; homepage = "https://starship.rs"; license = licenses.isc; - maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman ]; + maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman marsam ]; platforms = platforms.all; }; } From 43423a31d3833711fc95a1c99c030396020f99e7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 26 Jun 2020 20:00:00 -0500 Subject: [PATCH 3/3] starship: 0.42.0 -> 0.43.0 --- pkgs/tools/misc/starship/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 5ce9898a854..0112c0ea686 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "17wc9f07308a97dsmrkq74w2r639sqms0hwh8gavwxycj7wq7xz2"; + sha256 = "16ch3dhwgwmdalif3cyi3x4vrpww546wspcwc4xi0k7lp2zppbwf"; }; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -29,8 +29,16 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "1nvs68qxygi2l43vxw890r40px35dvzbcg6qmrm09g60ykd8pjv2"; - checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; + cargoSha256 = "09lq9ngnwg5z2l2y2ah8ng4cl8afb4gy4djwiq9yv61sjlqbr1y2"; + + preCheck = '' + substituteInPlace tests/testsuite/common.rs \ + --replace "./target/debug/starship" "./$releaseDir/starship" + substituteInPlace tests/testsuite/python.rs \ + --replace "#[test]" "#[test] #[ignore]" + ''; + + checkFlagsArray = [ "--skip=directory::home_directory" "--skip=directory::directory_in_root" ]; meta = with stdenv.lib; { description = "A minimal, blazing fast, and extremely customizable prompt for any shell";