Commit graph

228 commits

Author SHA1 Message Date
Eelco Dolstra d78a404063 * Removed some assertions that rely on pointer equality. (It's kind
of unfortunate that consitency checks like "httpd.apr == apr" don't
  really work.  Perhaps equality tests on derivations should just
  compare the drvPath or outPath attributes.)

svn path=/nixpkgs/trunk/; revision=15569
2009-05-12 12:50:07 +00:00
Michael Raskin 9771ef0e52 Update Monotone-Viz source
svn path=/nixpkgs/trunk/; revision=15536
2009-05-10 19:40:33 +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
Eelco Dolstra 5a2284ac61 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Michael Raskin c26271927a Remove multiversion expression for tailor for easier use of custom versions
svn path=/nixpkgs/trunk/; revision=15296
2009-04-25 11:19:42 +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
Eelco Dolstra f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +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 7ec61219db * lib/site_perl -> lib/perl5/site_perl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15258
2009-04-22 23:04:18 +00:00
Eelco Dolstra 94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +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
Andres Löh 35ac416328 More Haskell platform packages.
svn path=/nixpkgs/trunk/; revision=15151
2009-04-19 13:21:40 +00:00
Andres Löh 1643888f80 Added cabalized darcs-2 and associated Haskell libs.
svn path=/nixpkgs/trunk/; revision=15141
2009-04-19 10:07:41 +00:00
Eelco Dolstra 37f707fd92 * Removed Darcs 1.x.
* Updated Darcs to 2.2.1 and switched to the Cabal builder.  However,
  there are some dependencies missing that Andres will add :-)

svn path=/nixpkgs/trunk/; revision=15128
2009-04-18 15:42:59 +00:00
Eelco Dolstra 3e9cbbc1ba * Subversion 1.6.1.
svn path=/nixpkgs/trunk/; revision=15105
2009-04-16 21:59:55 +00:00
Michael Raskin 042e3eddd9 Updated Mercurial
svn path=/nixpkgs/trunk/; revision=14831
2009-04-02 12:18:53 +00:00
Michael Raskin 6986ddc2cf Updated Monotone to 0.43
svn path=/nixpkgs/trunk/; revision=14704
2009-03-25 16:06:00 +00:00
Eelco Dolstra e230599c08 * Removed Subversion 1.4 - obsolete.
* Updated Subversion 1.5.x to 1.5.6.

svn path=/nixpkgs/trunk/; revision=14685
2009-03-24 15:07:11 +00:00
Peter Simons ea443ec70a subversion: updated to version 1.6.0
svn path=/nixpkgs/trunk/; revision=14682
2009-03-24 10:31:39 +00:00
Michael Raskin 32154f3dac Updated monotone
svn path=/nixpkgs/trunk/; revision=14565
2009-03-16 21:30:43 +00:00
Eelco Dolstra fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00
Peter Simons 9cab85dd63 git: updated from 1.6.0.4 to 1.6.1.3
svn path=/nixpkgs/trunk/; revision=14259
2009-02-26 10:54:52 +00:00
Peter Simons 6febac4529 git.el: added fill-paragraph patch
The patch makes Emacs recognize "--- log message follows this line ---"
as a paragraph separator. It's going to be part of the distribution in
the foreseeable future.

