Commit Graph

150 Commits

Author SHA1 Message Date
Eelco Dolstra
36ee5c61c3 Rename git -> git-minimal, git-full -> git
Since most people probably want the full Git.
2014-03-11 17:00:17 +01:00
Moritz Ulrich
b4f93af3c9
Update git and related tools to latest releases.
Git     -> 1.8.5.1
stgit   -> 0.16
svn2git -> 2.2.2

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-09 00:15:25 +00:00
Bjørn Forsman
9b6fb1ebd5 tig: bump 1.1 -> 1.2.1
XML_CATALOG_FILES is needed to be able to build the asciidoc
documentation/manpages in this new version.
2013-11-09 19:06:09 +01:00
Jaka Hudoklin
11fd5db060 Add gitflow
A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model
2013-10-30 11:37:57 +01:00
aszlig
efa748a166
git-and-tools/hub: Update to version 1.10.6.
This now uses fetchurl instead of fetchgit to speed up fetching.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-27 04:39:33 +02:00
Eelco Dolstra
65ad55c425 git-subtree: Remove
This package is obsolete because it's now part of git (see
https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE).
2013-08-01 16:37:36 +02:00
Mathijs Kwik
cbf48a8cd1 upgrade to texinfo5 for some packages 2013-07-01 07:52:14 +02:00
Peter Simons
7b21e19a82 git-annex: generate build instructions with cabal2nix 2013-06-03 22:09:34 +02:00
Eelco Dolstra
6ee8bca8ee Revert "git: fix build on FreeBSD"
This reverts commit ab98d72fad, which
caused the size of the Git package in the store to increase from 18
MiB to 190 MiB.
2013-04-22 15:26:26 +02:00
Bjørn Forsman
88f1e643e3 git: fix gitweb.cgi runtime dependency on gzip
gitweb.cgi uses gzip for creating "snapshots". Without this patch it
doesn't work.
2013-04-19 22:32:51 +02:00
Peter Simons
7a69341994 git-annex: drop obsolete dependency on testpack 2013-04-14 21:19:09 +02:00
Peter Simons
ab98d72fad git: fix build on FreeBSD
Our hard-linking code depended on md5sum, which FreeBSD doesn't have in its
system environment. To avoid that impure dependency, the hard-linking is now
done with the 'hardlink' utility from Nixpkgs.
2013-03-25 12:47:39 +01:00
Peter Simons
51e64392ea git-annex: update to version 4.20130314 2013-03-20 10:15:06 +01:00
Peter Simons
a1a7448e5b topgit: update to version 0.9 2013-03-20 09:50:06 +01:00
Peter Simons
329b33c59c git-annex: clean up build expression 2013-02-28 13:04:15 +01:00
Peter Simons
eb5ebb6063 network-protocol-xmpp: fix spelling of the attribute name 2013-02-22 16:14:27 +01:00
Peter Simons
b076ab94d6 git-annex: update to version 3.20130216 2013-02-18 11:20:46 +01:00
aszlig
f1c80cf20c
git-and-tools/hub: New package, version 1.10.3.
This is a small wrapper of Git, which integrates some GitHub specific features,
especially stuff like merging or sending pull requests or attaching commits to
an issue.

I'm not quite familiar with the Nix integration of Ruby, so let's hope that I'm
not doing something horrible here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
Peter Simons
03abf1abbc git-annex: switch build to GHC 7.4.2 2012-11-21 17:40:56 +01:00
Peter Simons
9ada368ef8 git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with current version of yesod 2012-11-21 12:30:54 +01:00
Peter Simons
84c6f6f88e git-annex: update to version 3.20121112 2012-11-15 12:50:17 +01:00
Peter Simons
4ab06e5c24 Fix git-annex build.
git-annex depends on 'testpack', which doesn't compile with Haskell
Platform 2012.4.0.0. The testpack library appears to be unmaintained, so
there is probably no quick solution for this issue. For the time being,
we compile git-annex with GHC 7.4.1.
2012-11-06 18:34:54 +01:00
Peter Simons
c90a15a604 git-annex: update to version 3.20121010 2012-10-15 20:17:33 +02:00
aszlig
98b7228c06
darcs-to-git: New package from upstream Git.
This consists of just one single ruby script, which runs shell commands assuming
that the current PATH has all dependencies set up correctly. Unfortunately, this
somewhat breaks functional purity as the command won't work correctly in
environments that do not contain git, darcs or diffutils.

