Commit Graph

792 Commits

Author SHA1 Message Date
Eelco Dolstra
4c9cfd87aa bazaar: Update to 2.5.1 2013-01-15 18:53:12 +01:00
Eelco Dolstra
58e9406f4b subversion: Update to 1.7.8 2013-01-14 14:38:23 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Peter Simons
490085a811 git-annex: update to version 3.20130107 2013-01-09 16:54:31 +01:00
Peter Simons
9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Peter Simons
70b6b15215 git-annex: update to version 3.20130102 2013-01-04 19:24:09 +01:00
Peter Simons
cb329d1cd2 git: update to version 1.8.1 2013-01-04 19:24:04 +01:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Peter Simons
918b26a59e git-annex: update to version 3.20121211 2012-12-15 11:44:13 +01:00
aszlig
f1c80cf20c
git-and-tools/hub: New package, version 1.10.3.
This is a small wrapper of Git, which integrates some GitHub specific features,
especially stuff like merging or sending pull requests or attaching commits to
an issue.

I'm not quite familiar with the Nix integration of Ruby, so let's hope that I'm
not doing something horrible here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
cillianderoiste
5b0cd954f1 Merge pull request #206 from chaoflow/python-merge
python pureness, cleanup, and enable pth loaders (setuptoolsSite, recursivePthLoader)
2012-12-05 14:28:09 -08:00
Michael Raskin
56f1c1ec24 Update veracity 2012-12-04 10:12:38 +04:00
Peter Simons
3261d1d4aa git-annex: update to version 3.20121127 2012-12-03 16:12:04 +01:00
Florian Friesdorf
1adc9b1b1f python module cleanup, enable a couple of tests, add comments for failing 2012-12-03 06:38:11 +01:00
Florian Friesdorf
5436356733 a package does not need to include setuptools manually
this breaks for now
2012-12-03 04:40:38 +01:00
Florian Friesdorf
3438681d80 Merge branch 'channel-nixos' into python-merge 2012-11-29 21:40:33 +01:00
Florian Friesdorf
471a4b583f Merge branch 'channel-nixos' into python-merge 2012-11-29 15:36:17 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons
8effc542b4 git-annex: update to 3.20121126 2012-11-27 13:46:27 +01:00
Peter Simons
62f8d24e56 git: update to 1.8.0.1 2012-11-27 13:46:12 +01:00
Florian Friesdorf
9208fb1edb fix mercurial -extra PYTHONPATH +setuptools
- PYTHONPATH is already set correctly
- setuptools is needed to see docutils
2012-11-24 23:24:34 +01:00
Eelco Dolstra
2da2e5137f subversion: Update to 1.7.7 2012-11-22 16:56:03 +01:00
Peter Simons
03abf1abbc git-annex: switch build to GHC 7.4.2 2012-11-21 17:40:56 +01:00
Peter Simons
9ada368ef8 git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with current version of yesod 2012-11-21 12:30:54 +01:00
Rok Garbas
d999c3f6ec tig: typo 2012-11-17 02:20:07 +01:00
Rok Garbas
a64b34a43e tig: update to 1.1 2012-11-17 02:13:25 +01:00
Peter Simons
84c6f6f88e git-annex: update to version 3.20121112 2012-11-15 12:50:17 +01:00
Michael Raskin
48ad0f7443 Update Fossil to a still present version 2012-11-08 23:15:33 +04:00
Peter Simons
4ab06e5c24 Fix git-annex build.
git-annex depends on 'testpack', which doesn't compile with Haskell
Platform 2012.4.0.0. The testpack library appears to be unmaintained, so
there is probably no quick solution for this issue. For the time being,
we compile git-annex with GHC 7.4.1.
2012-11-06 18:34:54 +01:00
Peter Simons
321ee97b4c haskell-darcs: update to version 2.8.3 2012-11-05 16:25:26 +01:00
Paolo Capriotti
6ac427d391 Update git-annex to 3.20121017 2012-11-05 13:59:08 +00:00
David Guibert
b963624867 update git to 1.8.0 2012-10-24 16:33:42 +02:00
Peter Simons
58f3e47166 git: update to version 1.7.12.4 2012-10-19 10:08:07 +02:00
Peter Simons
c90a15a604 git-annex: update to version 3.20121010 2012-10-15 20:17:33 +02:00
Eelco Dolstra
7dd3236c81 git: Update to 1.7.12.2 2012-10-02 12:34:38 -04:00
Peter Simons
b5416d6ed6 darcs: install bash completion instructions 2012-09-25 15:15:38 +02:00
Peter Simons
625e2e45f7 git: update to version 1.7.12.1 2012-09-24 13:28:31 +02:00
aszlig
9ff9d85ef6
darcs-to-git: Remove propagatedBuildInputs.
I missed this while checking the commit diffs before my last push. And it really
doesn't make sense to propagate ruby all the way up to whatever in the universe
may depend on this package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:35:49 +02:00
aszlig
98b7228c06
darcs-to-git: New package from upstream Git.
This consists of just one single ruby script, which runs shell commands assuming
that the current PATH has all dependencies set up correctly. Unfortunately, this
somewhat breaks functional purity as the command won't work correctly in
environments that do not contain git, darcs or diffutils.

