Commit graph

468 commits

Author SHA1 Message Date
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
Karn Kallio cd830b7e8e Update mercurial to version 1.9
svn path=/nixpkgs/trunk/; revision=27581
2011-07-02 19:35:03 +00:00
Eelco Dolstra 7a8598e716 * Subversion 1.6.17.
svn path=/nixpkgs/trunk/; revision=27486
2011-06-16 15:13:35 +00:00
Lluís Batlle i Rossell 5a2745ae1c Updating fossil.
svn path=/nixpkgs/trunk/; revision=27293
2011-05-23 08:04:59 +00:00
Michael Raskin 178d94606f Remove hard-coded path to uname
svn path=/nixpkgs/trunk/; revision=27287
2011-05-21 05:07:53 +00:00
Michael Raskin f2788f2837 missing hash
svn path=/nixpkgs/trunk/; revision=27286
2011-05-21 04:50:01 +00:00
Michael Raskin 92ad27cc88 Update veracity
svn path=/nixpkgs/trunk/; revision=27285
2011-05-21 04:27:40 +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
Michael Raskin 69ddd7b9f1 Remove testsuite data unless requested
svn path=/nixpkgs/trunk/; revision=27166
2011-05-05 16:58:21 +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
Lluís Batlle i Rossell b8f6681dbd Updating meld
svn path=/nixpkgs/trunk/; revision=26905
2011-04-20 14:04:54 +00:00
Lluís Batlle i Rossell 989b65cf5b Updating fossil.
svn path=/nixpkgs/trunk/; revision=26891
2011-04-19 15:29:50 +00:00
Michael Raskin 250bdbbdb2 Update veracity
svn path=/nixpkgs/trunk/; revision=26868
2011-04-17 17:39:17 +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
Karn Kallio ebdd392409 Advance version of mercurial to 1.8.2
svn path=/nixpkgs/trunk/; revision=26771
2011-04-10 00:50:58 +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
Eelco Dolstra 6f297e205a * Subversion updated to 1.6.16.
svn path=/nixpkgs/trunk/; revision=26699
2011-04-05 15:28:25 +00:00
Eelco Dolstra f99c0dd302 * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26678
2011-04-04 13:36:05 +00:00
Eelco Dolstra 353d450867 * wrapPythonPrograms: don't hard-code the Python library prefix.
svn path=/nixpkgs/branches/modular-python/; revision=26594
2011-03-29 15:19:59 +00:00
Michael Raskin b89d88cb22 Monotone update: 1.0 release is out
svn path=/nixpkgs/trunk/; revision=26587
2011-03-28 20:26:29 +00:00
Eelco Dolstra 1439ae44be * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26586
2011-03-28 20:22:30 +00:00
Eelco Dolstra 0a7b7374ac * Bazaar: depend on readline.
svn path=/nixpkgs/branches/modular-python/; revision=26581
2011-03-28 16:48:02 +00:00
Eelco Dolstra 47adaa80e3 * Move the wrapPythonPrograms function into a separate setup hook
(wrapPython).

svn path=/nixpkgs/branches/modular-python/; revision=26580
2011-03-28 16:33:33 +00:00
Eelco Dolstra 641834ddf6 * Bazaar: update to 2.3.1.
svn path=/nixpkgs/branches/modular-python/; revision=26573
2011-03-28 15:47:50 +00:00
Eelco Dolstra 9d49bdee78 * Mercurial updated to 1.7.5 (contributed by Vladimír Čunát).
svn path=/nixpkgs/trunk/; revision=26488
2011-03-24 11:47:55 +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
Michael Raskin 975f93ffc9 Update veracity
svn path=/nixpkgs/trunk/; revision=26414
2011-03-18 08:25:02 +00:00
Eelco Dolstra b3667a1e8f * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26347
2011-03-16 09:39:40 +00:00
Andres Löh 3e0ac9b040 Major Haskell packages overhaul.
Several changes, some highlights:

  * Structure of haskell-packages.nix updated. It's now easier to
    select different default versions of packages for different
    versions of GHC.

  * GHC 7.0.2 is now default.

  * Haskell Platform 2011.2.0.0 has been added and is now default.

  * Several packages have been updated
    (gtk2hs, gitit, xmonad, darcs, ...).

  * Some old packages have been removed.