During the patchPhase we replace all those dependencies directly in the ruby
source code, rather than creating a wrapper. Afterwards we run a checkPhase
which not only checks whether we caught all the dependencies (PATH=) but also
checks if the conversion has been done correctly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:08:04 +02:00
Dmitry Malikov
b125ef36b6 Bump gitAndTools/tig from 0.16 to 1.0 2012-08-08 00:51:25 +02:00
David Guibert
a97e27fc82 git-annex: update to 3.20120624 2012-06-29 21:09:52 +02:00
Eelco Dolstra
94812c9dd3 git: Fix the "notSupported" scripts for "git send-email" and "git gui" 2012-06-21 15:25:02 -04:00
Peter Simons
a3224ededc git-and-tools: fixed build in the presence of QuickCheck 2.5
svn path=/nixpkgs/trunk/; revision=34553
2012-06-18 18:16:23 +00:00
Peter Simons
330ea0887f git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching
svn path=/nixpkgs/trunk/; revision=34386
2012-06-08 14:02:28 +00:00
Peter Simons
4fc0e49bdd git-annex: updated to version 3.20120418
svn path=/nixpkgs/trunk/; revision=33856
2012-04-20 11:35:20 +00:00
Nicolas Pierron
7b7dd238fc Add dulwich (git filesystem in python).
Add bugz (command line tool for bugzilla)
Add gitBz (bugzilla in git)

svn path=/nixpkgs/trunk/; revision=33800
2012-04-15 23:48:11 +00:00
Rob Vermaas
a1d87e58c1 re-add overwritten svn2git (used/developed by kde people)
svn path=/nixpkgs/trunk/; revision=33567
2012-04-04 15:30:29 +00:00
Eelco Dolstra
512357f875 * Remove a wildly outdated Git version that shouldn't have been in
Nixpkgs in the first place.

svn path=/nixpkgs/trunk/; revision=33272
2012-03-19 18:24:53 +00:00
Peter Simons
6ff954a5e8 git-annex: updated to version 3.20120315
svn path=/nixpkgs/trunk/; revision=33116
2012-03-15 18:07:49 +00:00
Peter Simons
88d14c0e29 git-annex: updated to version 3.20120230
Note that the latest version of git-annex must be compiled with GHC 7.4.1 or
later, because it takes advantage of some freaky file name encoding guessing
features that are absent in older versions of the base library.

svn path=/nixpkgs/trunk/; revision=32819
2012-03-06 11:24:20 +00:00
Peter Simons
38f6d36e91 git-annex: updated to version 3.20111231
svn path=/nixpkgs/trunk/; revision=31212
2012-01-02 14:51:26 +00:00
Eelco Dolstra
3aedd3770f * Get svn2git to work.
svn path=/nixpkgs/trunk/; revision=30778
2011-12-06 15:41:16 +00:00
Peter Simons
42757e653a Temporarily keep monad-control 0.2.0.3 until a new version of git-annex comes out that supports the current version.
svn path=/nixpkgs/trunk/; revision=30761
2011-12-05 16:23:02 +00:00
Peter Simons
a0cf7c24e1 git-annex: updated to version 3.20111025
svn path=/nixpkgs/trunk/; revision=30241
2011-11-05 00:03:44 +00:00
Nicolas Pierron
87bf637319 Mercurial: Give access to ssl and curses python packages for
fast-export and crecord.

