BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13459 commits 1 branch 0 tags 3.8 GiB
Commit graph

1724 commits

Author SHA1 Message Date
Eelco Dolstra
e1926e3764 * Add UNetbootin to the channel. 
svn path=/nixpkgs/trunk/; revision=23114
 2010-08-11 13:55:56 +00:00
Michael Raskin
cf1d2fb754 Update pdf2djvu 
svn path=/nixpkgs/trunk/; revision=23108
 2010-08-11 10:34:15 +00:00
Peter Simons
b62f65d24e pkgs/tools/networking/nbd: removed hard-coded flags for static linking 
A statically linked binary should rather be generated using the
appropriate stdenv adapter.

svn path=/nixpkgs/trunk/; revision=23107
 2010-08-11 09:54:46 +00:00
Peter Simons
e33f4863fc pkgs/tools/networking/nbd: updated to version 2.9.18 
svn path=/nixpkgs/trunk/; revision=23106
 2010-08-11 09:53:31 +00:00
Lluís Batlle i Rossell
ff5d0fa448 Merging from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23072
 2010-08-09 21:21:30 +00:00
Lluís Batlle i Rossell
ac387916b8 Adding the calendar program 'pal' 
svn path=/nixpkgs/trunk/; revision=23070
 2010-08-09 21:13:36 +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
Lluís Batlle i Rossell
46082f25f9 Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
 2010-08-07 20:14:04 +00:00
Michael Raskin
8d9cd5be6f Update Asymptote to 2.03 
svn path=/nixpkgs/trunk/; revision=23022
 2010-08-07 11:38:03 +00:00
Eelco Dolstra
d7842faf49 * Added UNetbootin, a program for creating bootable USB sticks from 
ISO images.

svn path=/nixpkgs/trunk/; revision=23018
 2010-08-06 22:33:14 +00:00
Eelco Dolstra
ca716d5bc7 * p7zip updated to 9.13. Also build 7z and 7zr. 
svn path=/nixpkgs/trunk/; revision=23016
 2010-08-06 22:26:25 +00:00
Eelco Dolstra
2148d43a6d * Added mtools. 
svn path=/nixpkgs/trunk/; revision=23014
 2010-08-06 21:36:54 +00:00
Eelco Dolstra
896d1f752d * I'm stupid. 
svn path=/nixpkgs/trunk/; revision=23007
 2010-08-06 18:59:47 +00:00
Eelco Dolstra
1ef7d51a32 * dosfstools updated to 3.09. 
svn path=/nixpkgs/trunk/; revision=23005
 2010-08-06 18:49:16 +00:00
Peter Simons
0571d80df6 pkgs/tools/networking/curl: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=22997
 2010-08-06 12:45:39 +00:00
Peter Simons
432ad9ceef pkgs/tools/networking/curl: assert that scpSupport is enabled only when libssh2 is available 
svn path=/nixpkgs/trunk/; revision=22996
 2010-08-06 12:45:11 +00:00
Peter Simons
401b77d232 pkgs/tools/networking/nbd: updated to version 2.9.17 
svn path=/nixpkgs/trunk/; revision=22994
 2010-08-06 12:43:18 +00:00
Eelco Dolstra
a1e834e85a * Get rid of the ugly `useFromStdenv' hack in all-packages.nix. 
Instead, use the generic package override mechanism to use packages
  from earlier bootstrap phases.
* Don't rely on the existence of attributes such as
  `stdenv.coreutils'.

svn path=/nixpkgs/trunk/; revision=22991
 2010-08-06 10:34:34 +00:00
Eelco Dolstra
eecae4f36a svn path=/nixpkgs/trunk/; revision=22980 2010-08-05 22:09:41 +00:00
Yury G. Kudryashov
80108f291b Add optional scp support to curl 
svn path=/nixpkgs/trunk/; revision=22976
 2010-08-05 21:06:45 +00:00
Lluís Batlle i Rossell
47b45f812e Updating diffutils 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22942
 2010-08-04 11:05:53 +00:00
Peter Simons
43017234d6 pkgs/tools/networking/nbd: enable build on all NixOS platforms 
The nbd client needs kernel support and is available only on Linux, but
the server process ought to work in all POSIX'ish environments.

svn path=/nixpkgs/trunk/; revision=22936
 2010-08-03 19:08:11 +00:00
Peter Simons
c820859eac pkgs/tools/networking/nbd: revert "enable regression tests" 
test suite failure on hydra: http://hydra.nixos.org/build/518375

svn path=/nixpkgs/trunk/; revision=22935
 2010-08-03 18:12:38 +00:00
Peter Simons
6cffff9de1 pkgs/tools/archivers/cpio: revert to version 2.9 
The latest version, 2.11, doesn't compile on Darwin. The build
expression for 2.11 is still still available in "latest.nix".

svn path=/nixpkgs/trunk/; revision=22923
 2010-08-03 10:55:58 +00:00
Peter Simons
057a044b0c pkgs/tools/networking/nbd: enable regression tests 
The tests suite succeeds fine on Linux/x86. Let's see what happens on
other platforms.

svn path=/nixpkgs/trunk/; revision=22920
 2010-08-03 09:36:37 +00:00
Peter Simons
cdb12ec708 pkgs/tools/networking/nbd: updated to version 2.9.16 
svn path=/nixpkgs/trunk/; revision=22919
 2010-08-03 09:32:05 +00:00
Lluís Batlle i Rossell
6d15eabdc1 Merging from trunk (the callPackage change) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22915
 2010-08-03 08:14:13 +00:00
Yury G. Kudryashov
858ce6dfd9 Remove smbfsFuse from release.nix, use meta.platforms instead 
svn path=/nixpkgs/trunk/; revision=22908
 2010-08-02 21:43:53 +00:00
Lluís Batlle i Rossell
5417c720fd Merging from trunk. 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
 2010-08-02 15:48:19 +00:00
Peter Simons
9ef0f1b935 pkgs/tools/networking/nbd: install the README file to $out/share/doc 
The README contains documentation that is useful in addition to the man
pages.

svn path=/nixpkgs/trunk/; revision=22875
 2010-08-02 13:37:36 +00:00
Rob Vermaas
ec5dba7620 remove commented license attribute 
svn path=/nixpkgs/trunk/; revision=22862
 2010-08-02 09:09:25 +00:00
Rob Vermaas
fb6ca79d35 HDF5 1.8.5 
svn path=/nixpkgs/trunk/; revision=22861
 2010-08-02 08:58:53 +00:00
Lluís Batlle i Rossell
fb4a1baa45 Updating 'patch' for bootstrap (reference broken) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22851
 2010-08-01 21:25:19 +00:00
Lluís Batlle i Rossell
2954596106 Making gnugrep cross-build for mips 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22847
 2010-08-01 21:17:29 +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
Eelco Dolstra
9375dad95a * Remove findutils-wrapper (obsolete). 
* Remove some unnecessary / inappropriate lowPrios.

svn path=/nixpkgs/trunk/; revision=22825
 2010-07-30 12:31:10 +00:00
Eelco Dolstra
ee4fe6ea84 * Drop pkgsOverriden. 
svn path=/nixpkgs/trunk/; revision=22823
 2010-07-30 12:10:24 +00:00
Lluís Batlle i Rossell
b044e64989 Making the xburst-tools for the Ben Nanonote build the firmware they need to 
communicate with it. This involves making a cross-compiler for mipsel.

svn path=/nixpkgs/trunk/; revision=22818
 2010-07-29 23:26:07 +00:00
Lluís Batlle i Rossell
537ad15e86 Adding xburst-tools to manage the USB_BOOT mode of the Ben Nanonote (reflashing, ...) 
I add the 'confuse' library as a side effect.

svn path=/nixpkgs/trunk/; revision=22817
 2010-07-29 23:25:42 +00:00
Eelco Dolstra
907bb1aac6 * ltrace: updated to 0.5.3. 
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

svn path=/nixpkgs/trunk/; revision=22814
 2010-07-29 18:55:16 +00:00
Eelco Dolstra
ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency. 
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
 2010-07-29 08:21:21 +00:00
Lluís Batlle i Rossell
41b7a3cda6 Making tigervnc build with the xserver 1.8 
svn path=/nixpkgs/trunk/; revision=22802
 2010-07-29 07:59:06 +00:00
Peter Simons
4b248a36b0 pkgs/tools/networking/nbd: updated to version 2.9.15 
svn path=/nixpkgs/trunk/; revision=22799
 2010-07-28 21:28:23 +00:00
Eelco Dolstra
f1598a8941 * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22798
 2010-07-28 18:01:17 +00:00
Eelco Dolstra
749b8607ca * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22795
 2010-07-28 15:35:01 +00:00
Peter Simons
93ff8697d1 pkgs/tools/networking/p2p/tahoe-lafs: add mock060 to propagatedBuildInputs 
The package is required for the regression test suite. Adding it to
buildInputs would probably work, too, but I haven't tried it.

