diff options
| author | Oleksii Filonenko <brightone@protonmail.com> | 2019-12-20 12:09:28 +0200 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2019-12-20 13:35:47 +0100 |
| commit | 2149652a479137d93a610ddfbd5c48a8ed300f6f (patch) | |
| tree | 4ff93194e8924531a8240d475bf099017bb0e250 /pkgs | |
| parent | be98fd4c6b9a96387e62b2638783066737d9a48a (diff) | |
| download | nixlib-2149652a479137d93a610ddfbd5c48a8ed300f6f.tar nixlib-2149652a479137d93a610ddfbd5c48a8ed300f6f.tar.gz nixlib-2149652a479137d93a610ddfbd5c48a8ed300f6f.tar.bz2 nixlib-2149652a479137d93a610ddfbd5c48a8ed300f6f.tar.lz nixlib-2149652a479137d93a610ddfbd5c48a8ed300f6f.tar.xz nixlib-2149652a479137d93a610ddfbd5c48a8ed300f6f.tar.zst nixlib-2149652a479137d93a610ddfbd5c48a8ed300f6f.zip | |
starship: 0.30.1 -> 0.31.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/starship/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 4fdc2bbda2a6..55e40c78a525 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform +, pkg-config, openssl +, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "19h6ahbqfrq5jfdjqxd7phzh1lanqqvkb1phr4fx6qnn5icj9hlm"; + sha256 = "1g4cpnlz2gx4c3cmqx3a69iwjs2cg8p86l0zd198h6fv8pa1i16y"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ (stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]); postPatch = '' substituteInPlace src/utils.rs \ --replace "/bin/echo" "echo" ''; - cargoSha256 = "0391l44rqshjz62658mfl58c2npv7k11l4lb4kk9gb3ywdhbjv26"; + cargoSha256 = "03qrcf0y6j22asp7x10di6xi8hgai84kvh1imiw9vibxp90868bh"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7798594670a9..4763d87d6578 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17642,7 +17642,9 @@ in stdmanpages = callPackage ../data/documentation/std-man-pages { }; - starship = callPackage ../tools/misc/starship { }; + starship = callPackage ../tools/misc/starship { + inherit (darwin.apple_sdk.frameworks) Security; + }; stig = callPackage ../applications/networking/p2p/stig { }; |