During the patchPhase we replace all those dependencies directly in the ruby
source code, rather than creating a wrapper. Afterwards we run a checkPhase
which not only checks whether we caught all the dependencies (PATH=) but also
checks if the conversion has been done correctly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:08:04 +02:00
Peter Simons
ac751dc753 haskell-darcs: update to version 2.8.2 2012-09-10 15:08:21 +02:00
Peter Simons
14da2bf31b git: update to version 1.7.12 2012-09-06 18:13:45 +02:00
Peter Simons
33bf9644cf git-annex: update to version 3.20120825 2012-09-06 18:13:44 +02:00
Yury G. Kudryashov
c2ad9f873d mr-1.13, more verbose install 2012-08-31 12:07:22 +04:00
Antono Vasiljev
61f7853e43 Merge pull request #92 from dmalikov/b125ef36b67f2a0aedabc34eb4dac12e61ae9828
gitAndTools: bump tig from 0.16 to 1.0
2012-08-16 06:03:54 -07:00
Michael Raskin
938d86b16b Veracity: update to version 2.0
Still no permission support or commit signing, though.
2012-08-09 11:05:43 +04:00
Dmitry Malikov
b125ef36b6 Bump gitAndTools/tig from 0.16 to 1.0 2012-08-08 00:51:25 +02:00
Eelco Dolstra
f901b6d38d git: Update to 1.7.11.4 2012-08-06 15:27:28 -04:00
Eelco Dolstra
bd8d7a8d15 Add some packages to the channel 2012-07-31 19:26:35 -04:00
Shea Levy
c3c68b6510 Mercurial: Install hgweb.wsgi as well 2012-07-28 20:25:41 -04:00
Shea Levy
deb09fd9de Mercurial: Bump 2012-07-27 19:44:01 -04:00
Antono Vasiljev
631a59e449 Added mr - Multiple Repository management tool 2012-07-07 17:12:18 +02:00
David Guibert
3b0d9374a4 git-annex: update to 3.20120629 2012-06-29 21:09:52 +02:00
David Guibert
a97e27fc82 git-annex: update to 3.20120624 2012-06-29 21:09:52 +02:00
Eelco Dolstra
94812c9dd3 git: Fix the "notSupported" scripts for "git send-email" and "git gui" 2012-06-21 15:25:02 -04:00
Eelco Dolstra
9365981409 git: Updated to 1.7.11 2012-06-21 15:23:29 -04:00
Peter Simons
a3224ededc git-and-tools: fixed build in the presence of QuickCheck 2.5
svn path=/nixpkgs/trunk/; revision=34553
2012-06-18 18:16:23 +00:00
Peter Simons
2a60c221d1 git-annex: updated to version 3.20120614
svn path=/nixpkgs/trunk/; revision=34518
2012-06-15 15:33:47 +00:00
Peter Simons
330ea0887f git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching
svn path=/nixpkgs/trunk/; revision=34386
2012-06-08 14:02:28 +00:00
Peter Simons
87d25896c1 git-annex: updated to version 3.20120605
svn path=/nixpkgs/trunk/; revision=34385
2012-06-08 14:02:21 +00:00
Eelco Dolstra
104bd01e1d * Git 1.7.10.4.
svn path=/nixpkgs/trunk/; revision=34349
2012-06-04 15:54:57 +00:00
Eelco Dolstra
ce10ebebac * Subversion 1.7.5.
svn path=/nixpkgs/trunk/; revision=34348
2012-06-04 15:40:25 +00:00
Peter Simons
ac64ba04bd git-annex: updated to version 3.20120522
svn path=/nixpkgs/trunk/; revision=34213
2012-05-22 19:46:37 +00:00
Eelco Dolstra
5e7f049fc9 * svn2git-kde 1.0.5.
svn path=/nixpkgs/trunk/; revision=34169
2012-05-18 15:01:54 +00:00
Peter Simons
201bdca962 Updated Haskell packages.
- cryptocipher: updated to version 0.3.2
 - Crypto: updated to version 4.2.5
 - darcs: updated to version 2.8.1
 - hamlet: updated to version 1.0.1.3
 - monad-par-extras: updated to version 0.3.2
 - persistent-template: updated to version 0.9.0.2
 - pool-conduit: updated to version 0.1.0.2
 - shakespeare-css: updated to version 1.0.1.2
 - shakespeare-i18n: updated to version 1.0.0.2
 - shakespeare-js: updated to version 1.0.0.2
 - shakespeare-text: updated to version 1.0.0.2
 - shakespeare: updated to version 1.0.0.2
 - warp: updated to version 1.2.1
 - wxcore: updated to version 0.90.0.1
 - wxc: updated to version 0.90.0.3
 - wx: updated to version 0.90.0.1
 - xml-conduit: updated to version 0.7.0.3
 - xss-sanitize: updated to version 0.3.2
 - yesod-auth: updated to version 1.0.2.1
 - yesod-core: updated to version 1.0.1.2
 - yesod-default: updated to version 1.0.1.1
 - yesod-form: updated to version 1.0.0.4
 - yesod-json: updated to version 1.0.0.1
 - yesod-persistent: updated to version 1.0.0.1
 - yesod-routes: updated to version 1.0.1.2
 - yesod-static: updated to version 1.0.0.2
 - yesod: updated to version 1.0.1.6

