diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/applications/version-management/git-and-tools | |
parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
download | nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.gz nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.bz2 nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.lz nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.xz nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.zst nixlib-d1df28f8e5b98be01417ffc1032020415390f2a0.zip |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
4 files changed, 39 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 584c880566ac..fa8f43a45c6f 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -8,7 +8,7 @@ let gitBase = lib.makeOverridable (import ./git) { inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl - tk makeWrapper subversionClient gzip libiconv; + tk makeWrapper subversionClient gzip openssh libiconv; texinfo = texinfo5; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 44a617d70e1f..77c2f45bbd5c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "git-cola-${version}"; - version = "2.2.1"; + version = "2.5"; src = fetchurl { url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; - sha256 = "1v1s9gx16xihdcck4qp92bdci8zc6pb5a3z3y8k9jqj97hfkw2nz"; + sha256 = "0ybjmlwm1plnvqi20y91ci7sgldzwlwn86vyyn9a157h7lf4ngb8"; }; buildInputs = [ makeWrapper gettext ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 82a3dc79d7c5..4f41ffb916ef 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip +{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio +, gnugrep, gzip, openssh , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs @@ -25,8 +26,16 @@ stdenv.mkDerivation { ./docbook2texi.patch ./symlinks-in-bin.patch ./git-sh-i18n.patch + ./ssh-path.patch ]; + postPatch = '' + for x in connect.c git-gui/lib/remote_add.tcl ; do + substituteInPlace "$x" \ + --subst-var-by ssh "${openssh}/bin/ssh" + done + ''; + buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ] diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch new file mode 100644 index 000000000000..26db3d810823 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch @@ -0,0 +1,26 @@ +diff --git a/connect.c b/connect.c +index fd7ffe1..20cd992 100644 +--- a/connect.c ++++ b/connect.c +@@ -768,7 +768,7 @@ struct child_process *git_connect(int fd[2], const char *url, + + ssh = getenv("GIT_SSH"); + if (!ssh) +- ssh = "ssh"; ++ ssh = "@ssh@"; + + ssh_dup = xstrdup(ssh); + base = basename(ssh_dup); +diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl +index 50029d0..17b9594 100644 +--- a/git-gui/lib/remote_add.tcl ++++ b/git-gui/lib/remote_add.tcl +@@ -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) + } |