diff options
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
3 files changed, 51 insertions, 50 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 0aea48cb0562..c38e34bf450d 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -10,9 +10,9 @@ let asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversionClient gzip libiconv; texinfo = texinfo5; - svnSupport = false; # for git-svn support - guiSupport = false; # requires tcl/tk - sendEmailSupport = false; # requires plenty of perl libraries + svnSupport = false; # for git-svn support + guiSupport = false; # requires tcl/tk + sendEmailSupport = false; # requires plenty of perl libraries perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; smtpPerlLibs = [ perlPackages.NetSMTP perlPackages.NetSMTPSSL @@ -24,17 +24,12 @@ let in rec { + # Try to keep this generally alphabetized - # support for bugzilla - git-bz = callPackage ./git-bz { }; + darcsToGit = callPackage ./darcs-to-git { }; git = appendToName "minimal" gitBase; - # Git with SVN support, but without GUI. - gitSVN = lowPrio (appendToName "with-svn" (gitBase.override { - svnSupport = true; - })); - # The full-featured Git. gitFull = gitBase.override { svnSupport = true; @@ -42,34 +37,42 @@ rec { sendEmailSupport = !stdenv.isDarwin; }; + # Git with SVN support, but without GUI. + gitSVN = lowPrio (appendToName "with-svn" (gitBase.override { + svnSupport = true; + })); + git-annex = pkgs.haskellPackages.git-annex-with-assistant; gitAnnex = git-annex; git-annex-remote-b2 = pkgs.goPackages.git-annex-remote-b2; - qgit = import ./qgit { - inherit fetchurl stdenv; - inherit (xorg) libXext libX11; - qt = qt4; - }; + # support for bugzilla + git-bz = callPackage ./git-bz { }; - qgitGit = import ./qgit/qgit-git.nix { - inherit fetchurl sourceFromHead stdenv; - inherit (xorg) libXext libX11; - qt = qt4; - }; + git-cola = callPackage ./git-cola { }; - stgit = import ./stgit { - inherit fetchurl stdenv python git; + git-crypt = callPackage ./git-crypt { }; + + git-extras = callPackage ./git-extras { }; + + git-imerge = callPackage ./git-imerge { }; + + git-radar = callPackage ./git-radar { }; + + git-remote-hg = callPackage ./git-remote-hg { }; + + git2cl = import ./git2cl { + inherit fetchgit stdenv perl; }; - topGit = lib.makeOverridable (import ./topgit) { - inherit stdenv fetchurl; + gitFastExport = import ./fast-export { + inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion; }; - tig = callPackage ./tig { }; + gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; - transcrypt = callPackage ./transcrypt { }; + gitflow = callPackage ./gitflow { }; hub = import ./hub { inherit go; @@ -77,14 +80,24 @@ rec { inherit (darwin) Security; }; - gitFastExport = import ./fast-export { - inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion; + qgit = import ./qgit { + inherit fetchurl stdenv; + inherit (xorg) libXext libX11; + qt = qt4; }; - git2cl = import ./git2cl { - inherit fetchgit stdenv perl; + qgitGit = import ./qgit/qgit-git.nix { + inherit fetchurl sourceFromHead stdenv; + inherit (xorg) libXext libX11; + qt = qt4; }; + stgit = import ./stgit { + inherit fetchurl stdenv python git; + }; + + subgit = callPackage ./subgit { }; + svn2git = import ./svn2git { inherit stdenv fetchurl ruby makeWrapper; git = gitSVN; @@ -92,23 +105,11 @@ rec { svn2git_kde = callPackage ./svn2git-kde { }; - subgit = callPackage ./subgit { }; - - darcsToGit = callPackage ./darcs-to-git { }; - - gitflow = callPackage ./gitflow { }; - - git-radar = callPackage ./git-radar { }; - - git-remote-hg = callPackage ./git-remote-hg { }; - - gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; - - git-extras = callPackage ./git-extras { }; - - git-cola = callPackage ./git-cola { }; + tig = callPackage ./tig { }; - git-imerge = callPackage ./git-imerge { }; + topGit = lib.makeOverridable (import ./topgit) { + inherit stdenv fetchurl; + }; - git-crypt = callPackage ./git-crypt { }; + transcrypt = callPackage ./transcrypt { }; } 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 c10ab14f6398..44a617d70e1f 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 @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "git-cola-${version}"; version = "2.2.1"; 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 ca6087ce318b..2878fec3c095 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.7.0"; + version = "2.7.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs"; + sha256 = "1zkbdmh5gvxalr8l1cwnirqq5raijmp2d0s36s6qabrlvqvq2yj7"; }; patches = [ |