svn path=/nixpkgs/trunk/; revision=29972
2011-10-22 15:41:20 +00:00
Peter Simons
e98852cefd git-annex: updated to version 3.20111011
svn path=/nixpkgs/trunk/; revision=29964
2011-10-21 16:34:38 +00:00
Peter Simons
19769280f6 git-subtree: updated to version 0.4-2-g2793ee6
svn path=/nixpkgs/trunk/; revision=29333
2011-09-18 14:56:46 +00:00
Yury G. Kudryashov
fcec1593b8 git doesn't need subversion server
svn path=/nixpkgs/trunk/; revision=29102
2011-09-07 22:52:52 +00:00
Peter Simons
2c0eddaeaa git-annex: updated to version 3.20110902
svn path=/nixpkgs/trunk/; revision=28996
2011-09-03 13:17:36 +00:00
Peter Simons
c0fb177ce9 git-annex: pass an older version of QuickCheck to fix build failure of the test suite
svn path=/nixpkgs/trunk/; revision=28829
2011-08-26 10:51:47 +00:00
David Guibert
19b376cc41 git-subtree: 0.3 -> 0.4
svn path=/nixpkgs/trunk/; revision=28760
2011-08-22 20:26:15 +00:00
Peter Simons
ff91dbdb35 git-annex: the latest version depends on the monad-control package
svn path=/nixpkgs/trunk/; revision=27839
2011-07-20 12:13:07 +00:00
Peter Simons
4e5cc9b965 git: removed 'lowPri' wrapper around gitFull
Packages that need git as build-time or run-time dependency typically refer to
the attribute 'git', which is the expression with the least possible set of
features.

Users, however, who run "nix-env -i git", don't want that version, because it
lacks support for SVN, for sending e-mail, and it doesn't include the GUI. In
other words, users want gitFull by default, which is what this change
accomplishes.

svn path=/nixpkgs/trunk/; revision=27748
2011-07-13 10:46:17 +00:00
Peter Simons
9edc2574dd git-annex: the build system uses 'which' to determine whether ikiwiki is installed
svn path=/nixpkgs/trunk/; revision=27747
2011-07-13 10:41:10 +00:00
Peter Simons
21373bc49b git-annex: enable the documentation build
svn path=/nixpkgs/trunk/; revision=27663
2011-07-07 23:48:30 +00:00
Peter Simons
0ec6325b87 git-annex: updated to version 3.20110705
svn path=/nixpkgs/trunk/; revision=27661
2011-07-07 23:48:22 +00:00
Peter Simons
e88567a0db git-annex: added missing dataenc dependency
svn path=/nixpkgs/trunk/; revision=27144
2011-05-04 13:21:26 +00:00
Rob Vermaas
c34fdd226e oops, wrote git2svn in stead of svn2git
svn path=/nixpkgs/trunk/; revision=27136
2011-05-04 10:11:30 +00:00
Rob Vermaas
02b871de50 add svn2git
svn path=/nixpkgs/trunk/; revision=27135
2011-05-04 10:07:56 +00:00
Peter Simons
59dae8edf4 git-annex: added missing SHA dependency
svn path=/nixpkgs/trunk/; revision=27131
2011-05-04 09:45:22 +00:00
Peter Simons
1ca832be87 git-and-tools: dropped support for getConfig -- use override instead!
See my earlier commit that dropped getConfig support from subversion.

svn path=/nixpkgs/trunk/; revision=26829
2011-04-13 17:53:39 +00:00
Peter Simons
864a75d725 gitFull: modify the name of the expression to make it distinct
This also means adding a lowPrio wrapper, because without it nix-env
would prefer the "-full" expression over the normal one.

Maybe that's desirable, even?

svn path=/nixpkgs/trunk/; revision=26828
2011-04-13 17:53:33 +00:00
Peter Simons
60974e9e87 all-packages.nix: added low-priority 'gitSVN' expression, a variant of git with SVN support (but no GUI)
svn path=/nixpkgs/trunk/; revision=26827
2011-04-13 17:53:26 +00:00
Peter Simons
ec23e33d0c applications/version-management/git-and-tools/default.nix: cosmetic
svn path=/nixpkgs/trunk/; revision=26826
2011-04-13 17:53:20 +00:00
Peter Simons
789f14c0b7 git-annex: added initial version 0.20110320
svn path=/nixpkgs/trunk/; revision=26470
2011-03-23 15:57:53 +00:00
Peter Simons
07d14b9997 Cosmetic, no functional change intended.
svn path=/nixpkgs/trunk/; revision=26464
2011-03-23 10:24:26 +00:00
Peter Simons
3f7ea10694 topgit: updated to version 0.8-45-gd279e29
svn path=/nixpkgs/trunk/; revision=26463
2011-03-23 10:24:22 +00:00
Lluís Batlle i Rossell
4c16325de0 I take out getPkgConfig. It looks to me as if it needed a solution, but noone took action.
I take action before much discussion.
For what I see:
- getPkgConfig problems are hard to track
- config.nix trying to forecast getPkgConfig behaviour looks me as a bad approach,
  and people should not trust such a config.nix unless they parsed the whole nixpkgs
  for tricky effects.
