Commit Graph

437 Commits

Author SHA1 Message Date
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
Lluís Batlle i Rossell
f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Michael Raskin
c955a570a2 Update Monotone
svn path=/nixpkgs/trunk/; revision=24535
2010-10-29 19:52:15 +00:00
Michael Raskin
e10f65d674 Update Veracity
svn path=/nixpkgs/trunk/; revision=24533
2010-10-29 18:31:25 +00:00
Peter Simons
1caab7cc92 subversion: enable parallel building
svn path=/nixpkgs/trunk/; revision=24527
2010-10-29 14:46:18 +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
Michael Raskin
ba662a84e7 Update Monotone
svn path=/nixpkgs/trunk/; revision=24431
2010-10-23 15:28:18 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Michael Raskin
40dd3ccf7b Update Veracity. 0.3 series got replaced with 0.5 series.
svn path=/nixpkgs/trunk/; revision=24375
2010-10-20 05:44:22 +00:00
Peter Simons
f1af21e633 pkgs/applications/version-management/subversion: don't install broken vc-svn.el module
This file is part of Emacs already, and unlike the file shipped by Subversion,
the one distributed in Emacs actually works.

svn path=/nixpkgs/trunk/; revision=24369
2010-10-19 17:27:31 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Peter Simons
59fa834193 pkgs/applications/version-management/cvs: added meta section
svn path=/nixpkgs/trunk/; revision=24140
2010-10-07 13:14:17 +00:00
Lluís Batlle i Rossell
6abc00fb67 Updating fossil
svn path=/nixpkgs/trunk/; revision=24116
2010-10-06 13:30:06 +00:00
Michael Raskin
fc97834dd5 Update Veracity
svn path=/nixpkgs/trunk/; revision=24112
2010-10-06 11:47:04 +00:00
Rob Vermaas
006528b42d mercurial: update to 1.6.4 and install hgweb.cgi
svn path=/nixpkgs/trunk/; revision=24110
2010-10-06 11:20:20 +00:00
Yury G. Kudryashov
673e66e3a3 Move most kde-extragear apps to top-level
svn path=/nixpkgs/trunk/; revision=24092
2010-10-05 17:44:33 +00:00
Lluís Batlle i Rossell
cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Michael Raskin
c7ca6b46b2 Update Veracity
svn path=/nixpkgs/trunk/; revision=24006
2010-09-30 16:41:45 +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
Michael Raskin
d63a20e353 Update veracity
svn path=/nixpkgs/trunk/; revision=23977
2010-09-28 04:27:01 +00:00
Marco Maggesi
209c32c4c9 Update fossil
svn path=/nixpkgs/trunk/; revision=23894
2010-09-22 13:10:43 +00:00
Michael Raskin
9effe4ad77 Update Veracity nightly
svn path=/nixpkgs/trunk/; revision=23885
2010-09-21 20:25:59 +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
2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +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
Michael Raskin
6babe5dea4 Update Veracity
svn path=/nixpkgs/trunk/; revision=23806
2010-09-15 08:42:46 +00:00
Michael Raskin
58722fa393 Update veracity
svn path=/nixpkgs/trunk/; revision=23745
2010-09-13 11:54:30 +00:00
Yury G. Kudryashov
fb8e2ed6be Verbose copy, use pkg-config to find dependencies
svn path=/nixpkgs/trunk/; revision=23708
2010-09-09 20:05:00 +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