Commit graph

212 commits

Author SHA1 Message Date
Peter Simons
4292793d40 git-annex: updated to version 3.20120406
svn path=/nixpkgs/trunk/; revision=33669
2012-04-08 10:48:14 +00:00
Peter Simons
799722afde git-annex: updated to version 3.20120405
svn path=/nixpkgs/trunk/; revision=33638
2012-04-05 23:11:00 +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
ebae9a9fd7 * Git 1.7.9.5.
svn path=/nixpkgs/trunk/; revision=33553
2012-04-03 11:07:50 +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
46f9f71439 git: updated to version 1.7.9.4
svn path=/nixpkgs/trunk/; revision=33145
2012-03-16 09:47:34 +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
f5219b23a4 git-annex: updated to version 3.20120309
The test suite failure introduced recently has been fixed.

svn path=/nixpkgs/trunk/; revision=33014
2012-03-12 14:06:11 +00:00
Eelco Dolstra
3c56e571af * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
2012-03-06 11:34:11 +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
Shea Levy
ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Peter Simons
0660134750 git: updated to version 1.7.9.2
svn path=/nixpkgs/trunk/; revision=32528
2012-02-23 22:31:09 +00:00
Eelco Dolstra
e64443baf1 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Eelco Dolstra
45fed14272 * Revert r32435. We'll be doing a stdenv merge in a few days, so
let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
2012-02-20 18:59:43 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Eelco Dolstra
e4ee3e2c9b * svn2git updated to 2.2.0.
svn path=/nixpkgs/trunk/; revision=32108
2012-02-07 12:22:48 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Peter Simons
6e4f0b6365 git-annex: updated to version 3.20120123
svn path=/nixpkgs/trunk/; revision=31836
2012-01-25 16:07:52 +00:00
Peter Simons
f8eee42a66 git-annex: updated to version 3.20120116
svn path=/nixpkgs/trunk/; revision=31757
2012-01-21 14:32:42 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Peter Simons
7ccde05271 git-annex: cosmetic change for the meta.license attribute
svn path=/nixpkgs/trunk/; revision=31572
2012-01-15 11:44:08 +00:00
Peter Simons
97e815a9af git-annex: bumped to version 3.20120113
svn path=/nixpkgs/trunk/; revision=31569
2012-01-15 11:43:57 +00:00
Peter Simons
bae5b8dabb git-annex: updated to version 3.20120106
svn path=/nixpkgs/trunk/; revision=31509
2012-01-13 09:27:08 +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
Peter Simons
1817b55a7f git: updated to version 1.7.8
svn path=/nixpkgs/trunk/; revision=30805
2011-12-09 11:44:42 +00:00
Eelco Dolstra
acd7288678 * Proper version number.
svn path=/nixpkgs/trunk/; revision=30784
2011-12-06 21:16:20 +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
3357437461 git-annex: updated to version 3.20111203
svn path=/nixpkgs/trunk/; revision=30762
2011-12-05 16:23:05 +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
1193eabfa1 git-annex: updated to version 3.20111122
svn path=/nixpkgs/trunk/; revision=30538
2011-11-23 09:21:20 +00:00
Peter Simons
1c0ae7e8ed git: updated to version 1.7.7.3
svn path=/nixpkgs/trunk/; revision=30476
2011-11-18 18:37:20 +00:00
Peter Simons
9dcb5da174 git-annex: updated to version 3.20111107
svn path=/nixpkgs/trunk/; revision=30337
2011-11-08 16:59:30 +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
9016346fbd git: updated to version 1.7.7
svn path=/nixpkgs/trunk/; revision=29965
2011-10-21 16:50:36 +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
Peter Simons
7b8f4ec540 git-annex: updated to version 3.20110915
svn path=/nixpkgs/trunk/; revision=29331
2011-09-18 08:28:29 +00:00
Peter Simons
8d0794f5e2 stgit: disable the test suite for the time being
There are failures, but it's unclear whether those are caused by assumptions
about the build environment or whether they signify real problems in the
software.

svn path=/nixpkgs/trunk/; revision=29295
2011-09-15 12:47:49 +00:00
Peter Simons
cd3e9099e9 stgit: updated to version 0.15
svn path=/nixpkgs/trunk/; revision=29294
2011-09-15 11:04:00 +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
Peter Simons
1972e6f6dc git-annex: updated to version 3.20110819
svn path=/nixpkgs/trunk/; revision=28771
2011-08-23 08:52:06 +00:00
Peter Simons
1c79ecc5af git2cl: added meta data for the package and updated the build to take
advantage of stdenv features such as automatic updating of the shebang
path to perl, etc.

svn path=/nixpkgs/trunk/; revision=28768
2011-08-23 08:44:59 +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
c13f967ed5 Replaced the obsolete 'haskellPlatforms' attribute with the platforms exported by GHC.
svn path=/nixpkgs/trunk/; revision=28418
2011-08-09 09:54:50 +00:00
Peter Simons
efe5ab73b1 git: fixed impure path to perl in git-am and git-submodule
svn path=/nixpkgs/trunk/; revision=27859
2011-07-20 22:56:31 +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
f61f66f46d git-annex: updated to version 3.20110719
svn path=/nixpkgs/trunk/; revision=27836
2011-07-20 10:16:35 +00:00
Peter Simons
ffe01e880d git-annex: build only on platforms that support Haskell
svn path=/nixpkgs/trunk/; revision=27792
2011-07-14 21:54:53 +00:00
Peter Simons
68957344fa git-annex: updated to version 3.20110707
svn path=/nixpkgs/trunk/; revision=27775
2011-07-14 12:22:26 +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
e4353b1f65 git: install contrib code included in the distribution
TODO: byte-compile emacs modules

