Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'

4 files changed, 13 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index 7a47ed9a992d..2d171df8bf24 100644
--- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -15,6 +15,8 @@ python2Packages.buildPythonApplication rec {
 
   buildInputs = [ git graphviz ];
 
+  checkInputs = [ git ];
+
   postFixup = ''
     wrapProgram $out/bin/git-big-picture \
       --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs  }
diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index ba126bb476c1..ded9bcc2ffdf 100644
--- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "git-hub-${version}";
-  version = "1.0.1";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
-    sha256 = "1lizjyi8vac1p1anbnh6qrr176rwxp5yjc1787asw437sackkwza";
+    sha256 = "03mz64lzicbxxz9b202kqs5ysf82sgb7lw967wkjdy2wbpqk8j0z";
     rev = "v${version}";
     repo = "git-hub";
     owner = "sociomantic-tsunami";
diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index fb85bb7da463..211685c8edb4 100644
--- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "git-secrets-${version}";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "git-secrets";
     rev = "${version}";
-    sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg";
+    sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 8ae600ed3605..9f18beda7f93 100644
--- a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux, git, glibcLocales }:
+{ stdenv, buildGoPackage, fetchFromGitHub, groff, Security, utillinux }:
 
 buildGoPackage rec {
   pname = "hub";
-  version = "2.9.0";
+  version = "2.10.0";
 
   goPackagePath = "github.com/github/hub";
 
@@ -13,12 +13,11 @@ buildGoPackage rec {
     owner = "github";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0yxpr606xx23l8823hjqj16cvjjrwb28c7z08ml1pkfvaf7w4n81";
+    sha256 = "1vvrc3k81jm9c664g0j9666i7ypn7n7jfyj4gxcybq3sg2d4di27";
   };
 
-  nativeBuildInputs = [ groff ronn utillinux glibcLocales ];
-  buildInputs = [ ruby ] ++
-    stdenv.lib.optional stdenv.isDarwin Security;
+  nativeBuildInputs = [ groff utillinux ];
+  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
   postPatch = ''
     patchShebangs .
@@ -30,7 +29,8 @@ buildGoPackage rec {
     install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub"
     install -D etc/hub.fish_completion  "$bin/share/fish/vendor_completions.d/hub.fish"
 
-    PATH=$PATH:${git}/bin LC_ALL=en_US.utf-8 make man-pages
+    LC_ALL=C.UTF8 \
+    make man-pages
     cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/
   '';