summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2020-10-02 04:38:56 -0500
committerGitHub <noreply@github.com>2020-10-02 04:38:56 -0500
commit16a679f1b8673f56fad13180ce0f6cdc76a136b0 (patch)
tree7bad590fa13e30cbc9683dbcff90791cf29e090b
parentMerge pull request #99328 from oxzi/claws-mail-v3.17.7 (diff)
parentstarship: 0.44.0 -> 0.45.2 (diff)
downloadnixpkgs-16a679f1b8673f56fad13180ce0f6cdc76a136b0.tar.gz
Merge pull request #99138 from marsam/update-starship
starship: 0.44.0 -> 0.45.0
-rw-r--r--pkgs/tools/misc/starship/default.nix39
1 files changed, 20 insertions, 19 deletions
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index a170eef35fb2..3cc56d87c62c 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -1,15 +1,22 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, installShellFiles
-, libiconv, Security }:
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, openssl
+, installShellFiles
+, libiconv
+, Security
+}:
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "0.44.0";
+ version = "0.45.2";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
- sha256 = "1pxrg5sfqqkvqww3fabq64j1fg03v5fj5yvm2xg2qa5n2f2qwnhi";
+ sha256 = "0kxmgx4pnayp3jf6cgmka05x3aymxr79rim5nff6k3cg5zaqrz59";
};
nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
@@ -17,28 +24,22 @@ rustPlatform.buildRustPackage rec {
buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
- postPatch = ''
- substituteInPlace src/utils.rs \
- --replace "/bin/echo" "echo"
- '';
-
postInstall = ''
for shell in bash fish zsh; do
- $out/bin/starship completions $shell > starship.$shell
+ STARSHIP_CACHE=$TMPDIR $out/bin/starship completions $shell > starship.$shell
installShellCompletion starship.$shell
done
'';
- cargoSha256 = "1b5gsw7jpiqjc7kbwf2kp6h6ks7jcgygrwzvn2akz86z40sskyg3";
-
- preCheck = ''
- substituteInPlace tests/testsuite/common.rs \
- --replace "./target/debug/starship" "./$releaseDir/starship"
- substituteInPlace tests/testsuite/python.rs \
- --replace "#[test]" "#[test] #[ignore]"
- '';
+ cargoSha256 = "0x9a322anwrgpxfqrvqb1ikavp8qffa93wdvj5kln1d2rgmxr2sy";
- checkFlagsArray = [ "--skip=directory::home_directory" "--skip=directory::directory_in_root" ];
+ checkFlags = [
+ "--skip=directory_in_home"
+ "--skip=fish_directory_in_home"
+ "--skip=home_directory"
+ "--skip=truncated_directory_in_home"
+ "--skip=directory_in_root"
+ ];
meta = with stdenv.lib; {
description = "A minimal, blazing fast, and extremely customizable prompt for any shell";