svn path=/nixpkgs/trunk/; revision=34102
2012-05-15 11:50:48 +00:00
Eelco Dolstra
7c1612d6f2 * svn2git -> svn2git-kde to distinguish it from the other svn2git.
svn path=/nixpkgs/trunk/; revision=34071
2012-05-12 19:45:55 +00:00
Peter Simons
e0bd67afd7 git-annex: updated to version 3.20120430
svn path=/nixpkgs/trunk/; revision=33970
2012-05-02 09:25:28 +00:00
Peter Simons
f1135ba545 Updated Haskell packages.
- alternative-io: updated to version 0.0.1
 - blaze-markup: added version 0.5.1.0
 - crypto-conduit: updated to version 0.3.2
 - cryptohash: updated to version 0.7.5
 - darcs: updated to version 2.8.0
 - filestore: updated to version 0.4.2
 - Graphalyze: cosmetic change
 - hamlet: updated to version 1.0.1.1
 - happstack-hamlet: updated to version 7.0.1
 - happstack-server: updated to version 7.0.1
 - HFuse: updated to version 0.2.4.1
 - Hipmunk: updated to version 5.2.0.8
 - language-javascript: updated to version 0.5.2
 - libmpd: updated to version 0.8.0
 - lifted-base: updated to version 0.1.0.4
 - monad-control: updated to version 0.3.1.2
 - persistent: updated to version 0.9.0.3
 - regex-compat: use latest version when building with GHC 7.4.1
 - skein: updated to version 0.1.0.7
 - snap-core: updated to version 0.8.1
 - snap-server: updated to version 0.8.1.1
 - tls: updated to version 0.9.5
 - vty: updated to version 4.7.0.12
 - wai-app-static: updated to version 1.2.0.2
 - yesod-core: updated to version 1.0.1.1

svn path=/nixpkgs/trunk/; revision=33889
2012-04-23 09:34:01 +00:00
Peter Simons
4fc0e49bdd git-annex: updated to version 3.20120418
svn path=/nixpkgs/trunk/; revision=33856
2012-04-20 11:35:20 +00:00
Nicolas Pierron
7a4cf21350 Add git-bz nix expression.
svn path=/nixpkgs/trunk/; revision=33801
2012-04-15 23:48:16 +00:00
Nicolas Pierron
7b7dd238fc Add dulwich (git filesystem in python).
Add bugz (command line tool for bugzilla)
Add gitBz (bugzilla in git)