- It's not that hard to write config.nix in the style of getConfig
- Every now and then newcomers hit the "'git' is an attribute set while a boolean was expected".

Maybe this will disrupt nixes of some people, and that will be a background on what to discuss.


svn path=/nixpkgs/trunk/; revision=25314
2010-12-28 21:07:35 +00:00
Peter Simons
2cc3847cd4 pkgs/applications/version-management/git-and-tools: updated topgit to version 0.8-32-g8b0f1f9
svn path=/nixpkgs/trunk/; revision=24487
2010-10-26 12:08:49 +00:00
Peter Simons
c7756e473b pkgs/applications/version-management/git-and-tools: prefer fetchurl over fetchgit in topGit
svn path=/nixpkgs/trunk/; revision=24442
2010-10-23 22:39:53 +00:00
Peter Simons
4bdf53b0f1 pkgs/applications/version-management/git-and-tools: updated topgit to version 0.8-19-g9404aa1
svn path=/nixpkgs/trunk/; revision=23996
2010-09-30 13:27:24 +00:00
Evgeny Egorochkin
8ec9590737 Git: fix an impurity: was taking grep from PATH.
svn path=/nixpkgs/trunk/; revision=23853
2010-09-18 12:45:04 +00:00
Lluís Batlle i Rossell
2ab5f25607 Updating 'tig' (for garbas@freenode)
svn path=/nixpkgs/trunk/; revision=23487
2010-08-28 14:10:49 +00:00
Peter Simons
5e4bf97212 pkgs/applications/version-management/git-and-tools: disable sendEmailSupport on Darwin in gitFull
The required perl libraries don't build on Darwin.

svn path=/nixpkgs/trunk/; revision=21872
2010-05-19 12:26:17 +00:00
Peter Simons
39b2ec2488 Fix git-send-email.
git-send-email depends on Net::SMTP and Net::SMTP::SSL.  Make
sendEmailSupport a config for git, and bring these libraries.  Wrap
the send-email script, or replace with a not supported script.

svn path=/nixpkgs/trunk/; revision=21789
2010-05-15 10:38:28 +00:00
Peter Simons
67cf56d2a5 git-subtree: added the version 0.3.
svn path=/nixpkgs/trunk/; revision=21645
2010-05-07 14:01:39 +00:00
Rob Vermaas
9e5ab46737 added git2cl script
svn path=/nixpkgs/trunk/; revision=21590
2010-05-04 10:06:50 +00:00
Yury G. Kudryashov
b01b22892b Use override for gitFull
svn path=/nixpkgs/trunk/; revision=20927
2010-04-02 12:39:38 +00:00
Yury G. Kudryashov
284c448d12 Fix gitFull build
svn path=/nixpkgs/trunk/; revision=20926
2010-04-02 07:43:02 +00:00
Yury G. Kudryashov
7af927d96b Improve git-svn support
svn path=/nixpkgs/trunk/; revision=20925
2010-04-02 07:17:11 +00:00
Rob Vermaas
a5586000d4 fix subversion perl bindings for gitFull
svn path=/nixpkgs/trunk/; revision=20771
2010-03-22 11:13:02 +00:00
Lluís Batlle i Rossell
26ca329ec4 Making gitFull get the subversion as it wants: with perlBindings.
This should allow hydra building it properly.