svn path=/nixpkgs/trunk/; revision=22792
 2010-07-28 13:09:20 +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
Eelco Dolstra
95c5f85819 * Fix misspelled package name. 
svn path=/nixpkgs/trunk/; revision=22777
 2010-07-28 08:21:56 +00:00
Peter Simons
1bb86133c7 pkgs/tools/networking/p2p/tahoe-lafs: updated to version 1.7.1 
svn path=/nixpkgs/trunk/; revision=22774
 2010-07-27 23:52:22 +00:00
Eelco Dolstra
228c6e0c1f * Merged the x-updates branch (latest X server / libraries, GTK+, 
Fontconfig, etc.).

svn path=/nixpkgs/trunk/; revision=22735
 2010-07-26 13:59:12 +00:00
Andres Löh
73bee7da33 Switched the default version of ghc and Haskell Platform to 6.12.3 and 2010.2.0.0. 
svn path=/nixpkgs/trunk/; revision=22715
 2010-07-22 18:47:59 +00:00
Ludovic Courtès
e4df0cab9f cpio: Disable tests on Darwin. 
svn path=/nixpkgs/trunk/; revision=22713
 2010-07-22 15:27:48 +00:00
Eelco Dolstra
0db478d40b * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=22707
 2010-07-22 13:18:07 +00:00
Ludovic Courtès
8115040c08 GNU cpio: Add fix for Darwin. 
svn path=/nixpkgs/trunk/; revision=22705
 2010-07-22 12:20:11 +00:00
Eelco Dolstra
6faed26c43 * nmap: apply a patch to remove md2 support. 
svn path=/nixpkgs/branches/x-updates/; revision=22701
 2010-07-22 10:31:39 +00:00
Ludovic Courtès
8297acd511 Add Seeks, a "social" search engine. 
svn path=/nixpkgs/trunk/; revision=22698
 2010-07-22 09:03:35 +00:00
Eelco Dolstra
f555da864d * dar: build with --disable-dar-static, apparently the zlib update 
broke it.  Also upgrade to 2.3.10 and turn on ACL support.

svn path=/nixpkgs/branches/x-updates/; revision=22690
 2010-07-21 15:30:25 +00:00
Eelco Dolstra
2f6c7cd3dd * Latest pciutils and usbutils, along with the latest PCI and USB IDs. 
svn path=/nixpkgs/branches/x-updates/; revision=22687
 2010-07-21 12:01:57 +00:00
Eelco Dolstra
78a5abdf85 * Updated the X.org server to 1.8.2. Note that it no longer depends 
on HAL but instead uses udev to autoconfigure input devices.  We'll
  have to update the NixOS X server module accordingly, I guess.  See
  https://fedoraproject.org/wiki/Input_device_configuration.
* Updated Mesa to 7.8.2.

svn path=/nixpkgs/branches/x-updates/; revision=22681
 2010-07-20 19:24:21 +00:00
Eelco Dolstra
37f6612875 * Disable GRUB 2's `make check' by default, because it requires QEMU. 
It's not so desirable to have GRUB 2 depend on X11, Mesa, SDL,
  PulseAudio, ... (I became very confused when changing Mesa triggered
  a rebuild of GRUB.)

svn path=/nixpkgs/branches/x-updates/; revision=22680
 2010-07-20 19:22:02 +00:00
Eelco Dolstra
113fa71b8c * curl updated to 7.21.0. 
svn path=/nixpkgs/trunk/; revision=22629
 2010-07-18 21:01:17 +00:00
Andres Löh
5f8328c461 Preparing for the upcoming Haskell Platform release. 
svn path=/nixpkgs/trunk/; revision=22620
 2010-07-17 13:23:48 +00:00
Peter Simons
815b121dfb pkgs/tools/package-management/nix/unstable.nix: updated to latest version 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22613
 2010-07-15 14:56:55 +00:00
Peter Simons
9db8a17ce3 pkgs/tools/package-management/nix/unstable.nix: updated to latest version 
svn path=/nixpkgs/trunk/; revision=22612
 2010-07-15 14:55:19 +00:00
Eelco Dolstra
5a028270aa * dhcp 4.1.1. 
svn path=/nixpkgs/trunk/; revision=22606
 2010-07-15 11:06:30 +00:00
Lluís Batlle i Rossell
cf37b58466 Making tigervnc build on armv5tel-linux (setting it not to require the mesa dri) 
svn path=/nixpkgs/trunk/; revision=22597
 2010-07-14 10:21:56 +00:00
Eelco Dolstra
f85cf594d3 * Updated the EC2 API/AMI tools. 
svn path=/nixpkgs/trunk/; revision=22588
 2010-07-13 20:58:58 +00:00
Lluís Batlle i Rossell
d0f681d657 Fixing virtualgl for 'vglrun' to work fine and simple, under xproxy (like tigervnc). 
svn path=/nixpkgs/trunk/; revision=22586
 2010-07-13 19:12:42 +00:00
Lluís Batlle i Rossell
4301f209c9 Making the tigervnc server work. 
svn path=/nixpkgs/trunk/; revision=22584
 2010-07-13 17:57:13 +00:00
Ludovic Courtès
2113d82947 Add PIUS. 
svn path=/nixpkgs/trunk/; revision=22580
 2010-07-13 16:32:14 +00:00
Michael Raskin
a07f75cefa Update nixUnstable to latest 
svn path=/nixpkgs/trunk/; revision=22578
 2010-07-13 14:14:33 +00:00
Lluís Batlle i Rossell
6a1cee4a69 Trouble in my last tigervnc commit. Fixing it. 
svn path=/nixpkgs/trunk/; revision=22570
 2010-07-12 22:32:22 +00:00
Lluís Batlle i Rossell
6c0b62d1a5 Made the tightvnc build the Xvnc server - although I still did not manage to start it. 
svn path=/nixpkgs/trunk/; revision=22569
 2010-07-12 22:15:50 +00:00
Lluís Batlle i Rossell
196e8ad0f6 TigerVNC (without the server Xvnc still) 
svn path=/nixpkgs/trunk/; revision=22568
 2010-07-12 22:15:36 +00:00
Lluís Batlle i Rossell
a8c5534849 Adding virtualgl (and therefore, libjpeg-turbo, a SIMD API-compatible libjpeg) 
svn path=/nixpkgs/trunk/; revision=22553
 2010-07-10 08:45:44 +00:00
Michael Raskin
ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense. 
svn path=/nixpkgs/trunk/; revision=22529
 2010-07-08 13:25:52 +00:00
Lluís Batlle i Rossell
26dc245fb2 Updating rtorrent and libtorrent 
svn path=/nixpkgs/trunk/; revision=22518
 2010-07-07 21:11:07 +00:00
Eelco Dolstra
f928e6ad5a * Updated reiserfsprogs to 3.6.21. Also install fsck.reiserfs and 
mkfs.reiserfs symlinks.  The former is important to keep mountall
  happy.

svn path=/nixpkgs/trunk/; revision=22511
 2010-07-07 14:23:30 +00:00
Eelco Dolstra
3f92e4d2c8 * Added Blueman (a Bluetooth application). 
* Added obex-data-server and python-notify, needed by Blueman.

svn path=/nixpkgs/trunk/; revision=22497
 2010-07-06 14:54:22 +00:00
Michael Raskin
8213706eb9 Fix linking of the cuneiform 
svn path=/nixpkgs/trunk/; revision=22496
 2010-07-06 12:34:05 +00:00
Michael Raskin
c5bd204477 Update cuneiform 
svn path=/nixpkgs/trunk/; revision=22493
 2010-07-06 11:12:33 +00:00
Michael Raskin
9fe4caf066 Readding old Graphviz: I need it for some graph program that relies on its way of grid snapping. 
svn path=/nixpkgs/trunk/; revision=22483
 2010-07-05 19:04:33 +00:00
Eelco Dolstra
e4a9bdd834 svn path=/nixpkgs/trunk/; revision=22472 2010-07-05 08:28:15 +00:00
Ludovic Courtès
c3484e59e9 GNU GRUB 1.98. 
svn path=/nixpkgs/trunk/; revision=22465
 2010-07-04 21:11:13 +00:00
Ludovic Courtès
05dd21d4fb GNU mcron 1.0.6. 
svn path=/nixpkgs/trunk/; revision=22464
 2010-07-04 21:11:08 +00:00
Ludovic Courtès
900b3d9d86 GNU wdiff 0.6.3. 
svn path=/nixpkgs/trunk/; revision=22463
 2010-07-04 21:11:03 +00:00
Ludovic Courtès
21d55c8d60 GNU Parted 2.3. 
svn path=/nixpkgs/trunk/; revision=22462
 2010-07-04 21:10:58 +00:00
