git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #89279 from mweinelt/zsh-powerlevel10k/v1.11.0

zsh-powerlevel10k: v1.7.0 -> v1.11.0

commit687a09705f9c3301ae085f6c6275cdf875547a39 authorFlorian Klink <flokli@flokli.de> dateMon 1 Jun 2020, 23:51 (6 years ago) parent4a4adb25cb2c69
4 files changed+13−15
pkgs/applications/version-management/git-and-tools/gitstatus/default.nix+4−5 pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix+4−3 pkgs/shells/zsh/zsh-powerlevel10k/default.nix+3−4 pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch+2−3
pkgs/applications/version-management/git-and-tools/gitstatus/default.nix+4−5
@@ -1,14 +1,14 @@
11{ callPackage, stdenv, fetchFromGitHub, ...}:
22
3−stdenv.mkDerivation {
3+stdenv.mkDerivation rec {
44 pname = "gitstatus";
5− version = "unstable-2020-04-21";
5+ version = "1.1.3";
66
77 src = fetchFromGitHub {
88 owner = "romkatv";
99 repo = "gitstatus";
10− rev = "3494f25b0b3b2eac241cf669d1fea2b49ea42fb3";
11− sha256 = "0b4g14dkkgih6zps2w1krl9xf44ysj02617zj1k51z127v2lpm1f";
10+ rev = "v${version}";
11+ sha256 = "16s09d2kpw0v0kyr2ada99qmsi0pqnsiis22mzq69hay0hdg8p1n";
1212 };
1313
1414 buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
@@ -24,7 +24,6 @@ stdenv.mkDerivation {
2424 description = "10x faster implementation of `git status` command";
2525 homepage = "https://github.com/romkatv/gitstatus";
2626 license = [ licenses.gpl3 ];
27−
2827 maintainers = with maintainers; [ mmlb hexa ];
2928 };
3029}
pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix+4−3
@@ -6,16 +6,17 @@ libgit2.overrideAttrs (oldAttrs: {
66 "-DBUILD_SHARED_LIBS=OFF"
77 "-DREGEX_BACKEND=builtin"
88 "-DUSE_BUNDLED_ZLIB=ON"
9+ "-DUSE_GSSAPI=OFF"
910 "-DUSE_HTTPS=OFF"
1011 "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2
11− "-DUSE_ICONV=OFF"
12+ "-DUSE_NTLMCLIENT=OFF"
1213 "-DUSE_SSH=OFF"
1314 "-DZERO_NSEC=ON"
1415 ];
1516 src = fetchFromGitHub {
1617 owner = "romkatv";
1718 repo = "libgit2";
18− rev = "bb77509f4436901f3958e30272026f63d2247d7d";
19− sha256 = "06iypr0sc6g11xipwfbgm6f039d4qy9krmwb3zww8k4y004s5jcv";
19+ rev = "tag-005f77dca6dbe8788e55139fa1199fc94cc04f9a";
20+ sha256 = "1h5bnisk4ljdpfzlv8g41m8js9841xyjhfywc5cn8pmyv58c50il";
2021 };
2122})
pkgs/shells/zsh/zsh-powerlevel10k/default.nix+3−4
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "powerlevel10k";
8− version = "1.7.0";
8+ version = "1.11.0";
99
1010 src = fetchFromGitHub {
1111 owner = "romkatv";
1212 repo = "powerlevel10k";
1313 rev = "v${version}";
14− sha256 = "04j37qmgzj62gixysj3di9dccfib4hx1c4ld9kcms3ag7k403bgj";
14+ sha256 = "1z6abvp642n40biya88n86ff1wiry00dlwawqwxp7q5ds55jhbv1";
1515 };
1616
1717 patches = [
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
2525 install -D powerlevel10k.zsh-theme --target-directory=$out/share/zsh-powerlevel10k
2626 install -D config/* --target-directory=$out/share/zsh-powerlevel10k/config
2727 install -D internal/* --target-directory=$out/share/zsh-powerlevel10k/internal
28− rm -r gitstatus/bin
29− install -D gitstatus/* --target-directory=$out/share/zsh-powerlevel10k/gitstatus
28+ cp -R gitstatus $out/share/zsh-powerlevel10k/gitstatus
3029 '';
3130
3231 meta = {
pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch+2−3
@@ -1,8 +1,8 @@
11diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh
2−index 46d0b3c..b082e24 100644
2+index b469072..eb1e3be 100644
33--- a/gitstatus/gitstatus.plugin.zsh
44+++ b/gitstatus/gitstatus.plugin.zsh
5−@@ -53,6 +53,8 @@
5+@@ -44,6 +44,8 @@
66
77 [[ -o 'interactive' ]] || 'return'
88
@@ -11,4 +11,3 @@ index 46d0b3c..b082e24 100644
1111 # Temporarily change options.
1212 'builtin' 'local' '-a' '_gitstatus_opts'
1313 [[ ! -o 'aliases' ]] || _gitstatus_opts+=('aliases')
14−