svn path=/nixpkgs/trunk/; revision=20701
2010-03-17 13:27:05 +00:00
Michael Raskin
c3e3bc52dc Fix missed argument
svn path=/nixpkgs/trunk/; revision=20113
2010-02-18 16:26:35 +00:00
Peter Simons
c7e5f6a80b pkgs/applications/version-management/git-and-tools/git: version 1.7.0 needs Python
svn path=/nixpkgs/trunk/; revision=20096
2010-02-18 12:08:39 +00:00
Ludovic Courtès
8004163ff3 TopGit: Use `fetchgit' rather than relying on Gitweb-generated tarballs.
Gitweb's tarballs change overtime, probably because they are generated
on-demand and files have different timestamps.

svn path=/nixpkgs/trunk/; revision=19896
2010-02-10 11:28:22 +00:00
Ludovic Courtès
ca9dcb28a1 topgit: Fix.
svn path=/nixpkgs/trunk/; revision=19695
2010-01-26 21:45:07 +00:00
Ludovic Courtès
ecc992b7b1 topgit: Get a genuine source tarball; install `README'.
svn path=/nixpkgs/trunk/; revision=19693
2010-01-26 21:26:01 +00:00
Ludovic Courtès
b8bb0ce6dd Add `gitFull'.
svn path=/nixpkgs/trunk/; revision=19525
2010-01-18 16:07:44 +00:00
Marc Weber
1106d431fc fix various builds by updating perl URI package update perl URI package
fix expect: Neither was the executable installed nor the shared library
fix topGit source
update synergy fixing build

svn path=/nixpkgs/trunk/; revision=19064
2009-12-21 08:55:31 +00:00
Marc Weber
362f811a7a Revert "git: allow applying patches by config"
This reverts commit rev 18897
I should have used overrideDerivation.

svn path=/nixpkgs/trunk/; revision=18911
2009-12-12 18:10:26 +00:00
Marc Weber
0ceae8f6d1 git: allow applying patches by config
svn path=/nixpkgs/trunk/; revision=18897
2009-12-11 13:58:31 +00:00
Marc Weber
5319704f80 removing old bleeding edge cruft replacing it by a niftier version using
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +00:00
Peter Simons
b06c0d1a1d pkgs/applications/version-management/git-and-tools/default.nix: use docbook dtd 4.5
Ensure that the 4.5 DTD required by asciidoc is available.

svn path=/nixpkgs/trunk/; revision=18078
2009-11-03 15:57:31 +00:00
Marc Weber
748dd33b25 hg2git has been put into repo fast-export. make it work again
svn path=/nixpkgs/trunk/; revision=17977
2009-10-27 17:46:37 +00:00
Marc Weber
da731ce190 doh!
svn path=/nixpkgs/trunk/; revision=17877
2009-10-19 12:27:51 +00:00
Marc Weber
84a2555b2c topgit: remove obsolete patches
svn path=/nixpkgs/trunk/; revision=17859
2009-10-18 04:43:43 +00:00
Peter Simons
ad7eebbad1 Revert "optionally apply git glob patch to default git"
Please submit patches *upstream*.

svn path=/nixpkgs/trunk/; revision=17466
2009-09-28 12:56:46 +00:00
Marc Weber
afbb4d0b59 update topgit - using official release now
svn path=/nixpkgs/trunk/; revision=17457
2009-09-26 23:33:08 +00:00
Marc Weber
c641935190 optionally apply git glob patch to default git
svn path=/nixpkgs/trunk/; revision=17456
2009-09-26 23:33:05 +00:00
Marc Weber
829e0da0e5 topgit update
there is now a tg push command pushing branch and its base optionally
including all dependency

svn path=/nixpkgs/trunk/; revision=15328
2009-04-27 01:18:07 +00:00
Peter Simons
d1045dc8d0 qgit: update to version 2.2.
svn path=/nixpkgs/trunk/; revision=15286
2009-04-24 12:31:33 +00:00
Michael Raskin
4c02ccd107 Fix git-with-svn instantiation
svn path=/nixpkgs/trunk/; revision=15266
2009-04-23 10:56:23 +00:00
Eelco Dolstra
ac24816344 * Move all the Perl packages out of all-packages.nix into a separate
file, perl-packages.nix.

svn path=/nixpkgs/trunk/; revision=15171
2009-04-20 12:08:09 +00:00
Marc Weber
312c697fef added tig (git console browser)
svn path=/nixpkgs/trunk/; revision=14236
2009-02-24 22:00:35 +00:00
Marc Weber
0ad62a0edb adding gitAttr
now containing qgit, stgit, topGit, hg2git
updating gitGit (git dev version), adding qgit-git (dev version)

svn path=/nixpkgs/trunk/; revision=13816
2009-01-20 22:15:42 +00:00