Ludovic Courtès
4789ced578 GNU Idutils 4.5. 
svn path=/nixpkgs/trunk/; revision=22461
 2010-07-04 21:10:54 +00:00
Ludovic Courtès
7acfdbfe63 GNU Parallel 20100620. 
svn path=/nixpkgs/trunk/; revision=22460
 2010-07-04 21:10:49 +00:00
Ludovic Courtès
cfae38d9f9 GNU cpio 2.11. 
svn path=/nixpkgs/trunk/; revision=22458
 2010-07-04 21:10:36 +00:00
Yury G. Kudryashov
41e58b3982 Add convmv 
svn path=/nixpkgs/trunk/; revision=22444
 2010-07-03 08:06:01 +00:00
Peter Simons
70240d36ac Enable parallel building of gcc, glibc, gmp, mpfr, coreutils, perl, git, and qt4. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22400
 2010-06-23 14:35:18 +00:00
Peter Simons
ce9cc7da1f pkgs/tools/package-management/nix/unstable.nix: added support for (impure) NIX_BUILD_CORES variable 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22398
 2010-06-23 14:34:47 +00:00
David Guibert
e9234ae7bb offlineimap: 6.2.0.1 
svn path=/nixpkgs/trunk/; revision=22385
 2010-06-22 19:49:12 +00:00
Eelco Dolstra
7fb06b3986 * Fix the URL. 
svn path=/nixpkgs/trunk/; revision=22380
 2010-06-22 15:23:39 +00:00
Eelco Dolstra
7c979671b8 * Revert r22376, this should be in the stdenv branch. 
svn path=/nixpkgs/trunk/; revision=22379
 2010-06-22 15:21:06 +00:00
Peter Simons
9cc3ddfc1a pkgs/tools/text/gnupatch: patch 2.6.1-2-g2c4e3ec no longer exists; update to latest version 
svn path=/nixpkgs/trunk/; revision=22376
 2010-06-22 14:34:41 +00:00
Eelco Dolstra
b1ffc3abd9 svn path=/nixpkgs/trunk/; revision=22353 2010-06-21 08:38:45 +00:00
Marc Weber
f3e7f0fdf0 reverting my patch series adding -j -l support for make 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22336
 2010-06-19 15:52:28 +00:00
Evgeny Egorochkin
4719a2ed3c Added flags to compile amule daemon and remote gui 
svn path=/nixpkgs/trunk/; revision=22334
 2010-06-19 02:19:39 +00:00
Ludovic Courtès
80780f066f Add HTTPFS2, for Linux. 
svn path=/nixpkgs/trunk/; revision=22308
 2010-06-17 12:44:40 +00:00
Eelco Dolstra
1b5f7622b7 * dpkg updated to 1.4.29. 
svn path=/nixpkgs/trunk/; revision=22292
 2010-06-16 11:50:06 +00:00
Marc Weber
2dafd54743 opt-out some failing phases 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22285
 2010-06-15 19:00:58 +00:00
Marc Weber
7db7857d15 nix num-cores.patch 
pass MAX_PARALLELIZATION and TARGET_LOAD to the builder. See comments

svn path=/nixpkgs/branches/stdenv-updates/; revision=22284
 2010-06-15 19:00:54 +00:00
Lluís Batlle i Rossell
86345919c2 Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
 2010-06-14 09:28:10 +00:00
Eelco Dolstra
b88adf69c3 * socat updated to 1.7.1.2. 
svn path=/nixpkgs/trunk/; revision=22252
 2010-06-14 08:01:38 +00:00
Ludovic Courtès
c91a0c873f GNU Enscript 1.6.5.2. 
svn path=/nixpkgs/trunk/; revision=22220
 2010-06-10 21:52:52 +00:00
Eelco Dolstra
8b18623656 * Updated bluez and obexd. 
svn path=/nixpkgs/trunk/; revision=22211
 2010-06-10 12:47:58 +00:00
Sander van der Burg
3e958eea23 Upgraded Nix unstable to version 0.16pre22206 
svn path=/nixpkgs/trunk/; revision=22207
 2010-06-10 10:48:30 +00:00
Michael Raskin
e4d8ca690c Updating Asymptote 
svn path=/nixpkgs/trunk/; revision=22183
 2010-06-08 12:52:36 +00:00
David Guibert
960e2d2a84 gparted: fix url 
svn path=/nixpkgs/trunk/; revision=22176
 2010-06-08 06:20:03 +00:00
Michael Raskin
43790aa2dc Fixing Gnokii build 
svn path=/nixpkgs/trunk/; revision=22160
 2010-06-05 21:14:41 +00:00
Lluís Batlle i Rossell
6c4cb05613 Adding zsync 
svn path=/nixpkgs/trunk/; revision=22158
 2010-06-05 19:23:57 +00:00
Lluís Batlle i Rossell
056ff2705a Making duplicity's rdiffdir work (it had to be wrapped) 
svn path=/nixpkgs/trunk/; revision=22157
 2010-06-05 15:06:12 +00:00
Lluís Batlle i Rossell
4328f6a1fe Updating bsdiff 
svn path=/nixpkgs/trunk/; revision=22156
 2010-06-05 11:40:23 +00:00
Lluís Batlle i Rossell
66b32efbcc Updating ccrypt 
svn path=/nixpkgs/trunk/; revision=22150
 2010-06-04 15:21:32 +00:00
Michael Raskin
9709be4f16 Update gnokii 
svn path=/nixpkgs/trunk/; revision=22119
 2010-06-03 11:30:05 +00:00
Rob Vermaas
8827df79dd updating nixSqlite 
svn path=/nixpkgs/trunk/; revision=22116
 2010-06-03 08:09:54 +00:00
