diff options
| author | Florian Klink <flokli@flokli.de> | 2020-06-01 23:51:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 23:51:34 +0200 |
| commit | 687a09705f9c3301ae085f6c6275cdf875547a39 (patch) | |
| tree | 3d422b1649902d688e72b29b8312d74f5ed221e9 /pkgs/applications | |
| parent | 4a4adb273364f23ecc0cd021365d7be57987c495 (diff) | |
| parent | 5cb2c698599932a655e2a3ea216b62f7e825a3fc (diff) | |
Merge pull request #89279 from mweinelt/zsh-powerlevel10k/v1.11.0
zsh-powerlevel10k: v1.7.0 -> v1.11.0
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/gitstatus/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index eab382386ef68..33048c95b670d 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -1,14 +1,14 @@ { callPackage, stdenv, fetchFromGitHub, ...}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gitstatus"; - version = "unstable-2020-04-21"; + version = "1.1.3"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "3494f25b0b3b2eac241cf669d1fea2b49ea42fb3"; - sha256 = "0b4g14dkkgih6zps2w1krl9xf44ysj02617zj1k51z127v2lpm1f"; + rev = "v${version}"; + sha256 = "16s09d2kpw0v0kyr2ada99qmsi0pqnsiis22mzq69hay0hdg8p1n"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; @@ -24,7 +24,6 @@ stdenv.mkDerivation { description = "10x faster implementation of `git status` command"; homepage = "https://github.com/romkatv/gitstatus"; license = [ licenses.gpl3 ]; - maintainers = with maintainers; [ mmlb hexa ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index e4cd58bf0f02c..2f99c88a37bc6 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -6,16 +6,17 @@ libgit2.overrideAttrs (oldAttrs: { "-DBUILD_SHARED_LIBS=OFF" "-DREGEX_BACKEND=builtin" "-DUSE_BUNDLED_ZLIB=ON" + "-DUSE_GSSAPI=OFF" "-DUSE_HTTPS=OFF" "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 - "-DUSE_ICONV=OFF" + "-DUSE_NTLMCLIENT=OFF" "-DUSE_SSH=OFF" "-DZERO_NSEC=ON" ]; src = fetchFromGitHub { owner = "romkatv"; repo = "libgit2"; - rev = "bb77509f4436901f3958e30272026f63d2247d7d"; - sha256 = "06iypr0sc6g11xipwfbgm6f039d4qy9krmwb3zww8k4y004s5jcv"; + rev = "tag-005f77dca6dbe8788e55139fa1199fc94cc04f9a"; + sha256 = "1h5bnisk4ljdpfzlv8g41m8js9841xyjhfywc5cn8pmyv58c50il"; }; }) |