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
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
Michael Raskin
cc616fbada
Update Veraity nightly version
...
svn path=/nixpkgs/trunk/; revision=23633
2010-09-03 19:59:51 +00:00
Michael Raskin
ee731b9a4d
Updating veracity
...
svn path=/nixpkgs/trunk/; revision=23590
2010-09-01 10:12:56 +00:00
Lluís Batlle i Rossell
cca1cae042
Updating from trunk. I had to do some changes to make it fit.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Lluís Batlle i Rossell
2ab5f25607
Updating 'tig' (for garbas@freenode)
...
svn path=/nixpkgs/trunk/; revision=23487
2010-08-28 14:10:49 +00:00
Marco Maggesi
b7a84503f3
Update fossil to version 2010-08-23 22:24:16
...
svn path=/nixpkgs/trunk/; revision=23455
2010-08-26 12:10:58 +00:00
Lluís Batlle i Rossell
f16353b6f2
Updated from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Michael Raskin
6c4b96434e
Update BzrTools together with Bazaar
...
svn path=/nixpkgs/trunk/; revision=23157
2010-08-12 19:59:30 +00:00
Michael Raskin
c4fb841955
An update for Bazaar was long overdue
...
svn path=/nixpkgs/trunk/; revision=23156
2010-08-12 19:53:38 +00:00
Lluís Batlle i Rossell
3f05ed581f
Making fossil cross-build (it works for the nanonote).
...
Removing some perl scripts from the openssl cross-built derivation, to avoid depending on it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23128
2010-08-11 20:08:29 +00:00
Peter Simons
1a6039cb45
Enable parallel building of gcc, glibc, gmp, mpfr, ncurses, coreutils, perl, python, git, and qt4.
...
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.
svn path=/nixpkgs/trunk/; revision=23042
2010-08-08 18:51:42 +00:00
Michael Raskin
87cbef96ca
Add Veracity distributed VCS (+ issue tracker)
...
svn path=/nixpkgs/trunk/; revision=23031
2010-08-07 22:44:25 +00:00
Peter Simons
dbef94575c
pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.2.1
...
svn path=/nixpkgs/trunk/; revision=22960
2010-08-05 11:25:02 +00:00
Michael Raskin
9456c0e43b
Add patch to fix arrow display
...
svn path=/nixpkgs/trunk/; revision=22934
2010-08-03 17:43:10 +00:00
Michael Raskin
3386ce4c5d
Update monotone-viz mtn-head
...
svn path=/nixpkgs/trunk/; revision=22925
2010-08-03 12:14:16 +00:00
Eelco Dolstra
4bf5b0d36b
* Fix some more "args: with args".
...
svn path=/nixpkgs/trunk/; revision=22828
2010-07-30 14:47:23 +00:00
Marco Maggesi
7835419d8a
Upgrade fossil to version 2010-07-03
...
svn path=/nixpkgs/trunk/; revision=22827
2010-07-30 14:03:51 +00:00
Eelco Dolstra
6609710409
* Get rid of many instances of "args: with args;", and other coding
...
guidelines violations.
* Updated libsamplerate to 0.1.7.
svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Andres Löh
6c90771ac6
* Updated darcs to 2.4.4.
...
* Added Haskell Platform 2010.2.0.0.
* Added cairo package in preparation for adding a new gtk2hs.
svn path=/nixpkgs/trunk/; revision=22714
2010-07-22 18:04:39 +00:00
Eelco Dolstra
f368dc4d4b
* Subversion 1.6.12.
...
svn path=/nixpkgs/trunk/; revision=22375
2010-06-22 13:44:53 +00:00
Michael Raskin
f1a2bd1580
Update monotone
...
svn path=/nixpkgs/trunk/; revision=22270
2010-06-15 06:16:15 +00:00
Marco Maggesi
d36f3407de
Update Fossil to the new version
...
svn path=/nixpkgs/trunk/; revision=22066
2010-05-31 14:31:13 +00:00
Marc Weber
932899f3da
Tk version number is now 8.5 but at several places TK_LIBRARY is set "${tk}/lib/tk8.4". As for Python, tk.libPrefix is introduced to match "tk8.5".
...
contributed by David Guibert
Signed-off-by: David Guibert <david.guibert@gmail.com>
svn path=/nixpkgs/trunk/; revision=22041
2010-05-28 10:57:50 +00:00
Peter Simons
5e4bf97212
pkgs/applications/version-management/git-and-tools: disable sendEmailSupport on Darwin in gitFull
...
The required perl libraries don't build on Darwin.
svn path=/nixpkgs/trunk/; revision=21872
2010-05-19 12:26:17 +00:00
Peter Simons
1fc724cc5c
pkgs/applications/version-management/git-and-tools/git: build git on all platforms, not just Linux
...
svn path=/nixpkgs/trunk/; revision=21839
2010-05-18 14:41:18 +00:00
Peter Simons
39b2ec2488
Fix git-send-email.
...
git-send-email depends on Net::SMTP and Net::SMTP::SSL. Make
sendEmailSupport a config for git, and bring these libraries. Wrap
the send-email script, or replace with a not supported script.
svn path=/nixpkgs/trunk/; revision=21789
2010-05-15 10:38:28 +00:00
Marco Maggesi
891868a4fe
Add package for Fossil
...
svn path=/nixpkgs/trunk/; revision=21746
2010-05-12 13:17:19 +00:00
Peter Simons
67cf56d2a5
git-subtree: added the version 0.3.
...
svn path=/nixpkgs/trunk/; revision=21645
2010-05-07 14:01:39 +00:00
Peter Simons
d21dc14966
pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.1
...
svn path=/nixpkgs/trunk/; revision=21604
2010-05-05 10:26:19 +00:00
Rob Vermaas
9e5ab46737
added git2cl script
...
svn path=/nixpkgs/trunk/; revision=21590
2010-05-04 10:06:50 +00:00
Yury G. Kudryashov
882c847590
enable neon version check in svn
...
svn path=/nixpkgs/trunk/; revision=21395
2010-04-28 09:38:46 +00:00
Andres Löh
f892a8efaa
Darcs updated to 2.4.1; now ghc-6.12-compatible.
...
svn path=/nixpkgs/trunk/; revision=21355
2010-04-27 19:51:37 +00:00
Eelco Dolstra
ac5555e40c
* Subversion 1.6.11. Also updated meta.homepage to reflect that it's
...
now an Apache project.
svn path=/nixpkgs/trunk/; revision=21194
2010-04-21 09:47:26 +00:00
Peter Simons
689d42ad19
pkgs/applications/version-management/mercurial: updated to version 1.5.1
...
Patch courtesy of Jean-Marie Gaillourdet.
svn path=/nixpkgs/trunk/; revision=21056
2010-04-13 10:00:43 +00:00
Peter Simons
bf775b5cdc
pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0.5
...
svn path=/nixpkgs/trunk/; revision=21055
2010-04-13 09:55:19 +00:00
Peter Simons
2185e04b88
pkgs/applications/version-management/git-and-tools/git: bumped version to 1.7.0.4
...
svn path=/nixpkgs/trunk/; revision=21026
2010-04-12 11:21:29 +00:00
Lluís Batlle i Rossell
3c2c4ac87a
Adding 'meld'
...
svn path=/nixpkgs/trunk/; revision=20963
2010-04-06 19:39:29 +00:00
Yury G. Kudryashov
b01b22892b
Use override for gitFull
...
svn path=/nixpkgs/trunk/; revision=20927
2010-04-02 12:39:38 +00:00
Yury G. Kudryashov
284c448d12
Fix gitFull build
...
svn path=/nixpkgs/trunk/; revision=20926
2010-04-02 07:43:02 +00:00
Yury G. Kudryashov
7af927d96b
Improve git-svn support
...
svn path=/nixpkgs/trunk/; revision=20925
2010-04-02 07:17:11 +00:00
Peter Simons
9c9620b334
pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0.3
...
svn path=/nixpkgs/trunk/; revision=20776
2010-03-23 09:34:58 +00:00
Rob Vermaas
a5586000d4
fix subversion perl bindings for gitFull
...
svn path=/nixpkgs/trunk/; revision=20771
2010-03-22 11:13:02 +00:00
Michael Raskin
cd8cc93432
Update Monotone
...
svn path=/nixpkgs/trunk/; revision=20716
2010-03-17 15:13:13 +00:00
Lluís Batlle i Rossell
26ca329ec4
Making gitFull get the subversion as it wants: with perlBindings.
...
This should allow hydra building it properly.
svn path=/nixpkgs/trunk/; revision=20701
2010-03-17 13:27:05 +00:00
Peter Simons
f92867651f
pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0.2
...
svn path=/nixpkgs/trunk/; revision=20649
2010-03-16 12:13:32 +00:00
Lluís Batlle i Rossell
d44be49320
Updating tkcvs (which includes tkdiff)
...
svn path=/nixpkgs/trunk/; revision=20632
2010-03-15 14:26:47 +00:00
Marc Weber
b2c15d8c37
git-1.7: Python is optional
...
svn path=/nixpkgs/trunk/; revision=20603
2010-03-13 06:07:44 +00:00
Lluís Batlle i Rossell
57ea53f67a
Adding rapidsvn
...
svn path=/nixpkgs/trunk/; revision=20538
2010-03-10 20:44:40 +00:00
Lluís Batlle i Rossell
ba28274db7
Updating mercurial
...
svn path=/nixpkgs/trunk/; revision=20439
2010-03-05 21:59:52 +00:00
Michael Raskin
c3e3bc52dc
Fix missed argument
...
svn path=/nixpkgs/trunk/; revision=20113
2010-02-18 16:26:35 +00:00
Peter Simons
c7e5f6a80b
pkgs/applications/version-management/git-and-tools/git: version 1.7.0 needs Python
...
svn path=/nixpkgs/trunk/; revision=20096
2010-02-18 12:08:39 +00:00
Marc Weber
8acdb419c6
fix git-fast-import by using a correct tar.gz
...
svn path=/nixpkgs/trunk/; revision=20086
2010-02-18 01:49:45 +00:00
Marc Weber
662a933eb0
fix mercurial gui (python lib path still pointed to 2.5 bet python 2.6 is used now)
...
svn path=/nixpkgs/trunk/; revision=20085
2010-02-18 01:49:41 +00:00
Peter Simons
6a48baead3
pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0
...
svn path=/nixpkgs/trunk/; revision=20083
2010-02-18 00:28:24 +00:00
Peter Simons
200c07d817
pkgs/applications/version-management/git-and-tools/git: added myself to the list of maintainers
...
svn path=/nixpkgs/trunk/; revision=20082
2010-02-18 00:28:15 +00:00
Peter Simons
7fd8b772db
pkgs/applications/version-management/rcs/default.nix: meta.platforms is not a list
...
svn path=/nixpkgs/trunk/; revision=20053
2010-02-16 14:19:07 +00:00
Marc Weber
edc1d89a45
update git-1.6.6.2
...
svn path=/nixpkgs/trunk/; revision=19983
2010-02-13 17:39:25 +00:00
Eelco Dolstra
4e0ccd63b3
* In NixOS chroot builds, there is no root account. So rcs' configure
...
should not rely on its existence in deciding whether to use
getpwuid(). Not using getpwuid() causes rcs to fail with "ci:
setuid not supported".
svn path=/nixpkgs/trunk/; revision=19957
2010-02-12 14:27:26 +00:00
Ludovic Courtès
8004163ff3
TopGit: Use `fetchgit' rather than relying on Gitweb-generated tarballs.
...
Gitweb's tarballs change overtime, probably because they are generated
on-demand and files have different timestamps.
svn path=/nixpkgs/trunk/; revision=19896
2010-02-10 11:28:22 +00:00
Eelco Dolstra
79df27d45b
* Subversion 1.6.9.
...
svn path=/nixpkgs/trunk/; revision=19791
2010-02-03 18:39:13 +00:00
Ludovic Courtès
ca9dcb28a1
topgit: Fix.
...
svn path=/nixpkgs/trunk/; revision=19695
2010-01-26 21:45:07 +00:00
Ludovic Courtès
ecc992b7b1
topgit: Get a genuine source tarball; install `README'.
...
svn path=/nixpkgs/trunk/; revision=19693
2010-01-26 21:26:01 +00:00
Ludovic Courtès
98b73c1306
cvs: Fix getcwd() from Gnulib so that it works in chroots.
...
svn path=/nixpkgs/trunk/; revision=19564
2010-01-20 11:08:50 +00:00
Ludovic Courtès
5143789a4d
git: Remove extra `meta.license' tag.
...
svn path=/nixpkgs/trunk/; revision=19527
2010-01-18 16:49:19 +00:00
Ludovic Courtès
88646b77e1
git: Augment meta' so that
gitFull' gets built by Hydra.
...
svn path=/nixpkgs/trunk/; revision=19526
2010-01-18 16:07:48 +00:00
Ludovic Courtès
b8bb0ce6dd
Add `gitFull'.
...
svn path=/nixpkgs/trunk/; revision=19525
2010-01-18 16:07:44 +00:00
Michael Raskin
cfcadb5967
Montone update
...
svn path=/nixpkgs/trunk/; revision=19512
2010-01-17 23:38:12 +00:00
Marc Weber
1106d431fc
fix various builds by updating perl URI package update perl URI package
...
fix expect: Neither was the executable installed nor the shared library
fix topGit source
update synergy fixing build
svn path=/nixpkgs/trunk/; revision=19064
2009-12-21 08:55:31 +00:00
Peter Simons
24c117f98d
pkgs/applications/version-management/git-and-tools/git: updated to version 1.6.5.6
...
svn path=/nixpkgs/trunk/; revision=18917
2009-12-13 13:47:10 +00:00
Marc Weber
362f811a7a
Revert "git: allow applying patches by config"
...
This reverts commit rev 18897
I should have used overrideDerivation.
svn path=/nixpkgs/trunk/; revision=18911
2009-12-12 18:10:26 +00:00
Marc Weber
0ceae8f6d1
git: allow applying patches by config
...
svn path=/nixpkgs/trunk/; revision=18897
2009-12-11 13:58:31 +00:00
Marc Weber
5319704f80
removing old bleeding edge cruft replacing it by a niftier version using
...
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README .
sourceByName is called sourceFromHead now.
updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update
svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +00:00
Peter Simons
89b59e3fbc
applications/version-management/git-and-tools/git: update to version 1.6.5.5
...
svn path=/nixpkgs/trunk/; revision=18847
2009-12-08 20:35:51 +00:00
Eelco Dolstra
7f5b839524
* Removed selectVersion. There's no good reason to write
...
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
packages.
* Renamed several files to `default.nix'. As a general rule, version
numbers should only be included in the filename when there is a
reason to keep multiple versions of a package in Nixpkgs.
Otherwise, it just makes it harder to update the package.
svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Michael Raskin
24162c6b4a
Fix fetchmtn
...
svn path=/nixpkgs/trunk/; revision=18298
2009-11-08 22:12:14 +00:00
Eelco Dolstra
25a675da23
* Subversion 1.6.6.
...
svn path=/nixpkgs/trunk/; revision=18093
2009-11-04 13:41:55 +00:00
Peter Simons
b06c0d1a1d
pkgs/applications/version-management/git-and-tools/default.nix: use docbook dtd 4.5
...
Ensure that the 4.5 DTD required by asciidoc is available.
svn path=/nixpkgs/trunk/; revision=18078
2009-11-03 15:57:31 +00:00
Peter Simons
d330b000fc
Updated git to version 1.6.5.2.
...
svn path=/nixpkgs/trunk/; revision=18018
2009-10-29 12:06:04 +00:00
Marc Weber
748dd33b25
hg2git has been put into repo fast-export. make it work again
...
svn path=/nixpkgs/trunk/; revision=17977
2009-10-27 17:46:37 +00:00
Peter Simons
4cf582c570
pkgs/applications/version-management/git-and-tools/git/default.nix: dropped 'set -x' from builder script
...
svn path=/nixpkgs/trunk/; revision=17903
2009-10-20 14:08:58 +00:00
Peter Simons
2139d48872
pkgs/applications/version-management/git-and-tools/git/default.nix: updated to version 1.6.5.1
...
svn path=/nixpkgs/trunk/; revision=17902
2009-10-20 14:08:53 +00:00
Marc Weber
da731ce190
doh!
...
svn path=/nixpkgs/trunk/; revision=17877
2009-10-19 12:27:51 +00:00
Marc Weber
84a2555b2c
topgit: remove obsolete patches
...
svn path=/nixpkgs/trunk/; revision=17859
2009-10-18 04:43:43 +00:00
Michael Raskin
d1e55d0210
Install monotone Perl API
...
svn path=/nixpkgs/trunk/; revision=17818
2009-10-15 11:13:21 +00:00
Andres Löh
1a1a661f4b
Version bump for darcs.
...
svn path=/nixpkgs/trunk/; revision=17729
2009-10-08 14:07:13 +00:00
Peter Simons
efaa637d76
subversion: fixed definition of meta.platforms
...
svn path=/nixpkgs/trunk/; revision=17627
2009-10-03 12:48:29 +00:00
Eelco Dolstra
83aa130427
svn path=/nixpkgs/trunk/; revision=17598
2009-10-02 12:36:04 +00:00
Eelco Dolstra
aa6c9ba04e
* The "static" flag is no longer used it seems. And static builds can
...
probably be done using the makeStaticBinaries stdenv adapter.
svn path=/nixpkgs/trunk/; revision=17595
2009-10-02 11:51:35 +00:00
Eelco Dolstra
4041f93fbf
* SWIG apparently doesn't need Perl/Python/Guile/JDK/20 other
...
languages at build time. It seems they're only used in "make
check".
* Subversion: updated to 1.6.5.
svn path=/nixpkgs/trunk/; revision=17594
2009-10-02 11:49:21 +00:00
Michael Raskin
b595a17822
Update monotone
...
svn path=/nixpkgs/trunk/; revision=17517
2009-09-29 22:03:39 +00:00
Peter Simons
ad7eebbad1
Revert "optionally apply git glob patch to default git"
...
Please submit patches *upstream*.
svn path=/nixpkgs/trunk/; revision=17466
2009-09-28 12:56:46 +00:00
Marc Weber
48865a4aa6
symlink duplicate git executables to bring down $out to 13MB (was > 100MB)
...
svn path=/nixpkgs/trunk/; revision=17458
2009-09-26 23:33:11 +00:00
Marc Weber
afbb4d0b59
update topgit - using official release now
...
svn path=/nixpkgs/trunk/; revision=17457
2009-09-26 23:33:08 +00:00
Marc Weber
c641935190
optionally apply git glob patch to default git
...
svn path=/nixpkgs/trunk/; revision=17456
2009-09-26 23:33:05 +00:00
Michael Raskin
0801921e7e
Really fix mercurial version in name
...
svn path=/nixpkgs/trunk/; revision=17445
2009-09-26 15:08:47 +00:00
Lluís Batlle i Rossell
79090f21d4
Fixing the mercurial version in name
...
svn path=/nixpkgs/trunk/; revision=17444
2009-09-26 15:05:34 +00:00
Peter Simons
8472f948a8
Updated git to version 1.6.4.4.
...
svn path=/nixpkgs/trunk/; revision=17235
2009-09-17 21:03:06 +00:00
Peter Simons
bba3090136
Updated git to version 1.6.4.2.
...
svn path=/nixpkgs/trunk/; revision=16994
2009-09-09 11:26:53 +00:00
Eelco Dolstra
6009ff1c72
svn path=/nixpkgs/trunk/; revision=16616
2009-08-07 15:29:34 +00:00
Peter Simons
1c45eda25a
Updated qgit to version 2.3.
...
svn path=/nixpkgs/trunk/; revision=16264
2009-07-09 09:08:22 +00:00
Michael Raskin
dd89941fb2
Added myself as the maintainer of some packages
...
svn path=/nixpkgs/trunk/; revision=16221
2009-07-07 15:05:15 +00:00
Michael Raskin
af58e1024b
Update monotone-viz.
...
svn path=/nixpkgs/trunk/; revision=16203
2009-07-07 10:01:36 +00:00
Peter Simons
5b9d573d62
Pass explicit paths for --with-zlib and --with-sqlite.
...
This might reduce the chances of something funny happening.
svn path=/nixpkgs/trunk/; revision=16185
2009-07-06 10:39:59 +00:00
Peter Simons
aded9986c5
Re-added the description of this patch, which was accidentally
...
overwritten in my last commit.
svn path=/nixpkgs/trunk/; revision=16149
2009-07-02 17:05:55 +00:00
Peter Simons
5e7f7822f8
Updated git to version 1.6.3.3.
...
The fill-paragraph patch is obsolete; it's now part of the distribution.
svn path=/nixpkgs/trunk/; revision=16148
2009-07-02 15:41:58 +00:00
Peter Simons
2d10c04eff
Updated subversion to 1.6.3.
...
svn path=/nixpkgs/trunk/; revision=16147
2009-07-02 15:41:46 +00:00
Lluís Batlle i Rossell
a422cec621
Adding tkcvs (which manages also subversion repositories well, they claim)
...
svn path=/nixpkgs/trunk/; revision=16008
2009-06-19 09:02:48 +00:00
Michael Raskin
c7c225d5fe
Update monotone
...
svn path=/nixpkgs/trunk/; revision=15680
2009-05-20 17:35:48 +00:00
Marc Weber
52647ea3b0
FullDepEntry -> fullDepEntry, PackEntry -> packEntry
...
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Eelco Dolstra
0a54c9bcff
* Subversion updated to 1.6.2.
...
svn path=/nixpkgs/trunk/; revision=15583
2009-05-13 10:18:05 +00:00
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