Eelco Dolstra
0cef95c341 * Remove our hacked up version of `su' from coreutils. 
svn path=/nixpkgs/trunk/; revision=22108
 2010-06-02 21:11:21 +00:00
Lluís Batlle i Rossell
e9f6c6e437 Adding pdftk for roconnor. 
svn path=/nixpkgs/trunk/; revision=22097
 2010-06-02 08:21:49 +00:00
David Guibert
95683bb7c7 qdu: fix bad formatting. 
svn path=/nixpkgs/trunk/; revision=22054
 2010-05-29 12:33:24 +00:00
David Guibert
bf11f132e0 gnupatch: fix broken url 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22042
 2010-05-28 11:06:52 +00:00
David Guibert
8a8a0327ff add qdu: a graphical disk usage based on qt. 
svn path=/nixpkgs/trunk/; revision=22021
 2010-05-27 19:44:12 +00:00
David Guibert
66c784d4dd added autossh 1.4b. 
svn path=/nixpkgs/trunk/; revision=22018
 2010-05-27 19:43:57 +00:00
David Guibert
1d78faa832 duplicity updated to 0.6.08b 
svn path=/nixpkgs/trunk/; revision=22012
 2010-05-27 19:33:42 +00:00
Lluís Batlle i Rossell
85e1bc7d34 Fixing coreutils - I did not merge that well enough 
svn path=/nixpkgs/branches/stdenv-updates/; revision=21976
 2010-05-25 20:41:53 +00:00
Lluís Batlle i Rossell
fa1a414aee Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that 
well


svn path=/nixpkgs/branches/stdenv-updates/; revision=21975
 2010-05-25 20:38:18 +00:00
Ludovic Courtès
c293598da8 tor: Add self as co-maintainer; add to Hydra; improve formatting. 
svn path=/nixpkgs/trunk/; revision=21957
 2010-05-24 21:28:54 +00:00
Ludovic Courtès
bf9d470cc7 tor: Fix test suite. 
svn path=/nixpkgs/trunk/; revision=21956
 2010-05-24 21:28:43 +00:00
Ludovic Courtès
0b2906ca28 Add cross Coreutils. 
svn path=/nixpkgs/trunk/; revision=21935
 2010-05-21 13:46:54 +00:00
Eelco Dolstra
fa94d434a1 * Install the manpage. 
svn path=/nixpkgs/trunk/; revision=21931
 2010-05-20 23:06:10 +00:00
Eelco Dolstra
50712e5279 * Added miniupnpd, an implementation of the UPnP Internet Gateway 
Device (IGD) specification.
* Updated iptables to 1.4.8.

svn path=/nixpkgs/trunk/; revision=21929
 2010-05-20 22:11:44 +00:00
Eelco Dolstra
e316a95859 svn path=/nixpkgs/trunk/; revision=21924 2010-05-20 13:49:54 +00:00
Eelco Dolstra
b93b157771 svn path=/nixpkgs/trunk/; revision=21918 2010-05-20 12:23:16 +00:00
Eelco Dolstra
3dd55eef23 * Added aria2, a download utility. 
svn path=/nixpkgs/trunk/; revision=21912
 2010-05-20 11:11:24 +00:00
Eelco Dolstra
81cd88d83d * Remove a bunch of empty files/directories. 
svn path=/nixpkgs/trunk/; revision=21911
 2010-05-20 10:51:19 +00:00
Yury G. Kudryashov
cc6ca8b2ae Add gnupg1 compatibility wrapper 
Gnupg1compat is symlinked gnupg2 with two additional symlinks:
gpg->gpg2 and gpgv->gpgv2.

Move original gnupg 1.x to gnupg1orig.
Set default gnupg1 to gnupg1compat.

svn path=/nixpkgs/trunk/; revision=21888
 2010-05-19 20:59:20 +00:00
Yury G. Kudryashov
6a0318fead Add libassuan1 back 
opensc needs it

svn path=/nixpkgs/trunk/; revision=21887
 2010-05-19 20:59:15 +00:00
Yury G. Kudryashov
b7a54122ef Pass coreutils explicitly instead of using stdenv.coreutils 
I hope that this fixes tarball creation for hydra

svn path=/nixpkgs/trunk/; revision=21886
 2010-05-19 20:59:07 +00:00
Yury G. Kudryashov
fd63f04e4e Remove gpg->gpg2 symlink 
Also make gpgme compile&find gpg2

svn path=/nixpkgs/trunk/; revision=21885
 2010-05-19 20:59:03 +00:00
Yury G. Kudryashov
d0b56edcf2 Mass GnuPG upgrade 
gnupg tests fail. Will try to fix later.

svn path=/nixpkgs/trunk/; revision=21884
 2010-05-19 20:58:56 +00:00
Yury G. Kudryashov
ea1953d744 Move gnupg to gnupg1 and gnupg2 to gnupg 
Also add gnupg1-compatibility symlinks to gnupg2.
Most packages should be able to use gnupg2 instead of gnupg1.

svn path=/nixpkgs/trunk/; revision=21883
 2010-05-19 20:58:47 +00:00
Yury G. Kudryashov
7751f8bd62 Upgrade pinentry to 0.8.0 
Also add optional pinentry-qt4

svn path=/nixpkgs/trunk/; revision=21882
 2010-05-19 20:58:35 +00:00
Lluís Batlle i Rossell
6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
 2010-05-19 15:26:00 +00:00
Lluís Batlle i Rossell
e283f86174 Making nixUnstable ready to cross build. 
That requires bzip2 to cross build properly, and this is done only in stdenv-updates.

svn path=/nixpkgs/trunk/; revision=21878
 2010-05-19 15:13:46 +00:00
Eelco Dolstra
90b3af3bd7 * Bittorrent updated to 5.2.2 (5.3 seems too hard to build). 
svn path=/nixpkgs/trunk/; revision=21877
 2010-05-19 14:42:52 +00:00
Eelco Dolstra
f8a818bf20 * Remove a redundant version of ktorrent (it's already in 
kde/extra-gear).

svn path=/nixpkgs/trunk/; revision=21876
 2010-05-19 13:57:20 +00:00
Peter Simons
3353ed9c88 pkgs/top-level/all-packages.nix, pkgs/tools/networking/openssh: prefer makeOverridable over getPkgConfig to customize openssh 
Changed 'openssh' expression to allow for argument overriding instead of
relying on getPkgConfig. While I was at it, I also simplified the build
expression a bit.

svn path=/nixpkgs/trunk/; revision=21868
 2010-05-19 12:26:06 +00:00
Peter Simons
aa600ed8f7 pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize GNU plot 
Changed 'gnuplot' expression to allow for argument overriding instead of
relying on getPkgConfig. While I was at it, I also simplified the actual build
expression a bit.

svn path=/nixpkgs/trunk/; revision=21864
 2010-05-19 12:25:51 +00:00
Michael Raskin
ae476d641a DMTX now needs libjasper.. 
svn path=/nixpkgs/trunk/; revision=21851
 2010-05-18 21:08:19 +00:00
Armijn Hemel
fc1344e4c9 update to 0.6 
svn path=/nixpkgs/trunk/; revision=21822
 2010-05-17 20:22:04 +00:00
Ludovic Courtès
38c35ba49b GNU Inetutils 1.8. 
svn path=/nixpkgs/trunk/; revision=21814
 2010-05-17 09:31:43 +00:00
Eelco Dolstra
fc0279c07e svn path=/nixpkgs/trunk/; revision=21811 2010-05-16 22:38:00 +00:00
Lluís Batlle i Rossell
70302d2d18 Adding inputs to privoxy, so it gets more features (zlib, documentation, pcre) 
svn path=/nixpkgs/trunk/; revision=21809
 2010-05-16 22:14:02 +00:00
Eelco Dolstra
687376f426 * Updated Nix. 
svn path=/nixpkgs/trunk/; revision=21801
 2010-05-16 16:48:38 +00:00
Lluís Batlle i Rossell
a286b7c9b2 Adding tor 0.2.1.26 
(Patch sent by roconnor)

svn path=/nixpkgs/trunk/; revision=21797
 2010-05-16 16:23:32 +00:00
Lluís Batlle i Rossell
4df5343e78 Adding x2x. 
Patch by Oleksandr Kozachuk

svn path=/nixpkgs/trunk/; revision=21796
 2010-05-16 16:23:17 +00:00
Eelco Dolstra
22d901d935 * Updated Nix. 
svn path=/nixpkgs/trunk/; revision=21771
 2010-05-14 08:57:16 +00:00
Lluís Batlle i Rossell
074e7db41a Adding an assertion for pk2cmd to build only on linux. 
svn path=/nixpkgs/trunk/; revision=21728
 2010-05-11 16:17:35 +00:00
Lluís Batlle i Rossell
001a74368f Adding the Microchip software for the PICKit2 programmer: pk2cmd 
svn path=/nixpkgs/trunk/; revision=21726
 2010-05-11 16:17:26 +00:00
Ludovic Courtès
659e48bbb0 GNU wdiff: Fix URL. 
svn path=/nixpkgs/trunk/; revision=21713
 2010-05-10 17:54:26 +00:00
Ludovic Courtès
340f826442 GNU Wdiff 0.6.1. 
svn path=/nixpkgs/trunk/; revision=21708
 2010-05-10 14:30:44 +00:00
Peter Simons
fd8c6ae43d Moved 'maintainers' attribute into the meta section of the expression. 
I've also set the 'platforms' attribute to ensure that Hydra actually
builds these packages. Thanks to Lluís Batlle i Rossell for pointing out
these mistakes.

svn path=/nixpkgs/trunk/; revision=21688
 2010-05-09 16:01:44 +00:00
Lluís Batlle i Rossell
8b311ba757 Adding the openssh patch I forgot in a recent commit 
svn path=/nixpkgs/trunk/; revision=21681
 2010-05-09 12:53:46 +00:00
Lluís Batlle i Rossell
b7af00b889 Making openssh pass the LOCALE_ARCHIVE variable to the forked session processes, 
so the session 'bash' will receive the proper locale archive, and thus process
UTF-8 properly.

svn path=/nixpkgs/trunk/; revision=21678
 2010-05-09 12:44:09 +00:00
Peter Simons
f96b77a4ce gnuplot: updated to version 4.4.0 
svn path=/nixpkgs/trunk/; revision=21648
 2010-05-07 14:01:57 +00:00
Ludovic Courtès
83609f6191 nixUnstable: Fix typo. 
svn path=/nixpkgs/trunk/; revision=21617
 2010-05-05 19:48:39 +00:00
Ludovic Courtès
d2e6d7b84f Update Nix unstable. 
svn path=/nixpkgs/trunk/; revision=21601
 2010-05-05 09:30:42 +00:00
Ludovic Courtès
d5086fd5bd xmlto 0.0.23. 
svn path=/nixpkgs/trunk/; revision=21595
 2010-05-04 13:32:04 +00:00
Yury G. Kudryashov
de4815afa8 catdoc: fix evaluation error 
svn path=/nixpkgs/trunk/; revision=21577
 2010-05-03 13:39:46 +00:00
Yury G. Kudryashov
d8c07cc4d6 Add catdoc 
svn path=/nixpkgs/trunk/; revision=21558
 2010-05-03 03:45:40 +00:00
Ludovic Courtès
8298738364 Add GNU Parallel. 
svn path=/nixpkgs/trunk/; revision=21552
 2010-05-02 09:27:32 +00:00
Lluís Batlle i Rossell
fe7945b7fb Adding rtmpdump 
svn path=/nixpkgs/trunk/; revision=21468
 2010-04-30 21:46:55 +00:00
Peter Simons
52884c145f pkgs/tools/misc/most/default.nix: added license tag (GPLv2) 
svn path=/nixpkgs/trunk/; revision=21461
 2010-04-30 16:06:01 +00:00
Peter Simons
d4221fa80a pkgs/tools/misc/most/default.nix: cosmetic changes 
svn path=/nixpkgs/trunk/; revision=21460
 2010-04-30 16:05:55 +00:00
Peter Simons
2cd7033243 pkgs/tools/text/source-highlight: added GNU source highlight version 3.1.3 
svn path=/nixpkgs/trunk/; revision=21457
 2010-04-30 12:23:26 +00:00
Peter Simons
c82a9c8e10 pkgs/tools/misc/most: added version 5.0.0 
Build instructions courtesy of Tim Horton <tmhorton@gmail.com>.

svn path=/nixpkgs/trunk/; revision=21452
 2010-04-30 09:21:18 +00:00
Lluís Batlle i Rossell
cf5343a07d Adding the logrotate I found in the freebsd ports. 
I think that is what debian, fedora and freebsd call 'logrotate'.

svn path=/nixpkgs/trunk/; revision=21437
 2010-04-29 17:55:06 +00:00
Lluís Batlle i Rossell
060714f287 Adding mtdutils 
svn path=/nixpkgs/trunk/; revision=21436
 2010-04-29 17:54:51 +00:00
Armijn Hemel
311dc9299e update to 8.99 
svn path=/nixpkgs/trunk/; revision=21347
 2010-04-27 14:42:49 +00:00
Eelco Dolstra
a011b43d1f * Reverted r21314 because it causes all of Nixpkgs on Linux to be 
rebuilt.  Not sure why though.  Maybe "isLinux" is not set in the
  bootstrap stdenv.

svn path=/nixpkgs/trunk/; revision=21327
 2010-04-26 18:36:53 +00:00
Ludovic Courtès
9009a04e38 GNU Patch: Fix `stdenvNative' GNU/Linux builds. 
Reported by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21314
 2010-04-26 08:47:20 +00:00
