Commit graph

354 commits

Author SHA1 Message Date
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