From 928eb9fc0b1ffee6d1a2facc8b97467aec66c473 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Mon, 15 Aug 2022 21:14:44 +0200 Subject: [PATCH] starship: 1.10.0 -> 1.10.1 --- pkgs/tools/misc/starship/default.nix | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 7875f01f1f07..608b495a8fa5 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -4,10 +4,8 @@ , rustPlatform , installShellFiles , libiconv -, libgit2 , cmake , fetchpatch -, pkg-config , nixosTests , Security , Foundation @@ -16,19 +14,18 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mumlnY9KGKdS3x4U84J4I8m5uMJI7SZR52aT6DPi/MM="; + sha256 = "sha256-ujv2lqhzsug9Qpco+4doMGH+0yG5cZZzLmSLr0MBmZk="; }; - nativeBuildInputs = [ installShellFiles cmake ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ installShellFiles cmake ]; - buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ]; buildNoDefaultFeatures = true; # the "notify" feature is currently broken on darwin @@ -41,15 +38,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoPatches = [ - # Bump chrono dependency to fix panic when no timezone - (fetchpatch { - url = "https://github.com/starship/starship/commit/e652e8643310c3b41ce19ad05b8168abc29bb683.patch"; - sha256 = "sha256-iGYLJuptPMc45E7o+GXjIx7y2PxuO1mGM7xSopDBve0="; - }) - ]; - - cargoSha256 = "sha256-w7UCExSkgEY52D98SSe2EkuiwtjM6t0/uTiafrtEBaU="; + cargoSha256 = "sha256-iZvjU/GzC/ssXcd+UeV57IA0hKT45cQ09VBB4BNYw50="; preCheck = '' HOME=$TMPDIR