Ludovic Courtès
8f995b2e50 GNU tar: Remove obsolete patch. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=21262
 2010-04-23 09:11:23 +00:00
Lluís Batlle i Rossell
bbb833cf8b Fixing the gnused fetchurl hash type, for stdenv-updates to evaluate well 
svn path=/nixpkgs/branches/stdenv-updates/; revision=21252
 2010-04-22 21:45:56 +00:00
Lluís Batlle i Rossell
6f2fac6466 Merging from trunk. 
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
 2010-04-22 21:44:33 +00:00
Lluís Batlle i Rossell
c12db8f8dc I wrote wrong the openssh url. Btw, I changed the source server, because the old 
mirror at Ultrech did not have the latest openssh even 6 days after the
5.5 release.

svn path=/nixpkgs/trunk/; revision=21247
 2010-04-22 20:12:09 +00:00
Lluís Batlle i Rossell
5d04ec0364 Updating openssh, fixing libedit for openssh to link well with it, and... here we 
finally have sftp with some kind of 'readline'!

svn path=/nixpkgs/trunk/; revision=21246
 2010-04-22 18:16:18 +00:00
Eelco Dolstra
7cdad55164 * Use OpenSSL's implementation of MD5, SHA-1 and SHA-256, as they're 
a bit faster.

svn path=/nixpkgs/trunk/; revision=21218
 2010-04-21 20:07:26 +00:00
Eelco Dolstra
fca81fa9ee * Reverted a revert that should not have been done :-) 
* Add a version number to svnfs.

svn path=/nixpkgs/trunk/; revision=21208
 2010-04-21 14:47:13 +00:00
Eelco Dolstra
e2a374799f * Reverted most of the recent Python refactorings, as discussed. It's 
a worthy goal to move the Python packages that are currently in
  all-packages.nix into a single attribute set, but this doesn't
  require moving python-packages.nix or the other changes made to that
  file.  The Python packages in all-packages.nix should simply be
  moved to python-packages.nix, and ideally changed to use
  buildPythonPackage.

svn path=/nixpkgs/trunk/; revision=21196
 2010-04-21 10:51:15 +00:00
Lluís Batlle i Rossell
85c1a2b7ff "Remind" update. 
svn path=/nixpkgs/trunk/; revision=21193
 2010-04-21 07:00:49 +00:00
Marc Weber
97f2c09f97 readding some python packages I dropped somehow by accident. 
This also updates some python libraries and fixes some things I forgot
to patch

svn path=/nixpkgs/trunk/; revision=21171
 2010-04-19 19:41:41 +00:00
Marc Weber
a772868bca adding svnFS 
svn path=/nixpkgs/trunk/; revision=21132
 2010-04-16 15:56:31 +00:00
Ludovic Courtès
d1c19b4049 GNU wget: Fix test suite runs. 
svn path=/nixpkgs/trunk/; revision=21057
 2010-04-13 10:11:42 +00:00
Ludovic Courtès
5ed6e1a1f7 GNU ddrescue 1.12. 
svn path=/nixpkgs/trunk/; revision=21051
 2010-04-13 08:56:07 +00:00
Ludovic Courtès
99d51d0e92 Assorted GNU updates. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=21047
 2010-04-13 08:37:54 +00:00
Lluís Batlle i Rossell
b6fe7e6d41 Adding offlineimap, in a not very elegant way. 
svn path=/nixpkgs/trunk/; revision=21034
 2010-04-12 21:03:22 +00:00
Peter Simons
0526f2fb2c pkgs/tools/networking/pdsh: added myself as a maintainer 
svn path=/nixpkgs/trunk/; revision=21027
 2010-04-12 11:21:34 +00:00
Yury G. Kudryashov
f25c68f01a Remove old kde packages 
svn path=/nixpkgs/trunk/; revision=21011
 2010-04-11 15:50:41 +00:00
Lluís Batlle i Rossell
a2334e604b Adding slimrat (not the gui, but at least the cli) 
svn path=/nixpkgs/trunk/; revision=20999
 2010-04-10 10:47:30 +00:00
Lluís Batlle i Rossell
6c37624153 Updating curlftpfs 
svn path=/nixpkgs/trunk/; revision=20994
 2010-04-09 15:40:12 +00:00
Michael Raskin
f6c28984f2 Update netpbm 
svn path=/nixpkgs/trunk/; revision=20956
 2010-04-06 13:24:46 +00:00
Lluís Batlle i Rossell
19b9811012 Making a bunch of basic programs cross-buildable. 
After this, the 'bootstrap-tools' can be cross-built.


svn path=/nixpkgs/branches/stdenv-updates/; revision=20945
 2010-04-04 18:10:42 +00:00
Armijn Hemel
a6237e5691 update to 5.21 
svn path=/nixpkgs/trunk/; revision=20941
 2010-04-04 15:20:28 +00:00
Armijn Hemel
8cd4c577aa update to 4.0.3 
svn path=/nixpkgs/trunk/; revision=20940
 2010-04-04 15:03:47 +00:00
Armijn Hemel
355413e0a5 update to 436 
svn path=/nixpkgs/trunk/; revision=20939
 2010-04-04 15:00:56 +00:00
Armijn Hemel
f7ab7efff1 update tcpdump to 4.1.0, libpcap to 1.1.0 
svn path=/nixpkgs/trunk/; revision=20938
 2010-04-04 14:57:26 +00:00
Armijn Hemel
155515f076 update to 2.0.19 
svn path=/nixpkgs/trunk/; revision=20937
 2010-04-04 14:51:37 +00:00
Armijn Hemel
589aeb4c00 update to 2.4 
svn path=/nixpkgs/trunk/; revision=20936
 2010-04-04 14:44:14 +00:00
Yury G. Kudryashov
7531041ca4 Fix install if /etc/vim exists 
Also fix all .py files, not only those going to $out/bin

svn path=/nixpkgs/trunk/; revision=20924
 2010-04-02 07:11:56 +00:00
Ludovic Courtès
525274bd94 xz: Fix x86_64-darwin builds. 
svn path=/nixpkgs/trunk/; revision=20916
 2010-04-01 14:52:14 +00:00
Sander van der Burg
4597b33ed1 Update Disnix packages to use the 0.1 release 
svn path=/nixpkgs/trunk/; revision=20915
 2010-04-01 14:49:05 +00:00
Andres Löh
9370225663 Haskell Platform 2010.1.0.0 
svn path=/nixpkgs/trunk/; revision=20904
 2010-04-01 10:56:48 +00:00
Lluís Batlle i Rossell
855bcdf626 Fixing the wdfs url. 
I noticed wdfs works. And the older fusedav does not at all. I may remove fusedav.

svn path=/nixpkgs/trunk/; revision=20899
 2010-04-01 08:57:26 +00:00
Ludovic Courtès
c936e89fc1 aMule 2.2.6. 
svn path=/nixpkgs/trunk/; revision=20866
 2010-03-30 08:20:29 +00:00
Lluís Batlle i Rossell
e6ad0bd25e Updating gnused 4.2 
svn path=/nixpkgs/trunk/; revision=20837
 2010-03-27 17:40:05 +00:00