svn path=/nixpkgs/trunk/; revision=33800
2012-04-15 23:48:11 +00:00
Nicolas Pierron
811b035171 Mercurial: Support ssl and curses python packages for fast-export and crecord.
svn path=/nixpkgs/trunk/; revision=33799
2012-04-15 23:48:07 +00:00
Michael Raskin
351bcc3b70 Fix tailor URL
svn path=/nixpkgs/trunk/; revision=33767
2012-04-12 20:54:39 +00:00
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
4ae899f4bf * Mercurial updated to 2.1.2.
svn path=/nixpkgs/trunk/; revision=33563
2012-04-04 14:06:04 +00:00
Eelco Dolstra
ebae9a9fd7 * Git 1.7.9.5.
svn path=/nixpkgs/trunk/; revision=33553
2012-04-03 11:07:50 +00:00
Peter Simons
880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use.
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +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
613dd942c7 * Subversion updated to 1.7.4.
svn path=/nixpkgs/trunk/; revision=33013
2012-03-12 13:40:40 +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
Lluís Batlle i Rossell
e1c8ab095c Removing a duplicated line so the hydra stdenv evaluation can go.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32576
2012-02-26 16:04:57 +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
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Yury G. Kudryashov
c6f0449124 Let hydra build kdesvn and krusader.
Also fix kdesvn build with qt-4.8.

svn path=/nixpkgs/trunk/; revision=32473
2012-02-22 14:51:15 +00:00
Eelco Dolstra
f71dd91a43 * Apply r32435 from the trunk (always build Python with SSL support).
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
2012-02-21 23:35:35 +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
Yury G. Kudryashov
578847f8b3 Let hydra build kdesvn
svn path=/nixpkgs/branches/stdenv-updates/; revision=32455
2012-02-21 14:04:51 +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
Peter Simons
95cbf4ed55 Modified the Python 2.7 expression so that the interpreter has unconditional
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.

svn path=/nixpkgs/trunk/; revision=32435
2012-02-20 18:52:52 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons
cb28766341 Re-generated Haskell package descriptions with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32327
2012-02-16 14:05:41 +00:00
Eelco Dolstra
cdd8d2b163 * Subversion updated to 1.7.3.
svn path=/nixpkgs/trunk/; revision=32305
2012-02-15 16:23:40 +00:00
Peter Simons
ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +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
680787f13e mercurial: updated to version 2.0.2
svn path=/nixpkgs/trunk/; revision=31775
2012-01-21 19:08:48 +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
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +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
01bea39bad gource: cosmetic, no functional change
svn path=/nixpkgs/trunk/; revision=31589
2012-01-16 11:33:57 +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
3c8a798411 gource: added meta information and moved the package into version-management category
svn path=/nixpkgs/trunk/; revision=31570
2012-01-15 11:44:02 +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
9ddd085129 subversion: instantiate SASL only when it's actually enabled
svn path=/nixpkgs/trunk/; revision=31532
2012-01-14 12:05:18 +00:00
Peter Simons
ef343ed3ab subversion: add sasl support
svn path=/nixpkgs/trunk/; revision=31530
2012-01-14 11:41:06 +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
Michael Raskin
64290dbd96 Try updating veracity
svn path=/nixpkgs/trunk/; revision=30990
2011-12-20 21:37:23 +00:00
Marco Maggesi
f6689d01a3 Update fossil to version 1.21
svn path=/nixpkgs/trunk/; revision=30875
2011-12-13 22:19:06 +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
Eelco Dolstra
b1e6ccae4e * Subversion 1.7.2.
svn path=/nixpkgs/trunk/; revision=30776
2011-12-06 14:56:47 +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
692efb76e4 mercurial: updated to version 2.0
svn path=/nixpkgs/trunk/; revision=30443
2011-11-16 14:37:11 +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
Eelco Dolstra
eeb4d231b3 * Subversion updated to 1.7.1.
svn path=/nixpkgs/trunk/; revision=30034
2011-10-26 15:32:56 +00:00
Lluís Batlle i Rossell
22ff0a19c3 Updating the fossil tarball hash, due to an update upstream:
http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06730.html

I also add readline (it may provide a nicer prompt on fossil sqlite)
and sqlite (required for some tests).