svn path=/nixpkgs/trunk/; revision=14258
2009-02-26 10:54:44 +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
Eelco Dolstra 979f70ab5b * Subversion 1.5.5.
svn path=/nixpkgs/trunk/; revision=13784
2009-01-16 10:40:50 +00:00
Marc Weber b92b8242fd bazaar version bump to 1.10 (by Jan Kroeze)
svn path=/nixpkgs/trunk/; revision=13768
2009-01-14 16:26:53 +00:00
Andres Löh 4d5c788b81 Removed broken quotes.
svn path=/nixpkgs/trunk/; revision=13761
2009-01-13 16:36:47 +00:00
Ludovic Courtès a9f0680f77 Git 1.6.0.4.
svn path=/nixpkgs/trunk/; revision=13529
2008-12-01 10:24:24 +00:00
Ludovic Courtès cd3f1ecd82 Git 1.6.0.3.
svn path=/nixpkgs/trunk/; revision=13222
2008-11-07 13:45:46 +00:00
Eelco Dolstra 3f06bc1dc4 * Subversion 1.5.4.
svn path=/nixpkgs/trunk/; revision=13204
2008-11-06 13:13:55 +00:00
Marc Weber 5333a271a3 bump darcs to 2.1.0 (release) - patch provided by Ben Franksen
svn path=/nixpkgs/trunk/; revision=13201
2008-11-05 20:20:42 +00:00
Marc Weber ea22df581b added hg2git
svn path=/nixpkgs/trunk/; revision=13096
2008-10-18 21:08:42 +00:00
Marc Weber c111811aab mercurial : hgk = hg view = gitk for hg tool support
svn path=/nixpkgs/trunk/; revision=13093
2008-10-18 12:01:24 +00:00
Peter Simons 4288826941 subversion-1.5.x: added new parameter "static"
If static is set, subversion will be built with "--enable-all-static". The flag
is currently unused (and default to 'false'), because I haven't figured out a
good way to expose that functionality to the user.

svn path=/nixpkgs/trunk/; revision=13083
2008-10-16 12:42:20 +00:00
Peter Simons b4da0ccf16 git: updated from 1.6.0.1 to 1.6.0.2
svn path=/nixpkgs/trunk/; revision=13080
2008-10-16 12:41:46 +00:00
Eelco Dolstra 9fd8d270e1 * Subversion 1.5.3.
svn path=/nixpkgs/trunk/; revision=13070
2008-10-14 14:59:43 +00:00
Marc Weber d827e4f16f updated darcs2 to last release (2.1.0pre3) which fixed some http download problems.
Also adding assertion to force users to switch to darcs-2 unless they really want to keep using darcs-1

svn path=/nixpkgs/trunk/; revision=13038
2008-10-09 22:58:14 +00:00
Eelco Dolstra a4b6f1066c * Subversion 1.5: fix building the Apache module and the
Python/Perl bindings.

svn path=/nixpkgs/trunk/; revision=12979
2008-10-06 23:01:54 +00:00
Eelco Dolstra 781bb5a6e1 * Apache httpd: build against apr, aputil and pcre instead of using
its own copies.

svn path=/nixpkgs/trunk/; revision=12971
2008-10-06 13:38:45 +00:00
Eelco Dolstra 6591cc2640 * Subversion 1.5.2, Neon 0.28.3, Apache 2.2.9.
svn path=/nixpkgs/trunk/; revision=12966
2008-10-06 12:35:05 +00:00
Marc Weber 8d02b898c0 updated darcs to the last stable release (2.0.2)
svn path=/nixpkgs/trunk/; revision=12908
2008-09-24 00:43:05 +00:00
Marc Weber 92fb53a1a5 removed subversion14merge
I don't think anyone is still using it
everyone caring about merging is using git or such anyway
and subversion15 has support built in.

