git: bumped version to 2.16.3

default.nix

@@ -1,166 +1,166 b''
 # Nix environment for the community edition
 #
 # This shall be as lean as possible, just producing the rhodecode-vcsserver
 # derivation. For advanced tweaks to pimp up the development environment we use
 # "shell.nix" so that it does not have to clutter this file.
 
 { pkgs ? (import <nixpkgs> {})
 , pythonPackages ? "python27Packages"
 , pythonExternalOverrides ? self: super: {}
 , doCheck ? true
 }:
 
 let pkgs_ = pkgs; in
 
 let
   pkgs = pkgs_.overridePackages (self: super: {
     # bump GIT version
     git = pkgs.lib.overrideDerivation pkgs_.git (oldAttrs: {
-      name = "git-2.13.5";
+      name = "git-2.16.3";
       src = pkgs.fetchurl {
-        url = "https://www.kernel.org/pub/software/scm/git/git-2.13.5.tar.xz";
-        sha256 = "18fi18103n7grshm4ffb0fwsnvbl48sbqy5gqx528vf8maff5j91";
+        url = "https://www.kernel.org/pub/software/scm/git/git-2.16.3.tar.xz";
+        sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn";
       };
 
       patches = [
         ./pkgs/git_patches/docbook2texi.patch
         ./pkgs/git_patches/symlinks-in-bin.patch
         ./pkgs/git_patches/git-sh-i18n.patch
         ./pkgs/git_patches/ssh-path.patch
       ];
 
     });
 
     # Override subversion derivation to
     #  - activate python bindings
     subversion = let
       subversionWithPython = super.subversion.override {
         httpSupport = true;
         pythonBindings = true;
         python = self.python27Packages.python;
       };
 
     in
 
     pkgs.lib.overrideDerivation subversionWithPython (oldAttrs: {
       name = "subversion-1.9.7";
       src = pkgs.fetchurl {
         url = "https://www.apache.org/dist/subversion/subversion-1.9.7.tar.gz";
         sha256 = "0g3cs2h008z8ymgkhbk54jp87bjh7y049rn42igj881yi2f20an7";
       };
 
     });
 
   });
 
   inherit (pkgs.lib) fix extends;
   basePythonPackages = with builtins; if isAttrs pythonPackages
     then pythonPackages
     else getAttr pythonPackages pkgs;
 
   elem = builtins.elem;
   basename = path: with pkgs.lib; last (splitString "/" path);
   startsWith = prefix: full: let
     actualPrefix = builtins.substring 0 (builtins.stringLength prefix) full;
   in actualPrefix == prefix;
 
   src-filter = path: type: with pkgs.lib;
     let
       ext = last (splitString "." path);
     in
       !elem (basename path) [".hg" ".git" "__pycache__" ".eggs"
         "node_modules" "build" "data" "tmp"] &&
       !elem ext ["egg-info" "pyc"] &&
       !startsWith "result" path;
 
   rhodecode-vcsserver-src = builtins.filterSource src-filter ./.;
 
   pythonGeneratedPackages = self: basePythonPackages.override (a: {
     inherit self;
   }) // (scopedImport {
     self = self;
     super = basePythonPackages;
     inherit pkgs;
     inherit (pkgs) fetchurl fetchgit;
   } ./pkgs/python-packages.nix);
 
   pythonOverrides = import ./pkgs/python-packages-overrides.nix {
     inherit basePythonPackages pkgs;
   };
 
   version = builtins.readFile ./vcsserver/VERSION;
 
   pythonLocalOverrides = self: super: {
     rhodecode-vcsserver = super.rhodecode-vcsserver.override (attrs: {
       inherit doCheck version;
 
       name = "rhodecode-vcsserver-${version}";
       releaseName = "RhodeCodeVCSServer-${version}";
       src = rhodecode-vcsserver-src;
       dontStrip = true; # prevent strip, we don't need it.
 
       propagatedBuildInputs = attrs.propagatedBuildInputs ++ ([
         pkgs.git
         pkgs.subversion
       ]);
 
       # TODO: johbo: Make a nicer way to expose the parts. Maybe
       # pkgs/default.nix?
       passthru = {
         pythonPackages = self;
       };
 
       # Add VCSServer bin directory to path so that tests can find 'vcsserver'.
       preCheck = ''
         export PATH="$out/bin:$PATH"
       '';
 
       # put custom attrs here
       checkPhase = ''
         runHook preCheck
         PYTHONHASHSEED=random py.test -p no:sugar -vv --cov-config=.coveragerc --cov=vcsserver --cov-report=term-missing vcsserver
         runHook postCheck
       '';
 
       postInstall = ''
         echo "Writing meta information for rccontrol to nix-support/rccontrol"
         mkdir -p $out/nix-support/rccontrol
         cp -v vcsserver/VERSION $out/nix-support/rccontrol/version
         echo "DONE: Meta information for rccontrol written"
 
         # python based programs need to be wrapped
         ln -s ${self.pyramid}/bin/* $out/bin/
         ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
 
         # Symlink version control utilities
         #
         # We ensure that always the correct version is available as a symlink.
         # So that users calling them via the profile path will always use the
         # correct version.
         ln -s ${self.python}/bin/python $out/bin
         ln -s ${pkgs.git}/bin/git $out/bin
         ln -s ${self.mercurial}/bin/hg $out/bin
         ln -s ${pkgs.subversion}/bin/svn* $out/bin
 
         for file in $out/bin/*;
         do
           wrapProgram $file \
             --set PATH $PATH \
             --set PYTHONPATH $PYTHONPATH \
             --set PYTHONHASHSEED random
         done
 
       '';
 
     });
   };
 
   # Apply all overrides and fix the final package set
   myPythonPackages =
     (fix
     (extends pythonExternalOverrides
     (extends pythonLocalOverrides
     (extends pythonOverrides
              pythonGeneratedPackages))));
 
 in myPythonPackages.rhodecode-vcsserver

pkgs/git_patches/git-sh-i18n.patch

@@ -1,94 +1,94 b''
 --- a/git-sh-i18n.sh
 +++ b/git-sh-i18n.sh
 @@ -15,87 +15,11 @@
  fi
  export TEXTDOMAINDIR
 
 -# First decide what scheme to use...
 -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
--if test -n "@@USE_GETTEXT_SCHEME@@"
+-if test -n "$GIT_GETTEXT_POISON"
+-then
+-	GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
+-elif test -n "@@USE_GETTEXT_SCHEME@@"
 -then
 -	GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
 -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
 -then
 -	: no probing necessary
--elif test -n "$GIT_GETTEXT_POISON"
--then
--	GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
 -elif type gettext.sh >/dev/null 2>&1
 -then
 -	# GNU libintl's gettext.sh
 -	GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
 -elif test "$(gettext -h 2>&1)" = "-h"
 -then
 -	# gettext binary exists but no gettext.sh. likely to be a gettext
 -	# binary on a Solaris or something that is not GNU libintl and
 -	# lack eval_gettext.
 -	GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext
 -fi
 -export GIT_INTERNAL_GETTEXT_SH_SCHEME
 -
 -# ... and then follow that decision.
 -case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
 -gnu)
 -	# Use libintl's gettext.sh, or fall back to English if we can't.
 -	. gettext.sh
 -	;;
 -gettext_without_eval_gettext)
 -	# Solaris has a gettext(1) but no eval_gettext(1)
 -	eval_gettext () {
 -		gettext "$1" | (
 -			export PATH $(git sh-i18n--envsubst --variables "$1");
 -			git sh-i18n--envsubst "$1"
 -		)
 -	}
 -
 -	eval_ngettext () {
 -		ngettext "$1" "$2" "$3" | (
 -			export PATH $(git sh-i18n--envsubst --variables "$2");
 -			git sh-i18n--envsubst "$2"
 -		)
 -	}
 -	;;
 -poison)
 -	# Emit garbage so that tests that incorrectly rely on translatable
 -	# strings will fail.
 -	gettext () {
 -		printf "%s" "# GETTEXT POISON #"
 -	}
 -
 -	eval_gettext () {
 -		printf "%s" "# GETTEXT POISON #"
 -	}
 -
 -	eval_ngettext () {
 -		printf "%s" "# GETTEXT POISON #"
 -	}
 -	;;
 -*)
 -	gettext () {
 -		printf "%s" "$1"
 -	}
 -
 -	eval_gettext () {
 -		printf "%s" "$1" | (
 -			export PATH $(git sh-i18n--envsubst --variables "$1");
 -			git sh-i18n--envsubst "$1"
 -		)
 -	}
 +# GNU gettext
 +export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
 +export PATH=@gettext@/bin:$PATH
 
 -	eval_ngettext () {
 -		(test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
 -			export PATH $(git sh-i18n--envsubst --variables "$2");
 -			git sh-i18n--envsubst "$2"
 -		)
 -	}
 -	;;
 -esac
 +. @gettext@/bin/gettext.sh
 
  # Git-specific wrapper functions
  gettextln () {

pkgs/git_patches/ssh-path.patch

@@ -1,26 +1,26 b''
 diff --git a/connect.c b/connect.c
-index fd7ffe1..20cd992 100644
+index c3a014c5b..fbca3262b 100644
 --- a/connect.c
 +++ b/connect.c
-@@ -768,7 +768,7 @@
+@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
 
  				ssh = getenv("GIT_SSH");
  				if (!ssh)
 -					ssh = "ssh";
 +					ssh = "@ssh@";
-				else
-					handle_ssh_variant(ssh, 0,
-								&port_option,
+ 		variant = determine_ssh_variant(ssh, 0);
+ 	}
+
 diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
-index 50029d0..17b9594 100644
+index 480a6b30d..781720424 100644
 --- a/git-gui/lib/remote_add.tcl
 +++ b/git-gui/lib/remote_add.tcl
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@ method _add {} {
  		# Parse the location
  		if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]
  		     || [regexp {([^:][^:]+):(.+)} $location xx host path]} {
 -			set ssh ssh
 +			set ssh @ssh@
  			if {[info exists env(GIT_SSH)]} {
  				set ssh $env(GIT_SSH)
  			}