1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 16:11:58 +00:00
Commit graph

1844 commits

Author SHA1 Message Date
Ludovic Courtès c59551c32c GNU Recutils 1.1.
svn path=/nixpkgs/trunk/; revision=25447
2011-01-06 14:37:59 +00:00
Lluís Batlle i Rossell 3fed0dff5d Telling fakeroot to build only on linux
svn path=/nixpkgs/trunk/; revision=25441
2011-01-06 10:51:10 +00:00
Lluís Batlle i Rossell eb3d75b740 Adding fakeroot.
svn path=/nixpkgs/trunk/; revision=25440
2011-01-06 10:43:32 +00:00
Karn Kallio bebcd96c1d Apply patch taken from http://www.linuxfromscratch.org/blfs/view/svn/general/bc.html
to fix segfault when using -l option.

svn path=/nixpkgs/trunk/; revision=25432
2011-01-06 03:11:25 +00:00
Rob Vermaas 1b81032553 do not build dcraw on cygwin
svn path=/nixpkgs/trunk/; revision=25415
2011-01-05 10:08:49 +00:00
Rob Vermaas 1b51c304ab do not build convmv on darwin
svn path=/nixpkgs/trunk/; revision=25414
2011-01-05 10:07:42 +00:00
Rob Vermaas a3c649f969 only build asymptote on linux, because it has never built on any platforms other than linux
svn path=/nixpkgs/trunk/; revision=25406
2011-01-05 09:31:49 +00:00
Evgeny Egorochkin 180205a431 knetwork-manager: package and enable support in KDE to see what is going to break.
svn path=/nixpkgs/trunk/; revision=25375
2011-01-04 00:28:22 +00:00
Evgeny Egorochkin 857ea5f7cd network-manager: try fixing compilation for x86_64-linux.
svn path=/nixpkgs/trunk/; revision=25374
2011-01-03 22:34:50 +00:00
Yury G. Kudryashov 45b8ce020f network-manager: use mirror://gnome
svn path=/nixpkgs/trunk/; revision=25371
2011-01-03 19:10:01 +00:00
Evgeny Egorochkin 9b50ebd825 network-manager: packaged, maybe even works.
svn path=/nixpkgs/trunk/; revision=25367
2011-01-03 18:01:10 +00:00
Eelco Dolstra c1eb464f3c * Build those Python modules in the Python distribution that require
additional dependencies (e.g. SQLite, X11, or Tcl/Tk) outside the
  main Python package (i.e., pythonBase).  This makes pythonFull
  unnecessary: you can just pass the additional modules as
  buildInputs to packages that require them, e.g.

    buildInputs = [ pythonModules.sqlite3 ];

svn path=/nixpkgs/branches/modular-python/; revision=25364
2011-01-03 16:25:11 +00:00
Michael Raskin 29cd3206f2 Adding ised
svn path=/nixpkgs/trunk/; revision=25331
2011-01-01 20:28:38 +00:00
Peter Simons b5f00acee2 pkgs/tools/networking/pdsh: updated to version 2.23
svn path=/nixpkgs/trunk/; revision=25329
2011-01-01 14:51:53 +00:00
Eelco Dolstra a1e444b3b0 * file updated to 5.04.
svn path=/nixpkgs/trunk/; revision=25324
2010-12-30 18:31:27 +00:00
Eelco Dolstra b7c7550c43 * Replace the Python "magic" module with the (apparently) more
common one from the "file" package.

