diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:29:24 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:29:24 -0800 |
commit | 9a16965c751b90e2674ba8bb8ec25582cf631f29 (patch) | |
tree | cca818753e0db7af49db0e3e33dbfd4d86f9dbf7 /pkgs/applications/version-management/git-and-tools | |
parent | 3b8270ac54b9e1892e5ed465ac01a61cd575863f (diff) | |
parent | 2d666e4bf69a81a731f87a06aa54e3dd1dde217d (diff) | |
download | nixpkgs-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar nixpkgs-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.gz nixpkgs-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.bz2 nixpkgs-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.lz nixpkgs-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.xz nixpkgs-9a16965c751b90e2674ba8bb8ec25582cf631f29.tar.zst nixpkgs-9a16965c751b90e2674ba8bb8ec25582cf631f29.zip |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/python-modules/awesomeversion/default.nix pkgs/development/python-modules/md2gemini/default.nix pkgs/development/python-modules/mill-local/default.nix pkgs/development/python-modules/pyatv/default.nix pkgs/development/python-modules/pyezviz/default.nix pkgs/development/python-modules/pyinsteon/default.nix pkgs/development/python-modules/pylitterbot/default.nix pkgs/development/python-modules/pynuki/default.nix pkgs/development/python-modules/pypck/default.nix pkgs/development/python-modules/types-requests/default.nix pkgs/top-level/aliases.nix
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/gitui/default.nix | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 24ba62a6908..e5058ad48e6 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,18 +1,30 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libiconv +, openssl +, pkg-config +, xclip +, AppKit +, Security +}: + rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.19.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PNyXmXHS8StJhx6Qko7zbXrX1CX3owC1HmyX9VV7tEg="; + sha256 = "sha256-zYM0JVhgFnp8JDBx9iEOt029sr8azIPX5jrtvUE/Pn0="; }; - cargoSha256 = "sha256-Q6QUxIe5bkoEcxZZwhJbihaHhSsX8SLqWzmjp8hFsS4="; + cargoSha256 = "sha256-kbLI95GzCwm2OKzzpk7jvgtm8vArf29u5BiPRTh2OmE="; + + nativeBuildInputs = [ pkg-config ]; - nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isLinux xclip ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; @@ -21,7 +33,7 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; meta = with lib; { - description = "Blazing fast terminal-ui for git written in rust"; + description = "Blazing fast terminal-ui for Git written in Rust"; homepage = "https://github.com/extrawurst/gitui"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne yanganto ]; |