Eelco Dolstra
48e1c2df80 * Added xdg-utils, a package that contains desktop integration 
commands such as `xdg-open' (which opens a URL with the user's
  default browser).

svn path=/nixpkgs/trunk/; revision=20829
 2010-03-25 19:48:06 +00:00
Eelco Dolstra
806099dbc8 * Added GNU wdiff. 
svn path=/nixpkgs/trunk/; revision=20817
 2010-03-25 11:51:55 +00:00
Lluís Batlle i Rossell
a991201bf5 Adding optipng, and a basic expression for pdfread. 
svn path=/nixpkgs/trunk/; revision=20802
 2010-03-23 23:04:41 +00:00
Lluís Batlle i Rossell
60b8b2b613 Adding pngnq. 
svn path=/nixpkgs/trunk/; revision=20801
 2010-03-23 22:40:46 +00:00
Lluís Batlle i Rossell
08f80eb9fb Updating unrar. 
svn path=/nixpkgs/trunk/; revision=20772
 2010-03-22 15:58:25 +00:00
Ludovic Courtès
dd5de51265 ncompress 4.2.4.3. 
svn path=/nixpkgs/trunk/; revision=20712
 2010-03-17 14:44:42 +00:00
Eelco Dolstra
8396168276 * Updated Nix to 0.15. 
svn path=/nixpkgs/trunk/; revision=20697
 2010-03-17 12:16:03 +00:00
Eelco Dolstra
8ff6ffbb65 * Update the unstable Nix (with some GC-related bug fixes). 
svn path=/nixpkgs/trunk/; revision=20652
 2010-03-16 12:46:12 +00:00
Lluís Batlle i Rossell
f68b2277b7 Adding qshowdiff. 
svn path=/nixpkgs/trunk/; revision=20633
 2010-03-15 14:26:52 +00:00
Marc Weber
06cff980b8 fix http server of tightvnc 
svn path=/nixpkgs/trunk/; revision=20601
 2010-03-13 06:07:24 +00:00
Eelco Dolstra
2c44e4313c svn path=/nixpkgs/trunk/; revision=20570 2010-03-11 16:22:55 +00:00
Ludovic Courtès
9c2c2af4b2 Latest Nix from `trunk'. 
svn path=/nixpkgs/trunk/; revision=20568
 2010-03-11 16:10:06 +00:00
Eelco Dolstra
b377b0233b * OpenSSH updated to 5.4. 
svn path=/nixpkgs/trunk/; revision=20567
 2010-03-11 16:08:55 +00:00
Eelco Dolstra
2745223414 * Updated nixSqlite. 
svn path=/nixpkgs/trunk/; revision=20552
 2010-03-11 11:36:40 +00:00
Ludovic Courtès
62a4d66a48 Fix URL of `nixUnstable'. 
svn path=/nixpkgs/trunk/; revision=20551
 2010-03-11 11:15:58 +00:00
Ludovic Courtès
c22cc79a9e Latest Nix from `trunk'. 
svn path=/nixpkgs/trunk/; revision=20549
 2010-03-11 10:51:53 +00:00
Lluís Batlle i Rossell
4a44d32444 Made tcpdump crossbuild. 
svn path=/nixpkgs/trunk/; revision=20543
 2010-03-10 22:22:43 +00:00
Eelco Dolstra
854b22a24e * Updated nixSqlite. 
svn path=/nixpkgs/trunk/; revision=20520
 2010-03-10 09:58:19 +00:00
Lluís Batlle i Rossell
12e960f592 Adding dropbear, a small implementation of ssh2 client and server. 
I made it statically build by default

I had to fix the zlib static cross-build, because the native stripping corrupted the target
static library. It is not the first time I see this.

I add drobear to the cross-built packages for hydra.


svn path=/nixpkgs/trunk/; revision=20518
 2010-03-09 23:11:12 +00:00
Lluís Batlle i Rossell
6f9a783232 Trying to get coreutils cross-built with uclibc. 
This involved fixing some buildInputs/buildNativeInputs in acl/attr,
and adding a libiconv in some places.


svn path=/nixpkgs/branches/stdenv-updates/; revision=20510
 2010-03-09 18:05:38 +00:00
Eelco Dolstra
5b90cc5b62 * Revert to 0.6.06: 0.6.08 is broken (fails with "AttributeError: 
'module' object has no attribute 'gpg_options'").

svn path=/nixpkgs/trunk/; revision=20505
 2010-03-09 16:22:43 +00:00
Eelco Dolstra
67e7ad56d7 * So there is an even newer version of duplicity :-) 
svn path=/nixpkgs/trunk/; revision=20499
 2010-03-09 15:46:22 +00:00
Eelco Dolstra
387216d7fa * Duplicity updated to 0.6.07. 
svn path=/nixpkgs/trunk/; revision=20498
 2010-03-09 15:40:58 +00:00
Eelco Dolstra
c7b9e45e76 * Added s3sync. 
svn path=/nixpkgs/trunk/; revision=20496
 2010-03-09 15:12:15 +00:00
Michael Raskin
993588515f We use Python 2.6 now 
svn path=/nixpkgs/trunk/; revision=20478
 2010-03-08 20:35:25 +00:00
Ludovic Courtès
8863a06fff GNU Enscript 1.6.5.1. 
svn path=/nixpkgs/trunk/; revision=20472
 2010-03-08 10:40:01 +00:00
Lluís Batlle i Rossell
4e59f00501 I added again nasm as lrzip input. It is required in i686-linux at least. 
svn path=/nixpkgs/trunk/; revision=20467
 2010-03-07 22:46:29 +00:00
Lluís Batlle i Rossell
7a2ad368f9 Updating lrzip. It does not depend on nasm anymore. 
svn path=/nixpkgs/trunk/; revision=20463
 2010-03-07 21:03:50 +00:00
Lluís Batlle i Rossell
49ba7bee3c Made curl cross-build properly with openssl support. 
svn path=/nixpkgs/trunk/; revision=20452
 2010-03-06 15:17:43 +00:00
Lluís Batlle i Rossell
d213d290a6 Setting tm and ts to build in all nixpkgs platforms. 
svn path=/nixpkgs/trunk/; revision=20446
 2010-03-05 23:26:49 +00:00
Lluís Batlle i Rossell
997723ec9b Trying to make nixUnstable cross-build. 
It fails because it builds bin2c for the host system, instead of the build system.
I will wait for a fix upstream.

svn path=/nixpkgs/trunk/; revision=20445
 2010-03-05 23:22:36 +00:00
Eelco Dolstra
2ae55812ef svn path=/nixpkgs/trunk/; revision=20428 2010-03-05 18:29:56 +00:00
Lluís Batlle i Rossell
81d4c5d09b Updating ts 
svn path=/nixpkgs/trunk/; revision=20421
 2010-03-05 17:22:37 +00:00
Rob Vermaas
cb4a352b3e wrong hash for nix-mysqlite 0.15 
svn path=/nixpkgs/trunk/; revision=20411
 2010-03-05 13:15:03 +00:00
Rob Vermaas
0723777cc7 update nixSqlite to 0.15pre20408 
svn path=/nixpkgs/trunk/; revision=20410
 2010-03-05 13:09:33 +00:00
Lluís Batlle i Rossell
f2830f5636 Making e2fsprogs crossbuild. 
svn path=/nixpkgs/trunk/; revision=20379
 2010-03-04 14:44:31 +00:00
Eelco Dolstra
2880af03c8 * Add a Nix expression for the Nix SQLite branch (temporarily). 
svn path=/nixpkgs/trunk/; revision=20377
 2010-03-04 14:39:47 +00:00
Ludovic Courtès
888d6711da GNU Sharutils 4.9. 
svn path=/nixpkgs/trunk/; revision=20362
 2010-03-04 11:10:40 +00:00
Eelco Dolstra
10cb305f11 * Urgh. 
svn path=/nixpkgs/trunk/; revision=20339
 2010-03-02 16:33:35 +00:00
Eelco Dolstra
42d9c2e92a svn path=/nixpkgs/trunk/; revision=20338 2010-03-02 16:33:17 +00:00
Ludovic Courtès
c2f72b3ba5 Tahoe-LAFS 1.6.1. 
svn path=/nixpkgs/trunk/; revision=20323
 2010-03-02 12:46:50 +00:00
Ludovic Courtès
ff88e57803 GNU Parted 2.2. 
svn path=/nixpkgs/trunk/; revision=20304
 2010-03-01 13:12:48 +00:00
Rob Vermaas
0fd4468570 acct: updated hash 
svn path=/nixpkgs/trunk/; revision=20299
 2010-03-01 12:11:12 +00:00
Rob Vermaas
3e9de0fd12 * nixpkgs: added webalizer 
svn path=/nixpkgs/trunk/; revision=20253
 2010-02-25 13:30:34 +00:00