The old tarballs were broken in a way that the tests requiring sqlite were not run.


svn path=/nixpkgs/trunk/; revision=29974
2011-10-22 20:41:37 +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
Marco Maggesi
11d18ba4fd Update fossil to version 1.20
svn path=/nixpkgs/trunk/; revision=29954
2011-10-21 14:12:46 +00:00
Ludovic Courtès
14e951e6d5 GNU RCS 5.8.
svn path=/nixpkgs/trunk/; revision=29795
2011-10-12 20:43:44 +00:00
Lluís Batlle i Rossell
2c6200c025 Updating veracity
svn path=/nixpkgs/trunk/; revision=29772
2011-10-11 19:30:11 +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
Michael Raskin
90d89bfe68 Fixing some of Veracity tests
svn path=/nixpkgs/trunk/; revision=29187
2011-09-11 16:46:17 +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
Shea Levy
eba95e013b viewmtn: Update to new url
svn path=/nixpkgs/trunk/; revision=29063
2011-09-06 17:09:41 +00:00
Lluís Batlle i Rossell
05f95c69c5 Updating meld
svn path=/nixpkgs/trunk/; revision=29016
2011-09-05 08:31:49 +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
Michael Raskin
238625aa76 Attempting to fix tests a bit..
svn path=/nixpkgs/trunk/; revision=28993
2011-09-03 10:21:55 +00:00
Lluís Batlle i Rossell
833eea6157 Updating fossil to 1.19. I can't still add readline as build input, because its
new configuration code fails to cope with nix gcc detecting readline.


svn path=/nixpkgs/trunk/; revision=28968
2011-09-01 21:03:18 +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
3e10ee5c92 Updated Haskell expressions with the latest version of cabal2nix.
* haskell-dataenc: updated to version 0.14.0.2
 * haskell-fclabels: updated to version 1.0.1

svn path=/nixpkgs/trunk/; revision=28574
2011-08-14 22:52:05 +00:00
Peter Simons
4fad68a33e Renamed darcs-2.nix to default.nix for sake of consistency. No functional change.
svn path=/nixpkgs/trunk/; revision=28503
2011-08-12 08:31:19 +00:00
Peter Simons
468c5dbc5c The 'random' library is no longer a core library in GHC 7.2.1. For older
versions of the compiler, haskell-packages.nix provides a null attribute.

svn path=/nixpkgs/trunk/; revision=28500
2011-08-12 00:18:56 +00:00
Peter Simons
b1ef3e6e36 Last batch of Haskell expression updates.
* haskell-mkcabal: updated to version 1.0.0
 * haskell-ghc-syb-utils: updated to version 0.2.1.0
 * haskell-darcs: updated to version 2.5.2

svn path=/nixpkgs/trunk/; revision=28449
2011-08-10 00:35:08 +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
Karn Kallio
a233ebf891 Switch to forward compatibility of kde45 on kde_baseapps.
svn path=/nixpkgs/trunk/; revision=28217
2011-08-07 01:45:26 +00:00
Michael Raskin
e3a809a9bb Fix Veracity build
svn path=/nixpkgs/trunk/; revision=28157
2011-08-04 16:01:50 +00:00
Michael Raskin
58c022ab56 Update Veracity
svn path=/nixpkgs/trunk/; revision=28127
2011-08-02 18:58:59 +00:00
Lluís Batlle i Rossell
f5609042c0 I broke fossil in a commit where I did not mean even to touch it.
svn path=/nixpkgs/trunk/; revision=27880
2011-07-21 14:58:13 +00:00
Lluís Batlle i Rossell
57f59594db Updating the linux 2.6.39 to 2.6.39.3
svn path=/nixpkgs/trunk/; revision=27878
2011-07-21 13:56:25 +00:00
Lluís Batlle i Rossell
bda0f3bfd0 Updating fossil.
svn path=/nixpkgs/trunk/; revision=27865
2011-07-21 06:58:14 +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
9485e2392b monotone: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=27742
2011-07-13 09:13:28 +00:00
Peter Simons
b1b274558a monotone: don't build this package on Cygwin
The expression can't build on Cygwin because it wants to know the version of
Perl that is being used. On Cygwin, however, we don't know that because we're
using sysPerl.

svn path=/nixpkgs/trunk/; revision=27741
2011-07-13 09:13:22 +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
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