Merge branch 'master' into staging-next

2020-10-22 21:20:14 +02:00
parent 90094b0468 4cada0cd31
commit d13fc932cd
103 changed files with 820 additions and 463 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "gitstatus";
-  version = "1.3.0";
+  version = "1.3.1";

  src = fetchFromGitHub {
    owner = "romkatv";
    repo = "gitstatus";
    rev = "v${version}";
-    sha256 = "0zan1sa8c24hpqwj66y9srd4n15f4nk64fc5jrd4smgfgn22wph8";
+    sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf";
  };

  buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
@@ -16,7 +16,7 @@ libgit2.overrideAttrs (oldAttrs: {
  src = fetchFromGitHub {
    owner = "romkatv";
    repo = "libgit2";
-    rev = "tag-005f77dca6dbe8788e55139fa1199fc94cc04f9a";
-    sha256 = "1h5bnisk4ljdpfzlv8g41m8js9841xyjhfywc5cn8pmyv58c50il";
+    rev = "tag-82cefe2b42300224ad3c148f8b1a569757cc617a";
+    sha256 = "1vhnqynqyxizzkq1h5dfjm75f0jm5637jh0gypwqqz2yjqrscza0";
  };
 })