Rob Vermaas
c4332bb7a1 nix 0.15pre20231 as nixUnstable 
svn path=/nixpkgs/trunk/; revision=20243
 2010-02-25 10:01:33 +00:00
Lluís Batlle i Rossell
e668d2689e Adding 'gt5', a diff-capable 'du' browser 
svn path=/nixpkgs/trunk/; revision=20236
 2010-02-24 19:06:25 +00:00
Michael Raskin
4b22e9d61d Adding cfdg - context-free design grammar 
svn path=/nixpkgs/trunk/; revision=20166
 2010-02-22 10:46:49 +00:00
Ludovic Courtès
913503155a GNU Sharutils: Pass `gettext'; run the test suite. 
svn path=/nixpkgs/trunk/; revision=20164
 2010-02-22 09:52:39 +00:00
Ludovic Courtès
7abc6a6b7d GNU Sharutils 4.8. 
svn path=/nixpkgs/trunk/; revision=20163
 2010-02-22 09:07:15 +00:00
Lluís Batlle i Rossell
75e0d28624 Updating upx - now it builds with gcc 4.4 
svn path=/nixpkgs/trunk/; revision=20160
 2010-02-22 08:08:23 +00:00
Michael Raskin
5c8272b0bc Adding asymptote graphic generation tool 
svn path=/nixpkgs/trunk/; revision=20158
 2010-02-21 17:36:41 +00:00
Lluís Batlle i Rossell
40985548d1 Merging from Oleksandr: 
Updating some gnome packages and pigz.


svn path=/nixpkgs/trunk/; revision=20154
 2010-02-21 12:25:36 +00:00
Michael Raskin
bfc5bc58e7 Fix missing include 
svn path=/nixpkgs/trunk/; revision=20148
 2010-02-21 08:24:00 +00:00
Michael Raskin
7db8225aed Update Data Matrix library and ifx its build 
svn path=/nixpkgs/trunk/; revision=20139
 2010-02-20 11:56:23 +00:00
Lluís Batlle i Rossell
b0e9724ef5 Quantum leap updating memtest86+. 
svn path=/nixpkgs/trunk/; revision=20122
 2010-02-19 09:48:50 +00:00
Lluís Batlle i Rossell
43e167641f Updating octave and gnuplot. 
svn path=/nixpkgs/trunk/; revision=20007
 2010-02-15 10:54:50 +00:00
Lluís Batlle i Rossell
c812574385 Removing a now unneeded CMAKE_PREFIX_PATH in ktorrent 
svn path=/nixpkgs/trunk/; revision=19966
 2010-02-12 22:30:06 +00:00
Ludovic Courtès
66e7aaa5c7 GNU Acct 6.5.4. 
svn path=/nixpkgs/trunk/; revision=19945
 2010-02-12 09:07:19 +00:00
Lluís Batlle i Rossell
8bfde9d310 Updating openvpn to a non-release_candidate newer version, and becoming maintainer. 
svn path=/nixpkgs/trunk/; revision=19941
 2010-02-11 16:45:19 +00:00
Ludovic Courtès
9be35372dc GNU Acct 6.5.3. 
svn path=/nixpkgs/trunk/; revision=19934
 2010-02-11 14:48:34 +00:00
Marc Weber
8bd41985a0 make gparted compile again by updating it 
svn path=/nixpkgs/trunk/; revision=19920
 2010-02-11 02:43:48 +00:00
Eelco Dolstra
81fabfeb04 * gnupg updated to 1.4.10. Also, build with bzip2 support. Duplicity 
can use this to better compress backups.

svn path=/nixpkgs/trunk/; revision=19915
 2010-02-10 19:03:48 +00:00
Eelco Dolstra
dae4ffdfdf * Added `boto', a Python interface to AWS. 
* Add boto as a dependency to duplicity to support backups to Amazon
  S3.

svn path=/nixpkgs/trunk/; revision=19913
 2010-02-10 18:10:22 +00:00
Eelco Dolstra
faa98ce5d6 * Duplicity needs gpg. 
svn path=/nixpkgs/trunk/; revision=19912
 2010-02-10 16:51:01 +00:00
Rob Vermaas
5c66bbab77 wrong URL 
svn path=/nixpkgs/trunk/; revision=19874
 2010-02-09 10:17:13 +00:00
Rob Vermaas
3d841892a7 unbound 1.4.1 
svn path=/nixpkgs/trunk/; revision=19870
 2010-02-09 07:28:32 +00:00
Eelco Dolstra
8b5d0c8de5 * Updated checkinstall 1.6.2, and added a patch to make it compile on 
Glibc 2.11.

svn path=/nixpkgs/trunk/; revision=19868
 2010-02-08 15:39:51 +00:00
Eelco Dolstra
d8c6bb130c * Sync with the trunk one last time. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
 2010-02-05 23:06:36 +00:00
Eelco Dolstra
aee659e1e2 * Fix various broken URLs / mirrors. 
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
 2010-02-05 22:00:51 +00:00
Eelco Dolstra
874b4869a3 * Nix stable updated to 0.14. 
svn path=/nixpkgs/trunk/; revision=19830
 2010-02-05 10:41:24 +00:00
Lluís Batlle i Rossell
df0800e91d Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19825
 2010-02-04 19:08:28 +00:00
Lluís Batlle i Rossell
c83ce140e1 Adding 'duplicity', and its dependency 'librsync' 
svn path=/nixpkgs/trunk/; revision=19813
 2010-02-04 13:42:41 +00:00
Ludovic Courtès
b46d05da85 Tahoe-LAFS: Hopefully fix subtle test suite bug. 
svn path=/nixpkgs/trunk/; revision=19801
 2010-02-03 23:38:12 +00:00
Eelco Dolstra
a617a7c239 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
 2010-02-03 14:23:43 +00:00
Ludovic Courtès
b5088abe20 Tahoe-LAFS 1.6.0. 
svn path=/nixpkgs/trunk/; revision=19784
 2010-02-03 13:38:03 +00:00
Peter Simons
715c59b281 pkgs/tools/system/ipmitool: added optional support for generating statically linked binaries 
svn path=/nixpkgs/trunk/; revision=19778
 2010-02-03 12:47:31 +00:00
Peter Simons
c261d7a847 pkgs/tools/system/ipmitool: updated to version 1.8.11 
svn path=/nixpkgs/trunk/; revision=19777
 2010-02-03 12:47:23 +00:00
Eelco Dolstra
031f722394 svn path=/nixpkgs/trunk/; revision=19773 2010-02-03 10:56:10 +00:00
Eelco Dolstra
0e212964fb * openssh: Install the moduli file. 
svn path=/nixpkgs/trunk/; revision=19753
 2010-02-01 17:04:07 +00:00
Eelco Dolstra
947e2c71ad * openssh updated to 5.3p1. Also enabled the HPN patch by default. 
svn path=/nixpkgs/trunk/; revision=19752
 2010-02-01 16:56:10 +00:00
Armijn Hemel
0e55350a85 update ktorrent to 3.3.3, also make it depend on KDE 4.3 
svn path=/nixpkgs/trunk/; revision=19737
 2010-01-30 19:30:30 +00:00
Eelco Dolstra
e80d65426f * Nix 0.14pre19730. 
svn path=/nixpkgs/trunk/; revision=19733
 2010-01-29 15:55:03 +00:00
Rob Vermaas
13417770a3 applying patches provided by griswold 
svn path=/nixpkgs/trunk/; revision=19707
 2010-01-27 12:12:35 +00:00
Lluís Batlle i Rossell
62c315a723 Adding libofx and updating opensp (to get libofx built). 
(I may have broken openjade... I will check later).


svn path=/nixpkgs/trunk/; revision=19697
 2010-01-26 22:04:54 +00:00
Eelco Dolstra
d068c0dd50 * ktorrent 2.2.8. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19675
 2010-01-26 15:05:02 +00:00
Ludovic Courtès
0c46b7b4d8 GNU Enscript 1.6.5. 
svn path=/nixpkgs/trunk/; revision=19668
 2010-01-26 14:49:00 +00:00
Ludovic Courtès
cf3b87d747 GNU GRUB 1.97.2. 
svn path=/nixpkgs/trunk/; revision=19656
 2010-01-25 22:04:03 +00:00
Lluís Batlle i Rossell
bcba809460 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
 2010-01-25 18:52:07 +00:00
Eelco Dolstra
10ca771495 * Latest Nix. 
svn path=/nixpkgs/trunk/; revision=19653
 2010-01-25 17:39:33 +00:00
Lluís Batlle i Rossell
279ffaa621 Adding ecryptfs, and one of its dependencies: keyutils. 
(I have not tried whether they work)

svn path=/nixpkgs/trunk/; revision=19645
 2010-01-25 10:34:47 +00:00