svn path=/nixpkgs/trunk/; revision=25322
2010-12-29 19:19:56 +00:00
Yury G. Kudryashov 0d730b4362 Add sp compatibility wrapper
This wrapper is required by some old programs (e.g., po4a which I'm trying to package)

svn path=/nixpkgs/trunk/; revision=25320
2010-12-29 18:04:11 +00:00
Eelco Dolstra 5bb4096763 * Fix an evaluation error in xburst-tools.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25311
2010-12-28 17:25:17 +00:00
Eelco Dolstra aa6f43149a * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
2010-12-28 16:42:00 +00:00
Eelco Dolstra 1f5b61713e * Added libvdpau and vdpauinfo.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25296
2010-12-27 18:30:52 +00:00
Sander van der Burg a8bfe3a9b1 Bumped disnix again
svn path=/nixpkgs/trunk/; revision=25295
2010-12-27 16:00:29 +00:00
Sander van der Burg 8e81fd9ee8 Bumped versions of disnix and disnixos
svn path=/nixpkgs/trunk/; revision=25262
2010-12-23 17:35:09 +00:00
Eelco Dolstra aceef005c3 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25244
2010-12-22 17:02:03 +00:00
Lluís Batlle i Rossell a34fd23fc1 Fixing the openvpn url.
svn path=/nixpkgs/trunk/; revision=25239
2010-12-22 14:03:55 +00:00
Lluís Batlle i Rossell 9b59178909 Updating openvpn
svn path=/nixpkgs/trunk/; revision=25237
2010-12-22 13:34:19 +00:00
Sander van der Burg 80af0654fb Bumped activation scripts so that postgresql and subversion types are supported
svn path=/nixpkgs/trunk/; revision=25234
2010-12-22 13:31:25 +00:00
Eelco Dolstra 6c790bbbab * Bump.
svn path=/nixpkgs/trunk/; revision=25228
2010-12-21 16:29:01 +00:00
Ludovic Courtès bd311de25c GNU Recutils 1.0.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25227
2010-12-21 16:26:34 +00:00
Lluís Batlle i Rossell c7de6bfeb3 Updating cromfs to 1.5.9.1, as the previous did not build with glibc 2.12.
Thanks to Bisqwit for the quick reaction.


svn path=/nixpkgs/branches/stdenv-updates/; revision=25224
2010-12-21 14:27:48 +00:00
Lluís Batlle i Rossell 22253677b3 Merging from trunk. The previous merge took the firefox 3.6 in a bad state.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25202
2010-12-19 20:12:10 +00:00
Sander van der Burg c93a60d7a3 Bumped version of disnixos again
svn path=/nixpkgs/trunk/; revision=25201
2010-12-19 15:28:11 +00:00
Sander van der Burg 56032641f4 Updated disnixos
svn path=/nixpkgs/trunk/; revision=25199
2010-12-19 14:59:26 +00:00
Eelco Dolstra 206aeef557 * Memtest86+ updated to 4.10.
svn path=/nixpkgs/trunk/; revision=25191
2010-12-18 17:42:55 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Sander van der Burg d0a0f22c76 Updated Disnix packages and added disnixos
svn path=/nixpkgs/trunk/; revision=25181
2010-12-17 18:42:02 +00:00
Michael Raskin 55afe4bc5e Patch rlwrap to support high-bit characters
svn path=/nixpkgs/trunk/; revision=25167
2010-12-17 10:56:35 +00:00
Eelco Dolstra 229b94b30c svn path=/nixpkgs/trunk/; revision=25165 2010-12-17 08:56:53 +00:00
Michael Raskin 2b1fe76307 Mandatory HDF5 sub-minor-version update with no old version copies around
svn path=/nixpkgs/trunk/; revision=25159
2010-12-16 20:19:43 +00:00
Eelco Dolstra f14bafc04b * Bump nixSqlite.
svn path=/nixpkgs/trunk/; revision=25118
2010-12-14 10:56:25 +00:00
Ludovic Courtès f03da539a7 GNU tar 1.25.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25093
2010-12-12 23:35:27 +00:00
Ludovic Courtès e7739d9407 GNU Coreutils 8.7.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25092
2010-12-12 23:35:22 +00:00
Ludovic Courtès ef8619b4b2 GNU Parted: Allow cross-GNU builds.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25088
2010-12-12 23:21:35 +00:00
Ludovic Courtès 2e819f094c GNU wdiff 0.6.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25084
2010-12-12 20:19:48 +00:00
Ludovic Courtès 5ce453b66e GNU acct 6.5.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25083
2010-12-12 20:19:43 +00:00
Ludovic Courtès 8404ee65b6 GNU Parallel 20101202.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25082
2010-12-12 20:19:38 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Eelco Dolstra 97d4a54698 * nixSqlite: bump. Also, go back to using SQLite 3.7 because 3.6 also
gives random "database image is malformed" errors.

svn path=/nixpkgs/trunk/; revision=25050
2010-12-10 10:22:23 +00:00
Eelco Dolstra d6f066c8ed * e2fsprogs updated to 1.41.12.
svn path=/nixpkgs/trunk/; revision=25035
2010-12-08 17:58:18 +00:00
Eelco Dolstra 7236f87bed * Bump.
svn path=/nixpkgs/trunk/; revision=25025
2010-12-07 13:16:11 +00:00
Peter Simons 9bd9e32aa8 pkgs/tools/system/ipmitool: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25014
2010-12-06 18:01:57 +00:00
Peter Simons d46e80976c pkgs/tools/admin/tightvnc: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25013
2010-12-06 18:01:51 +00:00
Peter Simons dffe4189e7 pkgs/tools/X11/x11vnc: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25012
2010-12-06 18:01:46 +00:00
Peter Simons b2ae5a5ba9 pkgs/tools/compression/bzip2: move --mandir into standard location $out/share/man
svn path=/nixpkgs/branches/stdenv-updates/; revision=25007
2010-12-06 17:48:52 +00:00
Peter Simons 475cbea101 pkgs/tools/text/replace: move --mandir to standard location $out/share/man
Also, fixed the type of $makeFlags, which is a string, not a list.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25006
2010-12-06 17:43:57 +00:00
Eelco Dolstra b94588c5c4 * Remove obsolete patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25001
2010-12-06 13:45:07 +00:00
Evgeny Egorochkin c76f114d20 tor:version bump
svn path=/nixpkgs/trunk/; revision=24944
2010-12-01 04:07:44 +00:00
Eelco Dolstra f088bd4791 * nixUnstable updated, now with garbage collector.
svn path=/nixpkgs/trunk/; revision=24943
2010-11-30 18:32:23 +00:00
Russell O'Connor d07675c415 Maybe this will fix wicd.
svn path=/nixpkgs/trunk/; revision=24933
2010-11-30 04:09:51 +00:00
Russell O'Connor 7f65afe3f3 Update wicd to 1.7.0
svn path=/nixpkgs/trunk/; revision=24929
2010-11-29 20:15:44 +00:00
Eelco Dolstra 6ff77b7f6c * tcpdump 4.1.1.
svn path=/nixpkgs/trunk/; revision=24919
2010-11-29 15:25:07 +00:00
Eelco Dolstra aa01c8abd6 * Added xdelta.
svn path=/nixpkgs/trunk/; revision=24907
2010-11-28 16:37:48 +00:00
Tobias Hammerschmidt 1db5a9df76 added tmux
svn path=/nixpkgs/trunk/; revision=24904
2010-11-28 12:38:35 +00:00
Evgeny Egorochkin 676562ac15 encfs: packaged. Patch by Ambrus Kaposi.
svn path=/nixpkgs/trunk/; revision=24900
2010-11-28 09:59:13 +00:00
Evgeny Egorochkin b89f2ef1e4 system-config-printer: fix runtime errors. Patch by Karn Kallio.
svn path=/nixpkgs/trunk/; revision=24899
2010-11-28 09:46:51 +00:00
Tobias Hammerschmidt 57c1632f11 added flvstreamer
svn path=/nixpkgs/trunk/; revision=24884
2010-11-26 20:04:07 +00:00
Lluís Batlle i Rossell e571333232 Making ts and tm crossbuild
svn path=/nixpkgs/branches/stdenv-updates/; revision=24870
2010-11-26 14:12:10 +00:00
Ludovic Courtès c50a240e3d xtrace 1.0.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24854
2010-11-25 09:38:28 +00:00
Michael Raskin 293704a6f8 Fix the makefile
svn path=/nixpkgs/branches/stdenv-updates/; revision=24816
2010-11-22 23:16:05 +00:00
Michael Raskin 6af8a1debd Merging from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
2010-11-22 11:39:42 +00:00
Michael Raskin 6a9414d938 Adding dd_rescue - this is not the same as GNU ddrescue which has not been updated for a long time
svn path=/nixpkgs/trunk/; revision=24801
2010-11-22 08:40:10 +00:00
Eelco Dolstra 165a3df7f5 * Update nixSqlite.
svn path=/nixpkgs/trunk/; revision=24764
2010-11-19 10:39:48 +00:00
Michael Raskin fb58f74d82 Updating from trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
2010-11-17 17:03:09 +00:00
Michael Raskin 4c4b783a10 Fix typo
svn path=/nixpkgs/trunk/; revision=24703
2010-11-15 20:36:50 +00:00
Evgeny Egorochkin ecf54a3e6b lshw: disable gui by default since it's ugly.
svn path=/nixpkgs/trunk/; revision=24689
2010-11-15 10:12:55 +00:00
Evgeny Egorochkin b9b7665edd lshw: Packaged
svn path=/nixpkgs/trunk/; revision=24688
2010-11-15 09:52:57 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Ludovic Courtès f1cd0dd6d9 Namazu 2.0.20.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24671
2010-11-11 22:12:08 +00:00
Ludovic Courtès 9feaed78d2 ncftp: Get the source from Debian.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24664
2010-11-11 17:32:53 +00:00
Michael Raskin df2d680da8 Kill -I- in fdm
svn path=/nixpkgs/branches/stdenv-updates/; revision=24643
2010-11-10 16:14:18 +00:00
Rob Vermaas 7f5431f095 gnugrep: trying to fix darwin builds
svn path=/nixpkgs/branches/stdenv-updates/; revision=24634
2010-11-10 07:45:41 +00:00
Ludovic Courtès c317c7f4bd GNU grep: Fix build on non-GNU platforms.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24627
2010-11-09 13:12:31 +00:00
Yury G. Kudryashov 5b79f27f5c Upgrade ntfs-3g
svn path=/nixpkgs/trunk/; revision=24617
2010-11-07 23:20:02 +00:00
Peter Simons ffebdb77c3 Revert revision 24602. diffutils is part of stdenv and shouldn't have
been modified in trunk.

svn path=/nixpkgs/trunk/; revision=24609
2010-11-05 14:54:47 +00:00
Peter Simons 027f42695c The lxc package doesn't build on systems other than Linux.
svn path=/nixpkgs/trunk/; revision=24608
2010-11-05 14:49:42 +00:00
Peter Simons d5abf27257 pkgs/tools/networking/pdsh: fixed location of "info" and "man" directories
svn path=/nixpkgs/trunk/; revision=24604
2010-11-05 14:35:30 +00:00
Peter Simons ceb2468657 pkgs/tools/text/diffutils: fixed location of "info" and "man" directories
svn path=/nixpkgs/trunk/; revision=24602
2010-11-05 14:35:18 +00:00
Peter Simons c13e0307b6 pkgs/tools/misc/screen: fixed various impurities
Removed lots of hard-coded /usr/something paths from the configure script.
Moved $out/{info,man} to $out/share/{info,man}.

svn path=/nixpkgs/trunk/; revision=24601
2010-11-05 14:35:14 +00:00
Ludovic Courtès 0a00613f89 fileschanged: Assorted nitpicks.
svn path=/nixpkgs/trunk/; revision=24599
2010-11-04 14:26:19 +00:00
Sander van der Burg 76e26dd7a1 - Renamed DisnixService => DisnixWebService
- Updated to latest unstable version


svn path=/nixpkgs/trunk/; revision=24559
2010-11-01 17:33:24 +00:00
Lluís Batlle i Rossell f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Lluís Batlle i Rossell 1d4fe44ecc Tell lxc to use /var instead of $out/var
svn path=/nixpkgs/trunk/; revision=24551
2010-10-31 19:25:51 +00:00
Ludovic Courtès 5c2974a0af Seeks 0.3.0.
svn path=/nixpkgs/trunk/; revision=24549
2010-10-30 21:44:36 +00:00
Michael Raskin 9a6c3e6fe9 Nix trunk requires pkgconfig
svn path=/nixpkgs/trunk/; revision=24541
2010-10-30 12:01:02 +00:00
Michael Raskin 9af1c42473 Pass BoehmGC to Nix
svn path=/nixpkgs/trunk/; revision=24540
2010-10-30 11:21:06 +00:00
Peter Simons e08d173663 pdsh: updated to version 2.22
svn path=/nixpkgs/trunk/; revision=24539
2010-10-30 09:51:38 +00:00
Peter Simons 7ec0584160 Added fileschanged version 0.6.9.
svn path=/nixpkgs/trunk/; revision=24511
2010-10-28 11:10:09 +00:00
Lluís Batlle i Rossell fdc0738e0b Adding lxc userland tools.
svn path=/nixpkgs/trunk/; revision=24502
2010-10-26 21:11:47 +00:00
Lluís Batlle i Rossell b9da5de4da Updating gnu tar
svn path=/nixpkgs/branches/stdenv-updates/; revision=24484
2010-10-26 08:33:34 +00:00
Lluís Batlle i Rossell a38202bc8b Updating xz to a stable version. Not beta anymore. (more stdenv rebuild)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24483
2010-10-26 08:33:18 +00:00
Peter Simons ef4a03f3da Moved tools/misc/psmisc to os-specific/linux/psmisc.
svn path=/nixpkgs/trunk/; revision=24469
2010-10-25 14:38:37 +00:00
Lluís Batlle i Rossell 3592b9a796 Adding unarj
svn path=/nixpkgs/trunk/; revision=24430
2010-10-23 14:55:14 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Michael Raskin 8413c96cde Fix dependency
svn path=/nixpkgs/trunk/; revision=24412
2010-10-22 06:36:45 +00:00
Michael Raskin fb8e4c950f Adding fdm
svn path=/nixpkgs/trunk/; revision=24409
2010-10-21 22:03:36 +00:00
Michael Raskin ac19af507f Adding Linux 2.6.36
svn path=/nixpkgs/trunk/; revision=24403
2010-10-21 12:28:14 +00:00
Eelco Dolstra 3ac4025945 * Add some packages to the channel.
svn path=/nixpkgs/trunk/; revision=24397
2010-10-21 11:18:30 +00:00
Peter Simons 5019f883f3 pkgs/tools/text/recode: added (heavily patched) version 3.6
svn path=/nixpkgs/trunk/; revision=24384
2010-10-20 13:05:49 +00:00
Yury G. Kudryashov 51ac7f1a27 Patch kdiff3 so it will build with KDE 4.5.2
The DocBook DTD version must be at least 4.2 for validation.  Add a patch
to change version number in the DOCTYPE.

Submitted by Karn Kallio

svn path=/nixpkgs/trunk/; revision=24382
2010-10-20 11:59:13 +00:00
Yury G. Kudryashov b86b382b50 kdiff3 cleanup
svn path=/nixpkgs/trunk/; revision=24381
2010-10-20 11:59:06 +00:00
Rob Vermaas 202774b93e added ftgl, gource
svn path=/nixpkgs/trunk/; revision=24379
2010-10-20 10:53:45 +00:00
Ludovic Courtès aebda198cc GnuPG 1.4.11.
svn path=/nixpkgs/trunk/; revision=24357
2010-10-19 08:09:28 +00:00
Ludovic Courtès 8846577c78 GNU mtools 4.0.15.
svn path=/nixpkgs/trunk/; revision=24356
2010-10-19 08:09:10 +00:00
Michael Raskin bc73cd0f7e Add ripmime - MIME attachment extractor tool
svn path=/nixpkgs/trunk/; revision=24337
2010-10-18 09:43:17 +00:00
Michael Raskin b2e9e9757c Adding philter mail sorter
svn path=/nixpkgs/trunk/; revision=24336
2010-10-18 05:33:31 +00:00
Michael Raskin e53d966a21 Add getmail
svn path=/nixpkgs/trunk/; revision=24334
2010-10-17 19:30:59 +00:00
Michael Raskin e958760535 Applying some patches from Debian to build it with fresh OpenCV
svn path=/nixpkgs/trunk/; revision=24292
2010-10-14 15:44:58 +00:00
Michael Raskin baf66467ac Fix OpenCV reference
svn path=/nixpkgs/trunk/; revision=24273
2010-10-14 10:51:31 +00:00
Yury G. Kudryashov f039080451 ebook-tools-0.2.1
svn path=/nixpkgs/trunk/; revision=24233
2010-10-12 07:49:13 +00:00
Ludovic Courtès 143a5749a3 GNU Screen: Add the built-in telnet client; add meta-data.
svn path=/nixpkgs/trunk/; revision=24228
2010-10-11 22:11:54 +00:00
Eelco Dolstra 48229f2b0d * dnsmasq updated to 2.55.
svn path=/nixpkgs/trunk/; revision=24222
2010-10-11 19:30:54 +00:00
Lluís Batlle i Rossell 427d99ee1e Updating from trunk (to get the latest nixUnstable)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24205
2010-10-10 14:45:42 +00:00
Lluís Batlle i Rossell 71b6bc2be5 Updating nixUnstable. I'll propagate it to stdenv-updates, so it gets the
latest fixes that allow it to build in x86_64 gcc 4.5.1 (related to troubles
with a stack overflow).

svn path=/nixpkgs/trunk/; revision=24204
2010-10-10 14:42:55 +00:00
Lluís Batlle i Rossell e7e103b8eb Updating from trunk (to catch cron changes)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24200
2010-10-10 11:44:28 +00:00
Lluís Batlle i Rossell 710f6c165b Making the vixie cron have a configurable sendmail path (for nixos)
svn path=/nixpkgs/trunk/; revision=24196
2010-10-10 11:07:15 +00:00
Lluís Batlle i Rossell 08d3f9460d Fixing rrdtool expression evaluation.
svn path=/nixpkgs/trunk/; revision=24195
2010-10-10 11:07:04 +00:00
Lluís Batlle i Rossell 58550eef98 Setting hydra to build rrdtool
svn path=/nixpkgs/trunk/; revision=24194
2010-10-10 11:06:55 +00:00
Lluís Batlle i Rossell 143ea0f491 gnu grep does not need the patch we set anymore.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24186
2010-10-08 14:28:48 +00:00
Michael Raskin da28284b28 Adding missing files for barcode
svn path=/nixpkgs/trunk/; revision=24174
2010-10-08 09:11:57 +00:00
Lluís Batlle i Rossell c93a74426b Fixing the gnupatch url; it was taking the alpha snapshot for all the platforms
at the time of building the stdenv (because there !(stdenv ? glibc)).
I changed that to stdenv.isDarwin, in a guess that it may work for those who
experienced problems with the last patch release.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24171
2010-10-08 06:53:35 +00:00
Ludovic Courtès dc71d2e6d3 GNU grep 2.7.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24160
2010-10-07 22:29:00 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Ludovic Courtès 89a3dc9ada nss-mdns: Fix the path to the `avahi-daemon' socket.
svn path=/nixpkgs/trunk/; revision=24149
2010-10-07 20:07:59 +00:00
Peter Simons 73a08a1914 pkgs/tools/networking/x11-ssh-askpass: capitalize first letter of meta.description
svn path=/nixpkgs/trunk/; revision=24144
2010-10-07 14:05:19 +00:00
Peter Simons d0cdb3a02a pkgs/tools/compression/bzip2: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=24142
2010-10-07 13:14:25 +00:00
Peter Simons 113075207e pkgs/tools/networking/x11-ssh-askpass: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=24141
2010-10-07 13:14:21 +00:00
Peter Simons 5b87d8b27d pkgs/tools/compression/bzip2: completed meta section
svn path=/nixpkgs/trunk/; revision=24138
2010-10-07 13:14:09 +00:00
Peter Simons d2c4a70a0e pkgs/tools/misc/screen: added meta section
svn path=/nixpkgs/trunk/; revision=24137
2010-10-07 13:14:05 +00:00
Peter Simons a158e67b19 pkgs/tools/networking/x11-ssh-askpass: added meta section
svn path=/nixpkgs/trunk/; revision=24135
2010-10-07 13:13:57 +00:00
Eelco Dolstra 4e94575014 * NTP updated to 4.2.6p2.
svn path=/nixpkgs/trunk/; revision=24118
2010-10-06 16:02:44 +00:00
Ludovic Courtès 65b6fc1992 GNU Parallel 20100922.
svn path=/nixpkgs/trunk/; revision=24102
2010-10-05 22:08:48 +00:00
Ludovic Courtès 2ca7b3c62c GNU bc: Fix `name'; clean things up.
svn path=/nixpkgs/trunk/; revision=24100
2010-10-05 22:08:37 +00:00
Yury G. Kudryashov 673e66e3a3 Move most kde-extragear apps to top-level
svn path=/nixpkgs/trunk/; revision=24092
2010-10-05 17:44:33 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Lluís Batlle i Rossell 8d435fd90f Updating the src url of offlineimap (to the only version there available)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24037
2010-10-03 09:19:04 +00:00
Lluís Batlle i Rossell bb0351b562 Making iftop build on the fuloong (config.guess.)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24036
2010-10-03 09:18:55 +00:00
Lluís Batlle i Rossell 530ac48a7c Making the default vim have multibyte+nls support. Checking with 'du', I think
the results take almost the same amount of bytes, while we get support for utf8 terminals.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24031
2010-10-03 09:17:22 +00:00
Lluís Batlle i Rossell 6182f020f2 Making mtd-utils build with gcc 4.5.1
svn path=/nixpkgs/branches/stdenv-updates/; revision=24030
2010-10-03 09:12:54 +00:00
Russell O'Connor 90aa3c3c3c New derivation for torsocks.
This will replace tsocks.


svn path=/nixpkgs/trunk/; revision=24011
2010-10-01 02:38:03 +00:00
Russell O'Connor 41f2c2ed1f use sourceforge mirror for openjade.
svn path=/nixpkgs/trunk/; revision=24010
2010-10-01 02:29:45 +00:00
Michael Raskin cffebf17a2 Add Git version of mdbtools - UCS-2 capable
svn path=/nixpkgs/trunk/; revision=24007
2010-09-30 16:50:37 +00:00
Armijn Hemel fea2d56f09 update to 4.1, lzma support not yet added
svn path=/nixpkgs/trunk/; revision=23986
2010-09-28 16:40:34 +00:00
Evgeny Egorochkin a774549139 uni2ascii: packaged
Patch by Cillian de Róiste

svn path=/nixpkgs/trunk/; revision=23984
2010-09-28 09:48:15 +00:00
Lluís Batlle i Rossell 257f7bbb9a Updating the src url of offlineimap (to the only version there available)
svn path=/nixpkgs/trunk/; revision=23975
2010-09-27 21:01:16 +00:00
Yury G. Kudryashov c0a1d527d7 gnuplot-4.4.2, metadata
svn path=/nixpkgs/trunk/; revision=23972
2010-09-27 18:15:49 +00:00
Yury G. Kudryashov 08be43d6f0 homepages
svn path=/nixpkgs/trunk/; revision=23971
2010-09-27 18:15:33 +00:00
Yury G. Kudryashov fb6efd252a cabextract: upgrade, metadata
svn path=/nixpkgs/trunk/; revision=23964
2010-09-27 11:19:36 +00:00
Yury G. Kudryashov 732997b02e Metadata
svn path=/nixpkgs/trunk/; revision=23963
2010-09-27 11:19:31 +00:00
Yury G. Kudryashov 5213f959ad dcraw-9.04
svn path=/nixpkgs/trunk/; revision=23952
2010-09-26 19:40:00 +00:00
Yury G. Kudryashov cb623539b0 Add sg3_utils
svn path=/nixpkgs/trunk/; revision=23949
2010-09-26 19:39:42 +00:00
Yury G. Kudryashov 74abd6e9ad Add usbmuxd
svn path=/nixpkgs/trunk/; revision=23948
2010-09-26 19:39:35 +00:00
Evgeny Egorochkin 7a607648dc KBluetooth: packaged
svn path=/nixpkgs/trunk/; revision=23889
2010-09-22 00:41:31 +00:00
Michael Raskin f82a0576ea Add ttf2pt1-cl-pdf which produces unicode maps for fonts
svn path=/nixpkgs/trunk/; revision=23883
2010-09-21 14:35:07 +00:00
Ludovic Courtès 5395710d3e Lout: Update the homepage.
svn path=/nixpkgs/trunk/; revision=23882
2010-09-21 12:50:39 +00:00
Ludovic Courtès c47b09ee6e Lout 3.39.
svn path=/nixpkgs/trunk/; revision=23880
2010-09-21 12:31:06 +00:00
Michael Raskin 7538dcd322 Assert the need for glibc
svn path=/nixpkgs/trunk/; revision=23864
2010-09-19 18:32:25 +00:00
Michael Raskin 7d91a87817 Remove the temporary patch reference
svn path=/nixpkgs/trunk/; revision=23863
2010-09-19 18:22:52 +00:00
Lluís Batlle i Rossell c00b676654 Making the default vim have multibyte+nls support. Checking with 'du', I think
the results take almost the same amount of bytes, while we get support for utf8 terminals.

svn path=/nixpkgs/trunk/; revision=23859
2010-09-18 16:29:47 +00:00
Lluís Batlle i Rossell 2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Lluís Batlle i Rossell 83bfd42534 Fixing the mtdutils package (install to proper LSB like directories, and remove 'v' in front
of the version, which annoyed nix-env name matching)

svn path=/nixpkgs/trunk/; revision=23839
2010-09-17 18:57:38 +00:00
Lluís Batlle i Rossell cb8654eba6 Updating asciidoc (hoping it will run faster)
svn path=/nixpkgs/trunk/; revision=23835
2010-09-17 17:21:56 +00:00
Ludovic Courtès 2739c3aa1e Update Nix unstable.
svn path=/nixpkgs/trunk/; revision=23832
2010-09-17 15:56:15 +00:00
Lluís Batlle i Rossell 4163c5c98a Trying to fix the urls for xfsprogs
svn path=/nixpkgs/branches/stdenv-updates/; revision=23776
2010-09-14 08:40:05 +00:00
Yury G. Kudryashov 255acffe14 ebook-tools-0.2.0
svn path=/nixpkgs/trunk/; revision=23750
2010-09-13 14:22:37 +00:00
Eelco Dolstra 6021bcf0dc * Updated the GRUB 0.97 patchset from Gentoo to 1.10.
svn path=/nixpkgs/trunk/; revision=23715
2010-09-10 12:21:43 +00:00
Ludovic Courtès 582c02b1c0 GNU Parallel 20100906.
svn path=/nixpkgs/trunk/; revision=23714
2010-09-10 11:50:17 +00:00
Ludovic Courtès 9fd0fdebd9 GNU Mailutils 2.2.
svn path=/nixpkgs/trunk/; revision=23713
2010-09-10 11:50:11 +00:00
Lluís Batlle i Rossell 6fd70d9c47 Updating xfsprogs and making it build.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23704
2010-09-09 17:47:37 +00:00
Lluís Batlle i Rossell 1c35ff38d0 Making btrfsprogs build with glibc 2.12
svn path=/nixpkgs/branches/stdenv-updates/; revision=23701
2010-09-09 17:07:28 +00:00
Peter Simons 7b4678b6d8 pkgs/tools/misc/syslog-ng: updated to version 3.1.2
svn path=/nixpkgs/trunk/; revision=23686
2010-09-08 13:28:05 +00:00
Ludovic Courtès d460ffc554 uucp: Fetch from mirror://gnu; add `meta'.
svn path=/nixpkgs/trunk/; revision=23661
2010-09-07 08:02:36 +00:00
Lluís Batlle i Rossell 7e27052bd6 Applying the patch adding 'detox' from Tom Ridge and Karn Kallio.
svn path=/nixpkgs/trunk/; revision=23655
2010-09-06 07:21:08 +00:00
Ludovic Courtès db61930195 GNU ddrescue 1.13.
svn path=/nixpkgs/trunk/; revision=23648
2010-09-05 15:19:12 +00:00
Ludovic Courtès 95486795ad GNU Parallel 20100822.
svn path=/nixpkgs/trunk/; revision=23646
2010-09-05 15:19:02 +00:00
Ludovic Courtès c23a9903fe GNU Sharutils 4.10.
svn path=/nixpkgs/trunk/; revision=23645
2010-09-05 15:18:57 +00:00
Ludovic Courtès 2878beff40 Minicom 2.4.
svn path=/nixpkgs/trunk/; revision=23634
2010-09-03 20:52:32 +00:00
Eelco Dolstra 1d236b4dcc svn path=/nixpkgs/trunk/; revision=23562 2010-08-31 13:18:12 +00:00
Eelco Dolstra 43ac966abb * lsof 4.84, psmisc 22.12.
svn path=/nixpkgs/trunk/; revision=23537
2010-08-29 23:22:26 +00:00
Eelco Dolstra 73eb2ce265 svn path=/nixpkgs/trunk/; revision=23535 2010-08-29 22:45:14 +00:00
Yury G. Kudryashov aaeac7d5d7 Upgrade to system-config-printer-1.2.4
TODO: make it work with udev (add helpers to udev PATH etc.)

svn path=/nixpkgs/trunk/; revision=23520
2010-08-29 19:37:02 +00:00
Lluís Batlle i Rossell cca1cae042 Updating from trunk. I had to do some changes to make it fit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Lluís Batlle i Rossell ffef67e28f Updating nixSqlite, so I can get the latest build_remote.pl hook
svn path=/nixpkgs/branches/stdenv-updates/; revision=23493
2010-08-29 09:59:08 +00:00
Eelco Dolstra 1417d5f300 * Updated the Sqlite Nix.
svn path=/nixpkgs/trunk/; revision=23475
2010-08-27 08:43:51 +00:00
Eelco Dolstra 6e0911c3cb * Doh.
svn path=/nixpkgs/trunk/; revision=23463
2010-08-26 13:18:47 +00:00
Eelco Dolstra fee41ba2fb * Make sitecopy build against Neon 0.29.
svn path=/nixpkgs/trunk/; revision=23461
2010-08-26 13:09:52 +00:00
Peter Simons 0b8f30aa8f pkgs/tools/admin/tightvnc/builder.sh: drop trailing whitespace
svn path=/nixpkgs/trunk/; revision=23439
2010-08-26 09:42:05 +00:00
Peter Simons 7b9b8f9e2e pkgs/tools/admin/tightvnc/default.nix: added meta section (plus various cosmetic changes)
svn path=/nixpkgs/trunk/; revision=23438
2010-08-26 09:41:22 +00:00
Peter Simons d343d907a9 pkgs/tools/admin/tightvnc/builder.sh: install java classes to $out/share/tightvnc rather than $out/vnc
svn path=/nixpkgs/trunk/; revision=23437
2010-08-26 09:39:32 +00:00
Michael Raskin 05c7e81eaa Move E prover to applications/science/logic
svn path=/nixpkgs/trunk/; revision=23434
2010-08-25 22:38:11 +00:00
Michael Raskin 091be03f65 Update E prover
svn path=/nixpkgs/trunk/; revision=23433
2010-08-25 22:23:55 +00:00
Eelco Dolstra 412bd09ec1 * OpenSSH 5.6.
svn path=/nixpkgs/trunk/; revision=23432
2010-08-25 21:12:36 +00:00
Yury G. Kudryashov 608cde4f82 Explicit pkgs.prefix
svn path=/nixpkgs/trunk/; revision=23329
2010-08-21 19:27:31 +00:00
Lluís Batlle i Rossell 49893ec540 Allowing cross-build of groff
svn path=/nixpkgs/branches/stdenv-updates/; revision=23314
2010-08-21 16:54:24 +00:00
Lluís Batlle i Rossell 02bd68fa15 Removing a gzip patch we had, as it looks like being in the new upstream release.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23307
2010-08-21 15:36:48 +00:00
Lluís Batlle i Rossell 221317ae7b Setting new bootstrap-tools for x86_64.
Allowing 'curl' build without some dependencies, if it is told not to build
with them.

Updating the make-bootstrap-tools for the latest gcc/glibc, removing the
dependency on klibc, and updating unpack-boostrap-tools for the latest
boostrap-tools to work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=23305
2010-08-21 12:50:49 +00:00
Michael Raskin 7dd07e5476 Call cleaner from the installation directory
svn path=/nixpkgs/trunk/; revision=23300
2010-08-21 07:28:47 +00:00
Michael Raskin b147842dce Add nilfs-utils
svn path=/nixpkgs/trunk/; revision=23296
2010-08-20 21:53:43 +00:00
Ludovic Courtès 14e86a9812 GNU gawk 3.1.8.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23280
2010-08-20 15:26:36 +00:00
Ludovic Courtès 96da0397a9 GNU Coreutils 8.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23279
2010-08-20 15:26:31 +00:00
Ludovic Courtès e0fa7776d3 GNU gzip 1.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23278
2010-08-20 15:26:26 +00:00
Lluís Batlle i Rossell f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Eelco Dolstra 3be78e74fb * Added xmlstarlet.
svn path=/nixpkgs/trunk/; revision=23271
2010-08-20 10:07:35 +00:00
Eelco Dolstra 7120017365 * Add meta info to xpf.
svn path=/nixpkgs/trunk/; revision=23269
2010-08-20 09:18:53 +00:00
Ludovic Courtès 1b56623a8a GnuPG 2.0.16.
svn path=/nixpkgs/trunk/; revision=23259
2010-08-19 16:57:09 +00:00
Ludovic Courtès 82968aa583 GNU Parallel 20100722.
svn path=/nixpkgs/trunk/; revision=23258
2010-08-19 16:56:41 +00:00
Eelco Dolstra 1ac9dcd24d * Fix eval-release.nix by testing whether all attributes of a
derivation evaluate inside the tryEval.  This catches cases such as
  aufs2-util, which fails due to an assertion in its dependency aufs2.
* Explicitly blacklist "xbursttools" because it gives some
  evaluation error in cross-OpenSSL.  No idea why, probably due to
  some pass-through attribute.

svn path=/nixpkgs/trunk/; revision=23247
2010-08-19 12:37:10 +00:00
Eelco Dolstra f5f32a5b4b * Nix 0.16.
svn path=/nixpkgs/trunk/; revision=23208
2010-08-17 15:21:42 +00:00
Yury G. Kudryashov f9a218b691 Add ebook-tools-0.1.1
svn path=/nixpkgs/trunk/; revision=23189
2010-08-16 12:40:03 +00:00
Eelco Dolstra 0c9a370aa0 * Updated desktop-file-utils to 0.16.
svn path=/nixpkgs/trunk/; revision=23182
2010-08-16 07:45:39 +00:00
Peter Simons 9be0b9fea6 Update version of ncftp.
The old version 3.2.3 seems to have disappeared from the hosting server.

svn path=/nixpkgs/trunk/; revision=23153
2010-08-12 14:57:15 +00:00
David Guibert 284217c135 update ttf-mkfontdir
svn path=/nixpkgs/trunk/; revision=23134
2010-08-12 05:59:52 +00:00
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