svn path=/nixpkgs/trunk/; revision=26288
2011-03-12 17:28:15 +00:00
Lluís Batlle i Rossell 5c5170ae88 Updating fossil
svn path=/nixpkgs/trunk/; revision=26150
2011-03-03 16:23:59 +00:00
Michael Raskin e5e98b9984 Updating veracity; adding parts of needed infrastructure for tests. Currently, a test run would fail
svn path=/nixpkgs/trunk/; revision=26126
2011-02-28 20:56:01 +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
Michael Raskin 596dca28d3 Update Veracity to 0.5.7
svn path=/nixpkgs/trunk/; revision=25775
2011-02-04 16:58:47 +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
Lluís Batlle i Rossell 594c0a8ff9 Updating meld (patch by Carles Pagès)
svn path=/nixpkgs/trunk/; revision=25647
2011-01-20 22:07:49 +00:00
Michael Raskin 0d57a6b2f7 Update Veracity
svn path=/nixpkgs/trunk/; revision=25571
2011-01-14 20:23:32 +00:00
Eelco Dolstra 4a5824721a * The expression `builtins.substring 5 10 perl.name' barfs if
`perl.name' evaluates to "perl" (since there are not enough
  characters in the string).  It's better to use
  builtins.parseDrvName.

svn path=/nixpkgs/trunk/; revision=25559
2011-01-14 12:37:26 +00:00
Lluís Batlle i Rossell 2ae2385f26 Updating fossil
svn path=/nixpkgs/trunk/; revision=25532
2011-01-13 09:23:43 +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
Eelco Dolstra 9d792e7316 * Mercurial: always build with HTTPS support.
svn path=/nixpkgs/branches/modular-python/; revision=25395
2011-01-04 16:44:38 +00:00
Lluís Batlle i Rossell cdf7db3301 Updating fossil
svn path=/nixpkgs/trunk/; revision=25358
2011-01-03 10:56:09 +00:00
Michael Raskin ca29aa026f Fix lablgtk reference
svn path=/nixpkgs/trunk/; revision=25342
2011-01-02 17:28:42 +00:00
Michael Raskin c2df70227c Updating veracity
svn path=/nixpkgs/trunk/; revision=25332
2011-01-02 09:27:09 +00:00
Eelco Dolstra 762ed9079f * Merged the stdenv-updated branch. Woohoo!
svn path=/nixpkgs/trunk/; revision=25315
2010-12-28 21:19:57 +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
Eelco Dolstra c14382cb45 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
2010-12-21 15:14:33 +00:00
Michael Raskin 955f9c19a6 Update Veracity
svn path=/nixpkgs/trunk/; revision=25218
2010-12-21 05:21:54 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Lluís Batlle i Rossell 7ea75b3bcf Updating fossil
svn path=/nixpkgs/trunk/; revision=25112
2010-12-14 07:58:34 +00:00
Michael Raskin f229a3df60 Updating Veracity
svn path=/nixpkgs/trunk/; revision=25105
2010-12-13 19:14:45 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Peter Simons d1d201f11e subversion: don't specify both --disable-keychain and --enable-keychain
svn path=/nixpkgs/trunk/; revision=25008
2010-12-06 18:01:22 +00:00
Eelco Dolstra c7e8b01323 * Subversion 1.6.15.
svn path=/nixpkgs/trunk/; revision=24912
2010-11-29 09:54:37 +00:00
Lluís Batlle i Rossell cbb3b6f1dc Making fossil crossbuilt (I think I meant that in a previous commiit, but I
ended up committing something screwed up)


