Lluís Batlle i Rossell
01c5028c7c
Updating xburst-tools (blind commit, I did not try to build them)
...
svn path=/nixpkgs/trunk/; revision=31377
2012-01-06 21:06:22 +00:00
Shea Levy
8c063fdfc7
Fix tarball
...
svn path=/nixpkgs/trunk/; revision=31352
2012-01-06 16:14:02 +00:00
Yury G. Kudryashov
900c6e18cd
svn merge ^/nixpkgs/trunk
...
Conflicts: openssl, libplist
svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Yury G. Kudryashov
5925d6d9a7
most: add random meta.platforms
...
svn path=/nixpkgs/trunk/; revision=31322
2012-01-05 23:15:41 +00:00
Yury G. Kudryashov
fcaa6a1abe
usbmuxd-1.0.7
...
svn path=/nixpkgs/trunk/; revision=31321
2012-01-05 23:15:33 +00:00
Yury G. Kudryashov
6ed3147550
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=31311
2012-01-05 12:11:18 +00:00
Eelco Dolstra
961ad6a314
* rp-pppoe requires a version attribute in ppp.
...
svn path=/nixpkgs/trunk/; revision=31295
2012-01-04 19:04:09 +00:00
Yury G. Kudryashov
394fd28e4e
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
2012-01-04 15:22:16 +00:00
Yury G. Kudryashov
3ca6582874
ppp-2.4.5, a few patches
...
svn path=/nixpkgs/trunk/; revision=31279
2012-01-04 15:10:27 +00:00
Yury G. Kudryashov
3d61c49b42
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Lluís Batlle i Rossell
855e8f45a4
Fixing a typo in the icoutils file.
...
svn path=/nixpkgs/trunk/; revision=31267
2012-01-04 09:47:22 +00:00
Yury G. Kudryashov
bdb01cc707
svn merge /path/to/nixpkgs/trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=31266
2012-01-04 09:45:28 +00:00
Lluís Batlle i Rossell
8fadcd285a
Adding icoutils
...
svn path=/nixpkgs/trunk/; revision=31265
2012-01-04 09:42:38 +00:00
Lluís Batlle i Rossell
b15381fcf6
Adding pngtoico.
...
svn path=/nixpkgs/trunk/; revision=31264
2012-01-04 09:29:52 +00:00
Yury G. Kudryashov
b3709689db
Add modemmanager
...
svn path=/nixpkgs/trunk/; revision=31263
2012-01-04 09:05:22 +00:00
Yury G. Kudryashov
2bca92e32d
Merge trunk
...
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Yury G. Kudryashov
53739d23dc
Merge trunk
...
svn path=/nixpkgs/branches/libpng15/; revision=31239
2012-01-03 15:50:39 +00:00
Yury G. Kudryashov
3af2d4a89e
Add kde4.networkmanagement
...
You still need to start NetworkManager daemon manually to use this widget
svn path=/nixpkgs/trunk/; revision=31229
2012-01-03 13:39:09 +00:00
Yury G. Kudryashov
67add4eec5
pngcrush-1.7.22
...
svn path=/nixpkgs/branches/libpng15/; revision=31218
2012-01-02 19:25:08 +00:00
Yury G. Kudryashov
08761e83fc
Merge trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Florian Friesdorf
aefc550ae0
asciidoc-8.6.6
...
svn path=/nixpkgs/trunk/; revision=31169
2011-12-31 04:05:33 +00:00
Lluís Batlle i Rossell
58af7eb6bf
Adding smbldap-tools. And some CPAN packages as bonus.
...
svn path=/nixpkgs/trunk/; revision=31118
2011-12-27 21:35:50 +00:00
Lluís Batlle i Rossell
0def824532
Updating webalizer.
...
svn path=/nixpkgs/trunk/; revision=31105
2011-12-26 17:27:30 +00:00
Yury G. Kudryashov
f77741e018
merge trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Yury G. Kudryashov
f806eca299
Actually upgrade ntfs-3g
...
ntfsprogs collection is now part of ntfs-3g
svn path=/nixpkgs/trunk/; revision=31065
2011-12-24 22:28:00 +00:00
Peter Simons
f4439564cb
asymptote: fix info dir some more
...
svn path=/nixpkgs/trunk/; revision=31060
2011-12-24 18:28:23 +00:00
Peter Simons
a4a5a35f2d
asymptote: added fixInfoDir hook to move the generated info files into the correct location
...
svn path=/nixpkgs/trunk/; revision=31059
2011-12-24 18:03:51 +00:00
Peter Simons
f13c4dba3d
asymptote: updated to version 2.15
...
svn path=/nixpkgs/trunk/; revision=31058
2011-12-24 11:05:21 +00:00
Eelco Dolstra
3f209edf6e
* Updated ntfs-3g to 2011.4.12. Also create a sbin/mount.ntfs symlink
...
to ensure that NTFS filesystems are mounted using ntfs-3g, which is
much better than the kernel NTFS driver. In particular, this
ensures that udisks will automount external NTFS drives with
read/write support. (See also
http://www.tuxera.com/community/ntfs-3g-faq/#plugandplay )
svn path=/nixpkgs/trunk/; revision=31055
2011-12-23 14:19:45 +00:00
Eelco Dolstra
cddfcd7bcc
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=31043
2011-12-22 12:30:59 +00:00
Lluís Batlle i Rossell
e91a225a37
Updating gnuplot
...
svn path=/nixpkgs/trunk/; revision=31027
2011-12-21 22:48:33 +00:00
Yury G. Kudryashov
b077940b3b
svn merge https://nixos.org/repos/nix/nixpkgs/trunk
...
No conflicts
svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Yury G. Kudryashov
aaba1c0bf9
pdf2djvu-0.7.11
...
Preparing to poppler-0.18.x update
svn path=/nixpkgs/trunk/; revision=30896
2011-12-14 18:58:12 +00:00
Eelco Dolstra
f8f4f4af33
* gnugrep needs xz to unpack its sources.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30879
2011-12-14 10:26:44 +00:00
Ludovic Courtès
d2c923bc01
GNU grep 2.10.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30868
2011-12-13 16:09:48 +00:00
Ludovic Courtès
79819a5262
Wicd: Protect the password in the WPA2-TTLS template.
...
svn path=/nixpkgs/trunk/; revision=30867
2011-12-13 14:54:15 +00:00
Eelco Dolstra
c044d7f56f
* Forgot a few utillinuxng references.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30866
2011-12-13 12:57:32 +00:00
Michael Raskin
f9227dc459
Update BtrFS utilities to latest Git
...
svn path=/nixpkgs/trunk/; revision=30864
2011-12-13 04:30:49 +00:00
Eelco Dolstra
661ea8936f
* ‘which’ doesn't actually depend on readline.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30861
2011-12-12 23:41:02 +00:00
Eelco Dolstra
33090b2198
* bzip2 updated to 1.0.6 (with a fix for CVE-2010-0405).
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30853
2011-12-12 17:06:31 +00:00
Eelco Dolstra
eda3fd1730
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Eelco Dolstra
3ea1c30846
* Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing
...
in its interaction with the ‘dontStrip’ attribute.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
2011-12-12 14:02:12 +00:00
Peter Simons
c561cbe8c8
upgraded mc
...
svn path=/nixpkgs/trunk/; revision=30838
2011-12-11 19:39:06 +00:00
Lluís Batlle i Rossell
894a3756e5
Updating btar to latest release.
...
svn path=/nixpkgs/trunk/; revision=30821
2011-12-10 22:00:56 +00:00
Lluís Batlle i Rossell
4a6af291a3
Adding btar 0.9!
...
svn path=/nixpkgs/trunk/; revision=30815
2011-12-09 21:15:41 +00:00
Eelco Dolstra
5ce6bf04f2
* vde2 updated to 2.3.2.
...
svn path=/nixpkgs/trunk/; revision=30804
2011-12-09 11:14:02 +00:00
Lluís Batlle i Rossell
b4c5f72d9e
Updating ts
...
svn path=/nixpkgs/trunk/; revision=30797
2011-12-07 15:26:34 +00:00
Peter Simons
088470ef55
pkgs/tools/networking/p2p/rtorrent/default.nix: avoid use of "install -D" to make FreeBSD happy
...
svn path=/nixpkgs/trunk/; revision=30783
2011-12-06 20:44:31 +00:00
Eelco Dolstra
8ed604d4b8
* Bump.
...
svn path=/nixpkgs/trunk/; revision=30740
2011-12-05 12:12:20 +00:00
Ludovic Courtès
b7833639ba
Seeks 0.4.0.
...
svn path=/nixpkgs/trunk/; revision=30729
2011-12-04 22:03:03 +00:00
Michael Raskin
fdbef21ceb
Adjust most things to be cross-buildable. Problem: gnutls. Solution: manually replace it with openssl while cross-building
...
svn path=/nixpkgs/trunk/; revision=30709
2011-12-03 09:29:38 +00:00
Michael Raskin
a6da9f24c7
Fix more incorrect native/target buildInput split in tigervnc; current stumbling block is gnutls
...
svn path=/nixpkgs/trunk/; revision=30682
2011-12-02 06:02:40 +00:00
Michael Raskin
791aaf0357
Use Xorg buildNativeInputs correctly
...
svn path=/nixpkgs/trunk/; revision=30680
2011-12-02 05:50:53 +00:00
Michael Raskin
3b1a603782
Propagate buildNativeInputs without changing their types
...
svn path=/nixpkgs/trunk/; revision=30679
2011-12-02 05:50:08 +00:00
Michael Raskin
32eff94091
Pass all configureFlags - including cross-build options, for example
...
svn path=/nixpkgs/trunk/; revision=30678
2011-12-02 04:16:58 +00:00
Ludovic Courtès
ccc5902325
GNU recutils 1.4.
...
svn path=/nixpkgs/trunk/; revision=30671
2011-12-01 22:44:29 +00:00
Ludovic Courtès
6b920275b8
GNU FreeIPMI 1.0.9.
...
svn path=/nixpkgs/trunk/; revision=30668
2011-12-01 22:44:10 +00:00
Ludovic Courtès
95696578a9
GNU wdiff 1.10.
...
svn path=/nixpkgs/trunk/; revision=30665
2011-12-01 22:43:53 +00:00
Ludovic Courtès
170399a858
GNU Xorriso 1.1.8.
...
svn path=/nixpkgs/trunk/; revision=30664
2011-12-01 22:43:46 +00:00
Ludovic Courtès
2f87b70323
GNU Parallel 20111122.
...
svn path=/nixpkgs/trunk/; revision=30662
2011-12-01 22:43:31 +00:00
Eelco Dolstra
d10ed1b45b
* Bump.
...
svn path=/nixpkgs/trunk/; revision=30630
2011-11-29 22:56:29 +00:00
Michael Raskin
15f77a015e
Update fakeroot
...
svn path=/nixpkgs/trunk/; revision=30610
2011-11-29 05:13:20 +00:00
Michael Raskin
36ae9193c4
Fix tmux cross-build
...
svn path=/nixpkgs/trunk/; revision=30585
2011-11-28 15:58:45 +00:00
Russell O'Connor
c9b2f32c45
Updating bitcoin to version 0.5.0.
...
svn path=/nixpkgs/trunk/; revision=30553
2011-11-24 19:48:20 +00:00
Eelco Dolstra
6c02d31c68
* Bump.
...
svn path=/nixpkgs/trunk/; revision=30544
2011-11-23 15:59:09 +00:00
Rob Vermaas
47e2f1c820
update nixUnstable
...
svn path=/nixpkgs/trunk/; revision=30511
2011-11-21 15:41:19 +00:00
Florian Friesdorf
1b8c781a0c
add dtach-0.8
...
svn path=/nixpkgs/trunk/; revision=30497
2011-11-20 21:48:56 +00:00
Rob Vermaas
e2fd2c4e23
openvpn: enable option to use password files
...
svn path=/nixpkgs/trunk/; revision=30461
2011-11-18 02:10:14 +00:00
Eelco Dolstra
86e8dcc34b
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=30460
2011-11-17 12:05:52 +00:00
Shea Levy
10cbd00396
Allow cross-compiling configurations to explicitly give a system string when cross-building nix
...
svn path=/nixpkgs/trunk/; revision=30458
2011-11-16 21:04:02 +00:00
Shea Levy
e895fe5e2f
Use gc, dbi, and dbd-sqlite when cross-building nix
...
The dbi and dbd-sqlite may be hacks since they're not cross-built, I'm not certain
svn path=/nixpkgs/trunk/; revision=30455
2011-11-16 20:21:58 +00:00
Ludovic Courtès
0093d96841
GNU Wget: Prepare for cross-compilation of a stripped-down version.
...
svn path=/nixpkgs/trunk/; revision=30445
2011-11-16 14:48:27 +00:00
Piotr Pietraszkiewicz
63d36b5185
Version bump - Gource 0.37
...
svn path=/nixpkgs/trunk/; revision=30429
2011-11-14 20:03:43 +00:00
Eelco Dolstra
e6cbed31ee
* Hard-code the path to xdpyinfo rather than expecting it to be in
...
$PATH. This is necessary because x11vnc does a "su - <user>
... xdpyinfo" somewhere.
svn path=/nixpkgs/trunk/; revision=30387
2011-11-11 03:11:09 +00:00
Lluís Batlle i Rossell
8ce410c6f3
Adding more libraries to have a more featured dar.
...
svn path=/nixpkgs/trunk/; revision=30377
2011-11-10 21:29:00 +00:00
Lluís Batlle i Rossell
1791ea0919
Another update to dar. Let's use the very latest release.
...
svn path=/nixpkgs/trunk/; revision=30376
2011-11-10 21:23:09 +00:00
Lluís Batlle i Rossell
9908557ae0
Updating dar.
...
svn path=/nixpkgs/trunk/; revision=30375
2011-11-10 21:19:30 +00:00
Eelco Dolstra
75b527df8e
* Fix some hard-coded paths.
...
svn path=/nixpkgs/trunk/; revision=30373
2011-11-10 19:06:02 +00:00
Eelco Dolstra
d0c78d6a58
* TigerVNC updated to 1.1.0.
...
* Build TigerVNC with TLS and PAM support. TLS support is important
to support encrypted VNC servers.
svn path=/nixpkgs/trunk/; revision=30372
2011-11-10 19:05:43 +00:00
Lluís Batlle i Rossell
c761760442
Adding imapproxy
...
svn path=/nixpkgs/trunk/; revision=30360
2011-11-09 18:25:55 +00:00
Eelco Dolstra
43b5478d1d
* x11vnc updated to 0.9.13.
...
svn path=/nixpkgs/trunk/; revision=30356
2011-11-09 16:44:49 +00:00
Evgeny Egorochkin
64ee527151
Duplicity: version bump
...
svn path=/nixpkgs/trunk/; revision=30352
2011-11-09 13:01:46 +00:00
Lluís Batlle i Rossell
d72fe9fee2
Adding prayer. It builds on linux x86_64, but I've not tried to run it.
...
svn path=/nixpkgs/trunk/; revision=30347
2011-11-08 21:07:57 +00:00
Eelco Dolstra
169d5c3214
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=30319
2011-11-08 14:18:59 +00:00
Peter Simons
368ac01473
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
Lluís Batlle i Rossell
74ef91cfae
Updating ntp
...
svn path=/nixpkgs/trunk/; revision=30290
2011-11-07 15:07:19 +00:00
Shea Levy
83acc83fb7
Reenable grub2_efi
...
svn path=/nixpkgs/trunk/; revision=30262
2011-11-06 17:08:05 +00:00
Eelco Dolstra
4d95b41bc8
* curl updated to 7.22.0. Dropped the connect timeout patch because
...
it doesn't seem necessary anymore.
svn path=/nixpkgs/trunk/; revision=30243
2011-11-05 01:55:53 +00:00
Lluís Batlle i Rossell
15c16f50aa
Adding dnstop
...
svn path=/nixpkgs/trunk/; revision=30209
2011-11-03 18:43:48 +00:00
Peter Simons
69488d688d
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
2011-11-02 10:28:32 +00:00
Lluís Batlle i Rossell
d4b26a727a
Updating unbound.
...
svn path=/nixpkgs/trunk/; revision=30174
2011-11-01 22:33:40 +00:00
Eelco Dolstra
0918b83c75
* Added the Docbook 4.1 SGML DTDs.
...
* Fixed the "docbook2man --sgml" command in docbook2x.
* Fixed the module-init-tools manual pages.
svn path=/nixpkgs/trunk/; revision=30165
2011-11-01 16:47:18 +00:00
Eelco Dolstra
bd5e996e20
* Apply a patch to fix the "max resident" size reported by ‘time’
...
being off by a factor of 4. (The most recent release of ‘time’ is
from 1996 BTW...)
svn path=/nixpkgs/trunk/; revision=30143
2011-10-31 14:44:32 +00:00
Cillian de Roiste
e15db25ff3
Updating unetbootin to 563, the previous version was not working for me at all, it dropped me to a busybox shell
...
svn path=/nixpkgs/trunk/; revision=30139
2011-10-31 00:25:55 +00:00
Ludovic Courtès
929841f10a
GNU Wget 1.13.4.
...
svn path=/nixpkgs/trunk/; revision=30121
2011-10-30 00:01:24 +00:00
Ludovic Courtès
1476689828
GNU Fdisk 1.3.0a.
...
svn path=/nixpkgs/trunk/; revision=30115
2011-10-30 00:00:48 +00:00
Ludovic Courtès
9b12043e62
GNU FreeIPMI 1.0.8.
...
svn path=/nixpkgs/trunk/; revision=30114
2011-10-30 00:00:43 +00:00
Ludovic Courtès
7da5374672
GNU Xorriso 1.1.6.
...
svn path=/nixpkgs/trunk/; revision=30113
2011-10-30 00:00:39 +00:00
Ludovic Courtès
54786058b2
GNU Parallel 20111022.
...
svn path=/nixpkgs/trunk/; revision=30112
2011-10-30 00:00:34 +00:00
Shea Levy
c90c831a85
ntfs-3g: The tuxera url isn't working
...
svn path=/nixpkgs/trunk/; revision=30092
2011-10-28 21:28:52 +00:00
Shea Levy
a5c4b75643
reiserfsprogs: Use the kernel mirrors
...
svn path=/nixpkgs/trunk/; revision=30088
2011-10-28 21:02:34 +00:00
Eelco Dolstra
041170f5ec
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=30078
2011-10-28 18:06:23 +00:00
Eelco Dolstra
78ff18a538
* ec2-api-tools updated to 1.4.4.2.
...
svn path=/nixpkgs/trunk/; revision=30054
2011-10-27 15:15:28 +00:00
Peter Simons
61c4b72f0e
coreutils: added missing xz build input
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30028
2011-10-26 09:58:19 +00:00
Peter Simons
dfd063cf12
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
2011-10-26 09:15:25 +00:00
Lluís Batlle i Rossell
cb823d1c08
Adding mu0, maildir utils.
...
svn path=/nixpkgs/trunk/; revision=29995
2011-10-24 16:36:03 +00:00
Alexander Tsamutali
5cd2d19bb5
tools/misc/qjoypad: New nixbuild.
...
svn path=/nixpkgs/trunk/; revision=29977
2011-10-22 22:12:45 +00:00
Peter Simons
68198ed18d
smartmontools: updated to version 5.42
...
svn path=/nixpkgs/trunk/; revision=29966
2011-10-21 17:00:03 +00:00
Eelco Dolstra
9704af30c3
* Latest EC2 AMI tools.
...
svn path=/nixpkgs/trunk/; revision=29963
2011-10-21 16:25:27 +00:00
Sander van der Burg
631f071df8
Bumped version of disnixos
...
svn path=/nixpkgs/trunk/; revision=29929
2011-10-20 11:07:47 +00:00
Sander van der Burg
4f32c23d86
Bumped some versions of Disnix tools
...
svn path=/nixpkgs/trunk/; revision=29890
2011-10-19 12:24:24 +00:00
Peter Simons
8dfef0f4a0
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29851
2011-10-14 22:06:50 +00:00
Ludovic Courtès
5d5b893223
GNU Coreutils 8.14.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29848
2011-10-14 21:56:16 +00:00
Ludovic Courtès
0baf364715
XZ Utils 5.0.3.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29846
2011-10-14 21:56:07 +00:00
Rob Vermaas
c7cea676ce
add disper
...
svn path=/nixpkgs/trunk/; revision=29845
2011-10-14 18:04:34 +00:00
Peter Simons
85c97efc50
nbd: updated to version 2.9.24
...
svn path=/nixpkgs/trunk/; revision=29829
2011-10-13 17:00:46 +00:00
Lluís Batlle i Rossell
19503ac12a
Updating task spooler
...
svn path=/nixpkgs/trunk/; revision=29809
2011-10-13 08:59:56 +00:00
Peter Simons
ee2fdfb00d
mscgen: added version 0.20
...
svn path=/nixpkgs/trunk/; revision=29803
2011-10-13 07:38:44 +00:00
Peter Simons
e3984c2caf
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29739
2011-10-10 17:01:17 +00:00
Peter Simons
6170e88607
pkgs/tools/text/odt2txt: fixed evaluation error
...
svn path=/nixpkgs/trunk/; revision=29738
2011-10-10 08:56:08 +00:00
Joachim Schiele
f3f0940e25
added support for cntlm on nixos!
...
svn path=/nixpkgs/trunk/; revision=29736
2011-10-09 22:28:41 +00:00
Yury G. Kudryashov
8d94826486
colordiff: fix man install path
...
svn path=/nixpkgs/trunk/; revision=29735
2011-10-09 18:45:47 +00:00
Yury G. Kudryashov
9caf409d96
odt2txt-0.4
...
svn path=/nixpkgs/trunk/; revision=29734
2011-10-09 18:22:18 +00:00
Yury G. Kudryashov
c35c6ec9fa
Drop 'gnomevfs = gnome_vfs;' alias
...
s/gnomevfs/gnome_vfs/ in packages
svn path=/nixpkgs/trunk/; revision=29718
2011-10-08 12:06:03 +00:00
Peter Simons
1add4b2e6d
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29696
2011-10-06 13:16:47 +00:00
Peter Simons
ddd571e253
strip trailing whitespace
...
svn path=/nixpkgs/trunk/; revision=29695
2011-10-06 13:15:09 +00:00
Peter Simons
8686ca6278
btrfsprogs: override -Werror option in CFLAGS to fix build errors with GCC 4.6.1
...
svn path=/nixpkgs/trunk/; revision=29693
2011-10-06 13:15:02 +00:00
Ludovic Courtès
88dd456354
GNU grep 2.9.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29592
2011-10-02 20:36:06 +00:00
Ludovic Courtès
29d669037e
GNU Awk 4.0.0.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29591
2011-10-02 20:36:01 +00:00
Ludovic Courtès
14a86cfa3b
GNU diffutils 3.2.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29590
2011-10-02 20:35:57 +00:00
Ludovic Courtès
40f2ee9200
GNU tar 1.26.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29589
2011-10-02 20:35:53 +00:00
Peter Simons
07a5a121fb
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
2011-09-28 14:48:34 +00:00
Lluís Batlle i Rossell
afe142e963
Making jwhois connect fine for those without ipv6 network.
...
svn path=/nixpkgs/trunk/; revision=29519
2011-09-28 07:25:59 +00:00
Peter Simons
01022a1502
lxc: moved package into the "applications/virtualization" category
...
svn path=/nixpkgs/trunk/; revision=29491
2011-09-26 08:12:14 +00:00
Peter Simons
a004ca1a7d
lxc: fixed build to include the SGML documentation
...
svn path=/nixpkgs/trunk/; revision=29490
2011-09-26 08:12:10 +00:00
Michael Raskin
0b9c88cba1
Taking a patch from ArchLinux to fix altermime build
...
svn path=/nixpkgs/trunk/; revision=29489
2011-09-26 04:48:35 +00:00
Yury G. Kudryashov
9dd3dbe2c7
fdm: remove -I- from GNUmakefile. Fixes build on i686
...
svn path=/nixpkgs/trunk/; revision=29485
2011-09-25 23:16:16 +00:00
Yury G. Kudryashov
fe3df64918
Add version info to bittornado.name
...
svn path=/nixpkgs/trunk/; revision=29483
2011-09-25 22:56:38 +00:00
Lluís Batlle i Rossell
e129d97f19
Updating rtmpdump to the 2.4 (what I think it is 2.4) in their git repository.
...
They don't use tags or branches.
svn path=/nixpkgs/trunk/; revision=29479
2011-09-25 09:04:24 +00:00
Peter Simons
808aa6c62d
rtorrent: install man page manually (the upstream makefile is broken)
...
svn path=/nixpkgs/trunk/; revision=29471
2011-09-24 12:46:24 +00:00
Michael Raskin
4d6030f56b
Adding hyenae - patch by MarcWeber
...
svn path=/nixpkgs/trunk/; revision=29470
2011-09-24 09:14:21 +00:00
Shea Levy
01df54f5cc
Merge from trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Peter Simons
730afe1f8b
lxc: added perl buildInput to fix the lxc-ps script
...
Also added myself as a maintainer, improved the meta section a little,
and stripped trailing whitespace.
svn path=/nixpkgs/trunk/; revision=29450
2011-09-23 11:16:10 +00:00
Lluís Batlle i Rossell
ddcb4a295d
Adding pdnsd
...
svn path=/nixpkgs/trunk/; revision=29438
2011-09-22 11:28:56 +00:00
Michael Raskin
234a58870a
Check bittornado with newer wxGTK, generic cleanup
...
svn path=/nixpkgs/trunk/; revision=29433
2011-09-22 06:31:35 +00:00
Florian Friesdorf
113f2c851f
iodine-0.6.0-rc1
...
svn path=/nixpkgs/trunk/; revision=29429
2011-09-21 20:05:38 +00:00
Lluís Batlle i Rossell
ed9d78b75f
Adding pngcrush
...
svn path=/nixpkgs/trunk/; revision=29411
2011-09-21 07:33:38 +00:00
Yury G. Kudryashov
9ee5230537
Move qt3/qt4 choice to .nix expressions
...
svn path=/nixpkgs/trunk/; revision=29404
2011-09-20 22:49:13 +00:00
Yury G. Kudryashov
d9ad31c468
pfstools-1.8.3; builds against qt4
...
svn path=/nixpkgs/trunk/; revision=29403
2011-09-20 22:49:07 +00:00
Peter Simons
11e2fe77ce
nbd: don't try to build this tool on Cygwin
...
svn path=/nixpkgs/trunk/; revision=29358
2011-09-19 17:02:15 +00:00
Peter Simons
2120523889
pdsh: don't try to build this tool on Cygwin
...
svn path=/nixpkgs/trunk/; revision=29357
2011-09-19 17:00:37 +00:00
Yury G. Kudryashov
f4a96780d1
Upgrade to pcsclite-1.7.4
...
-1 HAL reverse-dependency...
svn path=/nixpkgs/trunk/; revision=29345
2011-09-19 13:01:47 +00:00
Alexander Tsamutali
95f7c02feb
tools/system/gptfdisk: Updated to 0.8.0.
...
svn path=/nixpkgs/trunk/; revision=29319
2011-09-17 12:54:46 +00:00
Ludovic Courtès
e15f102b5f
GNU wdiff 1.0.1.
...
svn path=/nixpkgs/trunk/; revision=29317
2011-09-17 10:09:39 +00:00
Peter Simons
2d9c68fd28
tools/misc/myhasktags: fixed incorrect sha256 hash
...
svn path=/nixpkgs/trunk/; revision=29310
2011-09-16 18:25:23 +00:00
Yury G. Kudryashov
284ffb7713
nm-applet-0.9.0
...
svn path=/nixpkgs/trunk/; revision=29272
2011-09-14 16:52:06 +00:00
Yury G. Kudryashov
5fd7590140
Add NetworkManager-pptp
...
svn path=/nixpkgs/trunk/; revision=29271
2011-09-14 15:50:14 +00:00
Yury G. Kudryashov
5aed28d802
Better propagated/native/ buildInputs separation
...
svn path=/nixpkgs/trunk/; revision=29270
2011-09-14 15:50:01 +00:00
Yury G. Kudryashov
1d91e3ac45
Add pptp client
...
svn path=/nixpkgs/trunk/; revision=29267
2011-09-14 08:39:51 +00:00
Peter Simons
a4239c7e14
tahoe-lafs: updated to version 1.8.3, which fixes an important security bug
...
Note that we currently cannot run the test suite!
svn path=/nixpkgs/trunk/; revision=29253
2011-09-13 20:10:41 +00:00
Yury G. Kudryashov
8c6b8753d5
NM: propagate dbus-glib
...
svn path=/nixpkgs/trunk/; revision=29247
2011-09-13 19:27:41 +00:00
Eelco Dolstra
bc1298e651
* Updated nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=29203
2011-09-12 10:02:03 +00:00
Shea Levy
8715ac105b
GNU Coreutils 8.13
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29191
2011-09-11 18:58:24 +00:00
Yury G. Kudryashov
ae94d87ef4
Trying to fix networkmanager
...
svn path=/nixpkgs/trunk/; revision=29160
2011-09-10 19:23:26 +00:00
Eelco Dolstra
55ae7b67d4
* radvd updated to 1.8.1.
...
svn path=/nixpkgs/trunk/; revision=29126
2011-09-09 13:16:35 +00:00
Eelco Dolstra
958b146424
* Added flvtool2.
...
svn path=/nixpkgs/trunk/; revision=29116
2011-09-08 21:48:10 +00:00
Peter Simons
2482d4ba22
wdiff: updated to version 1.0.0
...
svn path=/nixpkgs/trunk/; revision=29087
2011-09-07 16:53:30 +00:00
Eelco Dolstra
9c9cea35ad
* Bump nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=29082
2011-09-07 16:14:42 +00:00
Shea Levy
9266c41795
cunit: Add meta information
...
svn path=/nixpkgs/trunk/; revision=29072
2011-09-07 03:45:51 +00:00
Shea Levy
02aa1d7cde
Add cunit
...
svn path=/nixpkgs/trunk/; revision=29069
2011-09-07 01:12:38 +00:00
Shea Levy
9dd496c687
highlight: Update to 3.5
...
svn path=/nixpkgs/trunk/; revision=29064
2011-09-06 17:10:08 +00:00
Nicolas Pierron
174153238a
rdiff-backup: Fix nix expression.
...
svn path=/nixpkgs/trunk/; revision=29017
2011-09-05 08:32:55 +00:00
Ludovic Courtès
02f91a458d
GNU Source-Highlight 3.1.5.
...
svn path=/nixpkgs/trunk/; revision=29013
2011-09-04 23:06:03 +00:00
Ludovic Courtès
71325e1eba
GNU FreeIPMI 1.0.6.
...
svn path=/nixpkgs/trunk/; revision=29011
2011-09-04 23:05:53 +00:00
Ludovic Courtès
b9b268eb01
GNU Wget 1.13.3.
...
svn path=/nixpkgs/trunk/; revision=29010
2011-09-04 23:05:48 +00:00
Sander van der Burg
1ecf17711d
Updated hashcode
...
svn path=/nixpkgs/trunk/; revision=29005
2011-09-04 16:47:54 +00:00
Michael Raskin
09114ea858
Adding ZBar
...
svn path=/nixpkgs/trunk/; revision=29001
2011-09-04 09:12:00 +00:00
Ludovic Courtès
0803c5d069
Pius 2.0.9.
...
svn path=/nixpkgs/trunk/; revision=29000
2011-09-04 08:54:19 +00:00
Lluís Batlle i Rossell
295089faae
Updating task spooler.
...
svn path=/nixpkgs/trunk/; revision=28970
2011-09-02 08:57:12 +00:00
David Guibert
754fb9cc29
make blueman create the audio sink/source via pulse
...
svn path=/nixpkgs/trunk/; revision=28953
2011-09-01 10:03:01 +00:00
Eelco Dolstra
c529cc17f0
* dosfstools updated to 3.0.11.
...
svn path=/nixpkgs/trunk/; revision=28933
2011-08-30 18:25:07 +00:00
Michael Raskin
6a01304317
Adding TFTP-HPA
...
svn path=/nixpkgs/trunk/; revision=28915
2011-08-30 07:02:01 +00:00
Michael Raskin
3f845cb22d
Adding xtreemfs
...
svn path=/nixpkgs/trunk/; revision=28914
2011-08-30 05:51:49 +00:00
Peter Simons
ed03fadafc
pkgs/tools/networking/p2p/gtk-gnutella/builder.sh: dropped obsolete file
...
svn path=/nixpkgs/trunk/; revision=28908
2011-08-29 22:21:29 +00:00
Peter Simons
482a61cf53
gtk-gnutella: updated to version 0.97
...
svn path=/nixpkgs/trunk/; revision=28883
2011-08-29 20:26:26 +00:00
Michael Raskin
6759fab01b
Moving debian patch to fetchurl
...
svn path=/nixpkgs/trunk/; revision=28875
2011-08-29 13:17:44 +00:00
Michael Raskin
b612e07c0b
Adding atftp
...
svn path=/nixpkgs/trunk/; revision=28874
2011-08-29 12:47:39 +00:00
Michael Raskin
946458d4f9
Fixing tarball build
...
svn path=/nixpkgs/trunk/; revision=28873
2011-08-29 10:31:10 +00:00
Michael Raskin
04e84c2c13
Adding netboot
...
svn path=/nixpkgs/trunk/; revision=28872
2011-08-29 10:16:36 +00:00
Russell O'Connor
c7e097251c
Updating Encfs to 1.7.4
...
svn path=/nixpkgs/trunk/; revision=28854
2011-08-28 00:16:43 +00:00
Eelco Dolstra
b44f2c7ad3
* Add polkit-kde-agent to the channel.
...
svn path=/nixpkgs/trunk/; revision=28847
2011-08-27 15:19:05 +00:00
Shea Levy
4d70ba6cc9
Merge from trunk up through r28790
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Ludovic Courtès
60f13a191a
Add dvgrab.
...
svn path=/nixpkgs/trunk/; revision=28789
2011-08-24 14:55:48 +00:00
Lluís Batlle i Rossell
a9ce52e01a
Updating dos2unix, that now includes also unix2dos.
...
svn path=/nixpkgs/trunk/; revision=28788
2011-08-24 07:48:02 +00:00
Michael Raskin
e9a5a5d819
Fix xmacro build
...
svn path=/nixpkgs/trunk/; revision=28787
2011-08-23 17:52:05 +00:00
Marco Maggesi
495bae62a0
(Ooops!) Remove debug instruction in fdupes derivation
...
svn path=/nixpkgs/trunk/; revision=28776
2011-08-23 11:59:31 +00:00
Marco Maggesi
42469337d7
Update fdupes to version 1.50-RC2
...
svn path=/nixpkgs/trunk/; revision=28775
2011-08-23 11:52:38 +00:00
Ludovic Courtès
f62b53ee19
GNU Xnee 3.10.
...
svn path=/nixpkgs/trunk/; revision=28754
2011-08-22 17:38:53 +00:00
Ludovic Courtès
152a2612ae
GNU Parallel 20110822.
...
svn path=/nixpkgs/trunk/; revision=28753
2011-08-22 17:38:49 +00:00
Ludovic Courtès
097f8d1daa
GnuPG 2.0.18.
...
svn path=/nixpkgs/trunk/; revision=28752
2011-08-22 17:38:45 +00:00
Ludovic Courtès
4b509b7eac
GNU Xorriso 1.1.4.
...
svn path=/nixpkgs/trunk/; revision=28751
2011-08-22 17:38:37 +00:00
Eelco Dolstra
e12337604a
* Remove unused dependency.
...
svn path=/nixpkgs/trunk/; revision=28740
2011-08-22 15:25:26 +00:00
Eelco Dolstra
62049ecfb1
* Added super.
...
svn path=/nixpkgs/trunk/; revision=28739
2011-08-22 15:24:24 +00:00
Eelco Dolstra
631ba2a5f0
svn path=/nixpkgs/trunk/; revision=28716
2011-08-21 00:10:12 +00:00
Rob Vermaas
25fd505136
update ec2-ami-tools hash
...
svn path=/nixpkgs/trunk/; revision=28672
2011-08-19 02:41:23 +00:00
Rob Vermaas
ddd5cb7d29
update ec2-api-tools hash
...
svn path=/nixpkgs/trunk/; revision=28671
2011-08-19 02:40:51 +00:00
Michael Raskin
eb92b14435
Update Linux Containers userspace tools
...
svn path=/nixpkgs/trunk/; revision=28665
2011-08-18 15:01:53 +00:00
Yury G. Kudryashov
0466e94091
Add polkit-kde-agent
...
Move pinentry and polkit-gnome to tools/security.
svn path=/nixpkgs/trunk/; revision=28656
2011-08-18 12:52:50 +00:00
David Guibert
565cdcc3e1
unzip: add support for file greater than 2 GB (unix only)
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=28622
2011-08-16 18:21:05 +00:00
Peter Simons
21b26aef25
Updated Haskell package meta sections.
...
svn path=/nixpkgs/trunk/; revision=28583
2011-08-15 11:27:02 +00:00
Eelco Dolstra
a97b8b191c
* Added s3cmd.
...
svn path=/nixpkgs/trunk/; revision=28530
2011-08-13 11:49:23 +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
David Guibert
f9200097ae
add bup: backup system based on the git packfile format
...
[1] https://github.com/apenwarr/bup
Signed-off-by: David Guibert <david.guibert@gmail.com>
svn path=/nixpkgs/trunk/; revision=28497
2011-08-11 16:33:47 +00:00
Peter Simons
dbce2ffd0f
Generated neater meta.description strings.
...
svn path=/nixpkgs/trunk/; revision=28492
2011-08-11 13:03:51 +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
David Guibert
1e4cb4f0eb
sshfs: link sshfs to mount.sshfs
...
mount.fuse is not able to find sshfs.
So calling
$ mount -t sshfs user@host:path mount/point
will search for mount.sshfs to do the mount.
svn path=/nixpkgs/trunk/; revision=28443
2011-08-09 20:38:55 +00:00
David Guibert
b97136492e
isync: add recursive imap patch
...
svn path=/nixpkgs/trunk/; revision=28438
2011-08-09 20:09:17 +00:00
Eelco Dolstra
9049a3000d
* Update nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=28403
2011-08-08 19:55:14 +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
Karn Kallio
6a2f1f3d72
Remove kdebase as input to kdiff3.
...
Seems not to be needed and gives evaluation error when with kde4.7
svn path=/nixpkgs/trunk/; revision=28197
2011-08-06 18:01:56 +00:00
Lluís Batlle i Rossell
c10bdc23cd
Simple packaging of bacula.
...
svn path=/nixpkgs/trunk/; revision=28182
2011-08-05 19:18:02 +00:00
Peter Simons
7d651a8ec3
syslog-ng: the build doesn't find "glib" on platforms other than Linux
...
Glib is a buildInput, and it does work fine on Linux, but on other
platforms Hydra reports a build failure:
| checking for GLIB - version >= 2.10.1... no
| *** Could not run GLIB test program, checking why...
| *** The test program failed to compile or link. See the file config.log for the
| *** exact error that occured. This usually means GLIB is incorrectly installed.
| configure: error: Cannot find GLIB version >= 2.10.1: is pkg-config in path?
I can't debug that problem, so opted to just disable those builds that
fail anyway.
svn path=/nixpkgs/trunk/; revision=28156
2011-08-04 15:59:21 +00:00
Peter Simons
9f834cb8bd
syslog-ng: moved package from tools/misc to tools/system
...
svn path=/nixpkgs/trunk/; revision=28155
2011-08-04 15:59:14 +00:00
Eelco Dolstra
fda7c24c2b
* Added aws-mturk-clt, the Amazon Mechanical Turk command-line tools.
...
svn path=/nixpkgs/trunk/; revision=28150
2011-08-04 12:13:53 +00:00
Eelco Dolstra
fcce78c0f4
* Sync with the trunk.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=28144
2011-08-03 22:00:49 +00:00
Michael Raskin
451f7818a5
Adding The Sleuth Kit
...
svn path=/nixpkgs/trunk/; revision=28130
2011-08-02 20:06:09 +00:00
Lluís Batlle i Rossell
71dc3b87eb
Adding mairix
...
svn path=/nixpkgs/trunk/; revision=28122
2011-08-02 14:26:47 +00:00
Sander van der Burg
034fb4fa11
Bumped midnight commander to version 4.7.5.3
...
svn path=/nixpkgs/trunk/; revision=28106
2011-08-01 10:24:14 +00:00
Shea Levy
e861fb2bcd
Remove unzip 5.52, make unzip 6.0 default
...
As per TODO in all-packages.nix comments
svn path=/nixpkgs/branches/stdenv-updates/; revision=28101
2011-08-01 04:53:21 +00:00
Shea Levy
6e06060c33
zip: Make it actually install something
...
svn path=/nixpkgs/trunk/; revision=28050
2011-08-01 01:11:01 +00:00
Shea Levy
3a74fd3f3b
zip: Bump to 3.0
...
svn path=/nixpkgs/trunk/; revision=28049
2011-08-01 01:10:52 +00:00
Shea Levy
92e792f17b
zip: Change formatting
...
svn path=/nixpkgs/trunk/; revision=28048
2011-08-01 01:10:44 +00:00
Shea Levy
6a34912bfb
zip: Folded builder into derivation
...
svn path=/nixpkgs/trunk/; revision=28047
2011-08-01 01:10:36 +00:00
Eelco Dolstra
1b427fe052
* Sync with the trunc.
...
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
to update the hash. So secretly it was still building the old
version. Also, now that we've realised that the PulseAudio server
and library don't need to be the same build, disable some
dependencies by default (avahi and bluez).
svn path=/nixpkgs/branches/kde-4.7/; revision=28023
2011-07-31 19:44:58 +00:00
Peter Simons
de4c559ce9
tree: configure build for BSD Unix
...
svn path=/nixpkgs/trunk/; revision=27948
2011-07-25 17:24:49 +00:00
Peter Simons
486ff3ff40
tree: configure build for Cygwin
...
svn path=/nixpkgs/trunk/; revision=27947
2011-07-25 17:19:37 +00:00
Peter Simons
31d1abd4a1
tree: OBJS+=... doesn't work on the make command line, use EXTRA_OBJS variable instead
...
svn path=/nixpkgs/trunk/; revision=27919
2011-07-24 19:36:03 +00:00
Peter Simons
3415f0f088
tree: the tool ought to compile everywhere, so let's give it a try
...
svn path=/nixpkgs/trunk/; revision=27918
2011-07-24 19:15:09 +00:00
Peter Simons
e0e42141d9
tree: blind attempt to fix the build on Darwin
...
svn path=/nixpkgs/trunk/; revision=27917
2011-07-24 19:15:03 +00:00
Peter Simons
7743596401
all-packages.nix: added the 'tree' utility
...
svn path=/nixpkgs/trunk/; revision=27916
2011-07-24 09:57:06 +00:00
Eelco Dolstra
982a83aa2e
* Added udisks, the replacement of the disk management bits of HAL
...
(which is obsolete).
* lvm2: updated to 2.02.86. Also install the pkgconfig files and
build liblvm2app.
* Added libatasmart (udisks dependency for querying ATA SMART status).
* Updated sg3_utils to 1.31.
svn path=/nixpkgs/branches/kde-4.7/; revision=27908
2011-07-23 01:29:51 +00:00
Eelco Dolstra
9379248ef3
* Update kdeadmin and kdegames.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27898
2011-07-22 01:28:09 +00:00
Eelco Dolstra
a75f9edd10
svn path=/nixpkgs/branches/kde-4.7/; revision=27897
2011-07-21 22:18:52 +00:00
Eelco Dolstra
f9320cb33a
* Update system-config-printer to 1.3.4.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27896
2011-07-21 22:18:41 +00:00
Peter Simons
62eab9e44a
pdsh: updated to version 2.26
...
svn path=/nixpkgs/trunk/; revision=27858
2011-07-20 18:58:34 +00:00
Peter Simons
b9d382c2dd
libtorrent: use sha256 hash returned by nix-prefetch-url
...
svn path=/nixpkgs/trunk/; revision=27827
2011-07-18 15:23:03 +00:00
Peter Simons
7c19a3a691
rtorrent: updated to version 0.8.9
...
svn path=/nixpkgs/trunk/; revision=27824
2011-07-18 14:34:46 +00:00
Peter Simons
21691b47d7
libtorrent: updated to version 0.12.9
...
svn path=/nixpkgs/trunk/; revision=27823
2011-07-18 14:34:33 +00:00
Eelco Dolstra
4cc476fa52
* Update nixUnstable.
...
svn path=/nixpkgs/trunk/; revision=27782
2011-07-14 17:16:00 +00:00
Peter Simons
7049b34b10
glxinfo: updated to version 8.0.1
...
svn path=/nixpkgs/trunk/; revision=27779
2011-07-14 12:23:03 +00:00