Ludovic Courtès
f6c80710f5 Add SWEC (Simple Web Error Checker). 
svn path=/nixpkgs/trunk/; revision=19637
 2010-01-24 19:07:16 +00:00
Marc Weber
41030334dd adding w3c CSS validator 
svn path=/nixpkgs/trunk/; revision=19635
 2010-01-24 15:39:42 +00:00
Eelco Dolstra
2feb604243 * A patch to ec2-bundle-image to make it work properly on read-only 
images (in the Nix store).

svn path=/nixpkgs/trunk/; revision=19616
 2010-01-22 16:42:54 +00:00
Ludovic Courtès
16dec99054 Add GNU mkisofs. 
svn path=/nixpkgs/trunk/; revision=19603
 2010-01-21 16:53:16 +00:00
Eelco Dolstra
9761d31dc9 * curl 7.19.7. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19573
 2010-01-20 14:26:19 +00:00
Peter Simons
35424c8836 pkgs/tools/system/ipmitool/default.nix: add openssl dependency to enable lanplus protocol 
svn path=/nixpkgs/trunk/; revision=19543
 2010-01-19 16:21:40 +00:00
Peter Simons
81324b5de0 pkgs/tools/system/ipmitool: command-line interface to IPMI-enabled devices 
Initial version 1.8.9.

svn path=/nixpkgs/trunk/; revision=19542
 2010-01-19 15:58:19 +00:00
Eelco Dolstra
45d18b9b4a svn path=/nixpkgs/trunk/; revision=19523 2010-01-18 15:40:23 +00:00
Ludovic Courtès
907be69b26 GNU Patch: Fix for BSDs. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19522
 2010-01-18 14:54:46 +00:00
Ludovic Courtès
bf1ffcc595 coreutils: Disable tests on non-GNU platforms. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19521
 2010-01-18 14:54:42 +00:00
Lluís Batlle i Rossell
70dd97620c Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
 2010-01-16 15:19:23 +00:00
Lluís Batlle i Rossell
be72ec22e0 Fixing the build of jfsrec under gcc 4.4, taking a patch from archlinux. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19481
 2010-01-16 14:59:04 +00:00
Lluís Batlle i Rossell
ca167b9a97 Updating 'at' from 3.1.11 to 3.1.12. 
The debian repository only has 3.1.10 and 3.1.12. I don't know why.


svn path=/nixpkgs/trunk/; revision=19480
 2010-01-16 14:44:20 +00:00
Lluís Batlle i Rossell
56b3954028 Updating cdrkit 
svn path=/nixpkgs/trunk/; revision=19479
 2010-01-16 14:42:08 +00:00
Lluís Batlle i Rossell
742a4b5191 Adding a global wrapper that provides the user with ready-to-use opensc tools and 
a 'firefox-dnie' that will launch the firefox in the path with the proper
environment variables to allow firefox access the Spanish national id SmartCard
as a Security Device.
For the later to work cleanly, it will require the user to enable the opensc-pkcs11
module as Security Devices in firefox.

svn path=/nixpkgs/trunk/; revision=19452
 2010-01-14 23:43:56 +00:00
Lluís Batlle i Rossell
f29068a1de Adding the pinentry dependency to opensc, so it properly calls at least one pinentry. 
The upstream opensc 0.11.7 does not allow choosing it at runtime!


svn path=/nixpkgs/trunk/; revision=19449
 2010-01-14 22:47:30 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk. 
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
 2010-01-14 14:49:31 +00:00
Eelco Dolstra
c63858a169 * Fix the path to bash. 
* Add openssl as a dependency.

svn path=/nixpkgs/trunk/; revision=19436
 2010-01-14 14:26:35 +00:00
Ludovic Courtès
c161cd1773 GNU Patch: Fix typo. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19432
 2010-01-14 12:46:10 +00:00
Ludovic Courtès
7c8062b8a2 GNU Patch: Try fix for Darwin. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19430
 2010-01-14 10:09:45 +00:00
Ludovic Courtès
951ec3ce51 GNU Coreutils 8.4. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19429
 2010-01-14 10:09:39 +00:00
Rob Vermaas
cec84b8a63 fixes for netpbm, provided by griswold 
svn path=/nixpkgs/trunk/; revision=19413
 2010-01-13 21:16:12 +00:00
Rob Vermaas
2a4ea1b6d5 fixed missing zlib rpath in netpbm, provided by griswold 
svn path=/nixpkgs/trunk/; revision=19411
 2010-01-13 21:14:10 +00:00
Rob Vermaas
675a8ed9d8 ncompress provided by griswold 
svn path=/nixpkgs/trunk/; revision=19410
 2010-01-13 21:11:48 +00:00
Rob Vermaas
a6cd7eb8a1 dos2unix and unix2dos provided by griswold 
svn path=/nixpkgs/trunk/; revision=19409
 2010-01-13 21:09:55 +00:00
Rob Vermaas
8c29f10134 amazon ec2 ami tools 
svn path=/nixpkgs/trunk/; revision=19396
 2010-01-13 14:25:45 +00:00
Eelco Dolstra
56babc131d * inetutils: traceroute also needs a chmod +x. 
svn path=/nixpkgs/trunk/; revision=19393
 2010-01-13 13:46:22 +00:00
Eelco Dolstra
3df8e6662a * Updated ec2-api-tools to the latest version. Also, generate 
wrappers that set EC2_HOME and JAVA_HOME.

svn path=/nixpkgs/trunk/; revision=19390
 2010-01-13 12:54:26 +00:00
Andres Löh
ccde400207 Updated lhs2TeX. 
svn path=/nixpkgs/trunk/; revision=19366
 2010-01-12 10:27:25 +00:00
Ludovic Courtès
55c103a37e GNU Fdisk 1.2.4. 
svn path=/nixpkgs/trunk/; revision=19347
 2010-01-11 10:16:47 +00:00
Lluís Batlle i Rossell
a16865ce62 Adding fix for wicd, sent by roconnor to nix-dev. 
svn path=/nixpkgs/trunk/; revision=19345
 2010-01-11 07:50:03 +00:00
Lluís Batlle i Rossell
9c8c4159b5 Fixing the style in the wicd expression, based on the recommendations 
made by ludo in the mailing list.


svn path=/nixpkgs/trunk/; revision=19342
 2010-01-10 20:27:28 +00:00
Lluís Batlle i Rossell
24a46bbf12 Downgrading the opensc library version to 0.11.7, that required 
for the Spanish national id smartcard (DNIe).
Adding the opensc dnie driver.


svn path=/nixpkgs/trunk/; revision=19325
 2010-01-10 00:22:29 +00:00
Lluís Batlle i Rossell
ebee637aaf The communication between opensc and pcsclite was not working. Fixing it. 
I missed an absolute path.


svn path=/nixpkgs/trunk/; revision=19323
 2010-01-09 22:06:44 +00:00
Lluís Batlle i Rossell
e657b30a51 Adding OpenSC, a pkcs11 interface to smartcards. 
svn path=/nixpkgs/trunk/; revision=19322
 2010-01-09 21:52:31 +00:00
Lluís Batlle i Rossell
abffb0bdcb Fixing the descsription of some packages. Previously I misunderstood what 
they were for, in particular.


svn path=/nixpkgs/trunk/; revision=19321
 2010-01-09 21:33:28 +00:00
Lluís Batlle i Rossell
517fdec44b Adding more muscle programs and libraries. 
svn path=/nixpkgs/trunk/; revision=19320
 2010-01-09 18:06:37 +00:00
Lluís Batlle i Rossell
56cfcdb27f Adding pcsclite with the opensource ccid usb drivers. 
This gives a daemon controlling the smartcard reader used to read the
Spanish identity card.


svn path=/nixpkgs/trunk/; revision=19319
 2010-01-09 17:35:57 +00:00
Ludovic Courtès
a9ced90be9 GNU Patch: Use GNU ed and re-enable the tests. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19315
 2010-01-08 21:28:30 +00:00
Ludovic Courtès
792eeca654 GNU Coreutils 8.3. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19314
 2010-01-08 21:22:10 +00:00
Lluís Batlle i Rossell
863ccef2c4 Updating unrar, and making its libunrar library work (needs -DSILENT, for example) 
svn path=/nixpkgs/trunk/; revision=19309
 2010-01-08 20:04:23 +00:00
Ludovic Courtès
b80132502d GNU Parted 2.1. 
svn path=/nixpkgs/trunk/; revision=19308
 2010-01-08 14:33:14 +00:00
Eelco Dolstra
8df82e27b5 * Work around an incompatibility between LVM's udev rules and GRUB 2 
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550704).

svn path=/nixpkgs/trunk/; revision=19304
 2010-01-07 23:45:29 +00:00
Lluís Batlle i Rossell
de6f189743 Adding libunrar installation, when building unrar. 
svn path=/nixpkgs/trunk/; revision=19302
 2010-01-07 22:42:25 +00:00