svn path=/nixpkgs/trunk/; revision=12905
2008-09-24 00:42:21 +00:00
Ludovic Courtès 6f2086ec0e Git 1.6.0.1.
svn path=/nixpkgs/trunk/; revision=12800
2008-09-04 19:52:27 +00:00
Ludovic Courtès 396ef44630 Git 1.6.0.
svn path=/nixpkgs/trunk/; revision=12697
2008-08-22 21:35:25 +00:00
Marc Weber 8302b6ba69 some fixes for bash completion (git, darcs) (-> etc/bash_completion.d/*)
svn path=/nixpkgs/trunk/; revision=12538
2008-08-07 17:30:35 +00:00
Peter Simons cea5d01592 git-git: change ${name} to reflect that this is not a pristine version
The git-git expression promises to build the current git HEAD, but in
fact it builds git HEAD plus a fairly extensive, undocumented, untested
patch that is apparently not part of the repository. By changing the
name of the installed package to 'git-git-with-glob-patch', we ensure
that users aren't mislead about what exactly they'll get when installing
this package. Technically, GIT-VERSION-FILE should be patched so that
the installed git binaries reflect this change too when called with
'--version', but the current solution is probably good enough.

svn path=/nixpkgs/trunk/; revision=12506
2008-08-05 17:31:13 +00:00
Marc Weber 43d7fe0cfb Merge branch 'git_patch_glob'
svn path=/nixpkgs/trunk/; revision=12468
2008-08-03 12:23:27 +00:00
Eelco Dolstra ec8d941064 * Subversion 1.5.1.
svn path=/nixpkgs/trunk/; revision=12435
2008-07-28 08:14:55 +00:00
Ludovic Courtès fdc5b51ab9 Git 1.5.6.2.
svn path=/nixpkgs/trunk/; revision=12347
2008-07-11 14:35:14 +00:00
Marc Weber 1683256259 added stgit
svn path=/nixpkgs/trunk/; revision=12330
2008-07-09 16:21:03 +00:00
Peter Simons 821cb7ccdc qgit: download this package from sourceforge
I hope the mirror syntax is right.

svn path=/nixpkgs/trunk/; revision=12306
2008-07-07 11:54:45 +00:00
Peter Simons b030a8a6dd qgit: Compile with -O3. This brings a significant speedup in C++ code.
I wonder what optimization flags qt is compiled with.

svn path=/nixpkgs/trunk/; revision=12300
2008-07-07 11:49:11 +00:00
Peter Simons 4244407bc9 new: qgit is a qt-based graphical front-end for git
svn path=/nixpkgs/trunk/; revision=12299
2008-07-07 11:48:24 +00:00
Peter Simons 13d8ee2275 subversion: install emacs lisp files too
svn path=/nixpkgs/trunk/; revision=12296
2008-07-07 11:46:50 +00:00
Michael Raskin 46b2775126 Updated tailor
svn path=/nixpkgs/trunk/; revision=12259
2008-07-04 06:53:44 +00:00
Marc Weber 18b30f54ce adding not supported message for git tools requiring extra config settings to work. exiting with exit status 1
svn path=/nixpkgs/trunk/; revision=12250
2008-07-03 12:51:23 +00:00
Peter Simons 8920511812 git: updated to version 1.5.6.1
svn path=/nixpkgs/trunk/; revision=12208
2008-06-28 15:22:31 +00:00
Eelco Dolstra 9663d4c76a * Added Subversion 1.5.0. Some features probably don't work yet
(building the Apache modules, building various language bindings).
* Neon 0.28.2.  Also kept Neon 0.26.x because Subversion 1.4.x needs
  it.

svn path=/nixpkgs/trunk/; revision=12162
2008-06-19 15:29:25 +00:00
Eelco Dolstra 8b3a7e2713 * Remove prehistoric Subversion versions.
svn path=/nixpkgs/trunk/; revision=12161
2008-06-19 15:01:01 +00:00
Michael Raskin 0784550c35 Added ViewMTN and dependency; currently ViewMTN has to be manually symlinked in corresponding directory.
svn path=/nixpkgs/trunk/; revision=12060
2008-06-12 15:59:59 +00:00
Michael Raskin 1453f29824 Monotone updated
svn path=/nixpkgs/trunk/; revision=12052
2008-06-12 10:07:35 +00:00
Eelco Dolstra 68c6b5f2fc * git: make the TCL/TK GUI optional (git.guiSupport).
* git: always install the Emacs mode but don't depend on Emacs to do
  it (just don't build the .elc files).

svn path=/nixpkgs/trunk/; revision=12037
2008-06-11 12:31:44 +00:00
Michael Raskin d139e5244c Added Monotone-Viz, viewer for monotone histories.
svn path=/nixpkgs/trunk/; revision=12034
2008-06-11 06:12:18 +00:00
Michael Raskin 47e9ed0386 Fixed tailor expression
svn path=/nixpkgs/trunk/; revision=11941
2008-05-31 07:26:13 +00:00
Michael Raskin eb767152f5 Some exposing of compilation options in Subversion.
svn path=/nixpkgs/trunk/; revision=11936
2008-05-30 16:04:00 +00:00
Michael Raskin 9d3b0a2cb7 Added bazaar tools (not installed globally, just copied to share, you have to symlink them to your ~/.bazaar/plugins). Also readline support for python.
svn path=/nixpkgs/trunk/; revision=11893
2008-05-26 11:39:08 +00:00
Michael Raskin f87949b0b8 Updated bazaar
svn path=/nixpkgs/trunk/; revision=11892
2008-05-26 07:57:28 +00:00
Michael Raskin 642ff45e22 Added codeville - a distributed revision control system with special efforts spent on merging. Heh, efforts into RCS availability seem to have side effects on Python side, too..
svn path=/nixpkgs/trunk/; revision=11891
2008-05-26 07:47:07 +00:00
Ludovic Courtès 392d2f5acf Git: Don't depend on Perl libs and Subversion when no Subversion support is built.
svn path=/nixpkgs/trunk/; revision=11877
2008-05-22 08:06:52 +00:00
Marc Weber b4ed67b58a fixed/removed extra git-svn wrapper. Now you can enable svn support by git = { svnSupport = true; }, git-svn executable is removed if you don't enable it
svn path=/nixpkgs/trunk/; revision=11849
2008-05-19 18:29:07 +00:00
Michael Raskin 8fa23b53af Added tailor
svn path=/nixpkgs/trunk/; revision=11766
2008-05-07 07:22:41 +00:00
Ludovic Courtès ec9950c07a git-svn: Don't produce any binary other than `git-svn'.
svn path=/nixpkgs/trunk/; revision=11635
2008-04-15 14:49:36 +00:00
Ludovic Courtès 7e4f1e74c8 Git: Wrap `git-citool'.
svn path=/nixpkgs/trunk/; revision=11634
2008-04-15 12:37:44 +00:00
Marc Weber b6c405fac6 bazaar update 1.3.1
svn path=/nixpkgs/trunk/; revision=11633
2008-04-15 11:46:43 +00:00
Marc Weber 23264b9db7 darcs2 has a stable version now. This patch reflects this change
svn path=/nixpkgs/trunk/; revision=11624
2008-04-14 19:59:26 +00:00
Ludovic Courtès 4579a2a530 Git 1.5.5.
svn path=/nixpkgs/trunk/; revision=11611
2008-04-12 12:52:31 +00:00
Nicolas Pierron 0c4bd745ce Add Tk in the environment to run git-gui.
svn path=/nixpkgs/trunk/; revision=11551
2008-04-10 22:12:11 +00:00
Ludovic Courtès b5e0ee02aa cvs: Use SHA256 instead of MD5.
svn path=/nixpkgs/trunk/; revision=11473
2008-04-06 20:43:39 +00:00
Ludovic Courtès 07e3e56082 cvsps: Add Debian patches.
svn path=/nixpkgs/trunk/; revision=11472
2008-04-06 20:04:40 +00:00
Ludovic Courtès 2d5d545818 Git: Fix more impurities.
svn path=/nixpkgs/trunk/; revision=11373
2008-03-30 22:19:20 +00:00
Marc Weber 2a42a77223 using throw instead of abort to not make the buildfarm fail
svn path=/nixpkgs/trunk/; revision=11301
2008-03-27 12:23:27 +00:00
Marc Weber 8c3e522f79 gitsvn wrapper adding needed perl libs to environment so that you can use git-svn out of the box
svn path=/nixpkgs/trunk/; revision=11299
2008-03-27 10:57:54 +00:00
Marc Weber ae475a72bf renamed subversion-<version>-svnmerge to svmerge-version (fixed my breakage of nixos-checkout : nix-env -i subversion)
svn path=/nixpkgs/trunk/; revision=11211
2008-03-19 22:32:00 +00:00
Ludovic Courtès 2788bf2902 Git: Wrap `gitk' so that it finds Tcl/Tk.
svn path=/nixpkgs/trunk/; revision=11133
2008-03-15 20:52:21 +00:00
Ludovic Courtès fdf6a69b3a Add CVSps, needed for instance by `git-cvsimport'.
svn path=/nixpkgs/trunk/; revision=11094
2008-03-13 10:02:57 +00:00
Ludovic Courtès ee5789b266 CVS: Depend on GNU Nano rather than Vim.
The former is a more reasonable dependency, and a standard one.

svn path=/nixpkgs/trunk/; revision=11093
2008-03-13 10:01:21 +00:00
Ludovic Courtès a8bc9e0fe4 Git 1.5.4.4 with Info documentation for real!
svn path=/nixpkgs/trunk/; revision=11084
2008-03-12 15:21:45 +00:00
Marc Weber 8939f24475 added svnmerge.py contrib tool
svn path=/nixpkgs/trunk/; revision=11075
2008-03-12 10:36:15 +00:00
Ludovic Courtès 03b5ac1b6c Git: Build documentation.
svn path=/nixpkgs/trunk/; revision=11057
2008-03-11 14:07:58 +00:00
Ludovic Courtès adc77fc0c7 Git: Make dependency on Emacs optional, per Yuri's request.
This works by looking for `git.useEmacs', a boolean, in the user's Nixpkgs
config file.  The default is `true' since it's only a build-time dependency
and most users are expected to install the pre-compiled substitute, which
doesn't pull Emacs.

svn path=/nixpkgs/trunk/; revision=10837
2008-02-22 16:51:51 +00:00
Ludovic Courtès d494e7e709 Git 1.5.4.2 + Emacs mode.
svn path=/nixpkgs/trunk/; revision=10766
2008-02-20 10:29:32 +00:00
Ludovic Courtès 4d86923c62 Add GNU Arch (tla).
svn path=/nixpkgs/trunk/; revision=10714
2008-02-17 13:44:30 +00:00
Ludovic Courtès 5ff8f11d54 Update Git to 1.5.4.1.
svn path=/nixpkgs/trunk/; revision=10661
2008-02-13 16:50:59 +00:00
Marc Weber cb418b6e34 added darcs-2.0.0pre
svn path=/nixpkgs/trunk/; revision=10564
2008-02-09 13:52:41 +00:00
Yury G. Kudryashov b16562e38c subversion: corrected location of python-bindings
svn path=/nixpkgs/trunk/; revision=10412
2008-01-30 16:03:18 +00:00
Yury G. Kudryashov e0aeec3c36 Mercurial upgrade
svn path=/nixpkgs/trunk/; revision=10313
2008-01-28 19:28:38 +00:00
Yury G. Kudryashov 80e3e21b28 Added (optional) perl support to svn-1.4.x
svn path=/nixpkgs/trunk/; revision=10312
2008-01-28 19:27:44 +00:00
Michael Raskin c68d2219a0 Commited monotone expression by Cyril Romain.
svn path=/nixpkgs/trunk/; revision=10286
2008-01-25 11:56:36 +00:00
Eelco Dolstra a5e0e39cdb * makeWrapper: option --run <CMD> to run a command from the wrapper.
This is so that the Unison wrapper can be generated with
  makeWrapper.
* Use makeWrapper as a buildInput everywhere.
* Updated BitTorrent, cvs2svn.

svn path=/nixpkgs/trunk/; revision=10213
2008-01-18 11:28:41 +00:00