diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-06-15 11:19:41 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-06-15 11:19:41 +0200 |
commit | 91171e295574bd7721cafeaf4200c807952275a7 (patch) | |
tree | 1ae75ec1cb3b0fca7bf6bab29071e0f67cbe404d /pkgs/applications/version-management | |
parent | f2ba460019c8ceb7af3967520f98a6836e759217 (diff) | |
parent | 4b7c8d538e1aed2bc30b6e7eb1cbd96063ad4132 (diff) | |
download | nixpkgs-91171e295574bd7721cafeaf4200c807952275a7.tar nixpkgs-91171e295574bd7721cafeaf4200c807952275a7.tar.gz nixpkgs-91171e295574bd7721cafeaf4200c807952275a7.tar.bz2 nixpkgs-91171e295574bd7721cafeaf4200c807952275a7.tar.lz nixpkgs-91171e295574bd7721cafeaf4200c807952275a7.tar.xz nixpkgs-91171e295574bd7721cafeaf4200c807952275a7.tar.zst nixpkgs-91171e295574bd7721cafeaf4200c807952275a7.zip |
Merge branch 'master' into staging-next
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/gitstatus/default.nix | 4 |
1 files changed, 2 insertions, 2 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 f4b74405eba..3817ce7fa4f 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.4.4"; + version = "1.5.1"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "1w5kpca2v6iii912riywp1jscq7cpr5xv93mglr30pjnar1mk8gs"; + sha256 = "1ffgh5826985phc8amvzl9iydvsnij5brh4gczfh201vfmw9d4hh"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; |