svn path=/nixpkgs/trunk/; revision=27665
2011-07-07 23:48:38 +00:00
Peter Simons
2fee0ecef9 git: updated to version 1.7.6
svn path=/nixpkgs/trunk/; revision=27664
2011-07-07 23:48:34 +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
39f2346b1b git-annex: cosmetic changes in the meta section
svn path=/nixpkgs/trunk/; revision=27662
2011-07-07 23:48:26 +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
Rob Vermaas
7a7581d220 left over commit
svn path=/nixpkgs/trunk/; revision=27197
2011-05-09 14:59:58 +00:00
Peter Simons
9b4e1f6f53 git: updated to version 1.7.5.1
svn path=/nixpkgs/trunk/; revision=27169
2011-05-06 07:35:06 +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
2ff77d4134 fixed hash
svn path=/nixpkgs/trunk/; revision=27137
2011-05-04 10:14:02 +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
fb10d3399d git-annex: updated to version 0.20110427
The most current one is 0.20110503, but the corresponding tarball isn't
available for download yet.

svn path=/nixpkgs/trunk/; revision=27130
2011-05-04 09:26:45 +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
3f609d2e35 git-annex: updated to version 0.20110401
svn path=/nixpkgs/trunk/; revision=26739
2011-04-07 12:47:17 +00:00
Peter Simons
165f8efdfd git: updated to version 1.7.4.4
svn path=/nixpkgs/trunk/; revision=26738
2011-04-07 12:46:58 +00:00
Peter Simons
32fea0d8b1 Cosmetic, no functional change intended.
svn path=/nixpkgs/trunk/; revision=26477
2011-03-23 21:05:08 +00:00
Peter Simons
4e6bc23b70 git-annex: patch unpure /usr/bin/perl path in mdwn2man script
svn path=/nixpkgs/trunk/; revision=26476
2011-03-23 21:05:01 +00:00
Peter Simons
fd81655bfb topgit: avoid use of "install -D", which doesn't work on FreeBSD
svn path=/nixpkgs/trunk/; revision=26475
2011-03-23 20:32:12 +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
David Guibert
ecf72a5720 git: 1.7.4 -> 1.7.4.1
svn path=/nixpkgs/trunk/; revision=26107
2011-02-24 22:19:37 +00:00
Peter Simons
4262167be0 pkgs/applications/version-management/git-and-tools/git: fixed git gui module
Patch Tcl/Tk scripts to invoke 'wish' using the complete executable path to
ensure that the proper version is being used.

svn path=/nixpkgs/trunk/; revision=25755
2011-02-02 11:16:57 +00:00
David Guibert
b67c47cb3f git: 1.7.3.5 -> 1.7.4
svn path=/nixpkgs/trunk/; revision=25732
2011-01-31 09:42:37 +00:00
Peter Simons
e6e6f033ec pkgs/applications/version-management/git-and-tools/git: cosmetic changes to improve consistency
No functional change is intended.

svn path=/nixpkgs/trunk/; revision=25456
2011-01-07 11:04:09 +00:00
Peter Simons
d0f409e009 pkgs/applications/version-management/git-and-tools/git: be verbose when creating symlinks
The postInstall hook replaces identical copies of the same files in $out with
symlinks. This patch changes the call to 'ln' to pass the '-v' flag so that we
can see in the build log which files were replaced.

svn path=/nixpkgs/trunk/; revision=25455
2011-01-07 11:04:04 +00:00
Peter Simons
f989b670d6 pkgs/applications/version-management/git-and-tools/git: fixed the build to deal with names that contain whitespace
The "find -print | while read" loop failed to deal with paths that contain
whitespace. Instead, we now use a similar construct that's based on globbing.

svn path=/nixpkgs/trunk/; revision=25454
2011-01-07 11:03:57 +00:00
Peter Simons
167f185411 pkgs/applications/version-management/git-and-tools/git: fixed "git gui"
The git-gui module cannot be wrapped like gitk, because the Tcl implementation
uses the program's basename to determine stuff like the name of the Window it
opens, etc., and it cannot deal with a program name that contain a dot, like
".git-gui-wrapped" did.

Instead of wrapping git-gui, it's now patched to execute 'wish' with a complete
store path.

While I was at it, I also applied this solution to git-gui--askpass.

svn path=/nixpkgs/trunk/; revision=25453
2011-01-07 11:03:42 +00:00
Peter Simons
922bb7657c pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.3.5
svn path=/nixpkgs/trunk/; revision=25435
2011-01-06 10:04:21 +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
5b009db20e Updated Git to version 1.7.3.2.
svn path=/nixpkgs/trunk/; revision=24600
2010-11-05 11:45:16 +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
Peter Simons
ff1a93282f pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.3.1
svn path=/nixpkgs/trunk/; revision=23995
2010-09-30 13:27:17 +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
Yury G. Kudryashov
139de1ea2f Don't try to build Qt guis if qt is unsupported on the platform
svn path=/nixpkgs/trunk/; revision=23812
2010-09-15 18:52:07 +00:00
Peter Simons
9b8a491a73 pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.2.3
svn path=/nixpkgs/trunk/; revision=23695
2010-09-09 16:06:26 +00:00
Evgeny Egorochkin
919ae70e01 Make hydra compile QGit
svn path=/nixpkgs/trunk/; revision=23662
2010-09-07 09:54:11 +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
1a6039cb45 Enable parallel building of gcc, glibc, gmp, mpfr, ncurses, coreutils, perl, python, git, and qt4.
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.

svn path=/nixpkgs/trunk/; revision=23042
2010-08-08 18:51:42 +00:00
Peter Simons
dbef94575c pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.2.1
svn path=/nixpkgs/trunk/; revision=22960
2010-08-05 11:25:02 +00:00