From 8af37a3bf06b447e9ef8f0d4e95d5e51a53493a2 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sun, 22 Dec 2019 17:58:21 +0200 Subject: [PATCH 1/2] starship: 0.31.0 -> 0.32.1 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 55e40c78a52..c525e25ae06 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.31.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1g4cpnlz2gx4c3cmqx3a69iwjs2cg8p86l0zd198h6fv8pa1i16y"; + sha256 = "047nvi231hzwjfci13x8lhszmaccb94mn5lvnyq24zb0im8br6d3"; }; nativeBuildInputs = [ pkg-config ]; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "03qrcf0y6j22asp7x10di6xi8hgai84kvh1imiw9vibxp90868bh"; + cargoSha256 = "0r1kbv6f5v95wnshxj1wkqvp1adyrivzlr606c6blhl9z9j7m3d7"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { From 3715a75d169e661a9f1d90b55898d10ce6a3befa Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sun, 22 Dec 2019 18:07:58 +0200 Subject: [PATCH 2/2] starship: remove openssl from buildInputs No longer necessary, as v0.32.1 started using rustls. https://github.com/starship/starship/commit/d1b725a47cda1047546fb3998ff8f8a61ed4a48b --- pkgs/tools/misc/starship/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index c525e25ae06..5a708c04db3 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub, rustPlatform -, pkg-config, openssl , libiconv, Security }: rustPlatform.buildRustPackage rec { @@ -13,8 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "047nvi231hzwjfci13x8lhszmaccb94mn5lvnyq24zb0im8br6d3"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ (stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]); + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; postPatch = '' substituteInPlace src/utils.rs \