svn path=/nixpkgs/branches/stdenv-updates/; revision=24873
2010-11-26 14:33:30 +00:00
Michael Raskin 31b22ed108 Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24820
2010-11-23 08:57:29 +00:00
Peter Simons eb7e848f4b subversion: enable key-chain services on Darwin to fix pysvn build
svn path=/nixpkgs/trunk/; revision=24805
2010-11-22 12:01:45 +00:00
Michael Raskin 6af8a1debd Merging from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
2010-11-22 11:39:42 +00:00
Lluís Batlle i Rossell 331f7efbf5 Updating the fossil license (they changed it to BSD some months ago)
svn path=/nixpkgs/trunk/; revision=24782
2010-11-19 23:10:49 +00:00
Lluís Batlle i Rossell 25423cc546 Making hydra build fossil
svn path=/nixpkgs/trunk/; revision=24781
2010-11-19 23:10:45 +00:00
Lluís Batlle i Rossell 0d38f21c73 Making the fossil build do the check phase.
svn path=/nixpkgs/trunk/; revision=24780
2010-11-19 23:10:41 +00:00
Lluís Batlle i Rossell 5062aa0be0 Updating fossil.
svn path=/nixpkgs/trunk/; revision=24769
2010-11-19 13:03:35 +00:00
Michael Raskin fb58f74d82 Updating from trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
2010-11-17 17:03:09 +00:00
Andres Löh 2482ad5215 darcs version-bumped to 2.5
svn path=/nixpkgs/trunk/; revision=24710
2010-11-16 13:14:50 +00:00
Michael Raskin 2c4ed8b7ce Add new dependencies
svn path=/nixpkgs/trunk/; revision=24691
2010-11-15 12:39:50 +00:00
Michael Raskin 48c24ab774 Update Veracity
svn path=/nixpkgs/trunk/; revision=24690
2010-11-15 12:10:26 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Michael Raskin 7905af1137 Update monotone-viz
svn path=/nixpkgs/trunk/; revision=24642
2010-11-10 16:09:30 +00:00
Peter Simons e48bf66bf2 rcs: fixed build error introduced in my last commit
This package's configure script is too old to support "--mandir". Instead, the
default settings have to be overridden on the make command-line.

svn path=/nixpkgs/trunk/; revision=24620
2010-11-08 17:56:45 +00:00
Peter Simons 7c07c5aae2 pkgs/applications/version-management/rcs: fixed location of "info" and "man" directories
svn path=/nixpkgs/trunk/; revision=24607
2010-11-05 14:46:13 +00:00
Peter Simons a33ddc8047 pkgs/applications/version-management/cvs: fixed location of "info" and "man" directories
svn path=/nixpkgs/trunk/; revision=24603
2010-11-05 14:35:22 +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
Michael Raskin 6a09974e0f Update Guitone
svn path=/nixpkgs/trunk/; revision=24580
2010-11-02 19:19:25 +00:00
Lluís Batlle i Rossell 9ff0622848 Kdesvn fixed. At the end it was a wrong docbook type only in one of the docbook
files there. The other was fine, and kept me confused for long.

svn path=/nixpkgs/trunk/; revision=24571
2010-11-02 13:35:28 +00:00
Lluís Batlle i Rossell 5e5ce5a987 Updating kdesvn. It still does not build to some docbook problems I don't know how to solve, related to kde 4.5 I guess.
It runs some /nix/store/wlbri8r6fzavvq554bm04666aphhkxxr-kdelibs-4.5.2/bin/meinproc4 --check --cache /tmp/nix-build-rjcm9mri08cpbvh7gcjcvra2iqzn20ch-kdesvn-1.5.5.drv-0/kdesvn-1.5.5/build/doc/nl/index.cache.bz2 /tmp/nix-build-rjcm9mri08cpbvh7gcjcvra2iqzn20ch-kdesvn-1.5.5.drv-0/kdesvn-1.5.5/doc/nl/index.docbook

and this fails.

svn path=/nixpkgs/trunk/; revision=24569
2010-11-02 13:24:08 +00:00
Lluís Batlle i Rossell 548e313d02 Updating fossil
svn path=/nixpkgs/trunk/; revision=24568
2010-11-02 13:24:04 +00:00
Yury G. Kudryashov 3baea16bc6 Add guitone.
It compiles. Haven't checked whether it works.

svn path=/nixpkgs/trunk/; revision=24566
2010-11-02 12:23:01 +00:00
Yury G. Kudryashov 24d011bfbc monotone-0.99.1, less hacky way to get perl version
svn path=/nixpkgs/trunk/; revision=24565
2010-11-02 11:20:24 +00:00
Andres Löh 527d64b664 darcs should propagate its Haskell dependencies
since it can be used as a library

svn path=/nixpkgs/trunk/; revision=24558
2010-11-01 16:37:46 +00:00