Commit graph

4236 commits

Author SHA1 Message Date
Yury G. Kudryashov fd7bcca52e all-packages: remove trailing spaces
svn path=/nixpkgs/trunk/; revision=22907
2010-08-02 21:40:34 +00:00
Eelco Dolstra 7e453a7491 * Fix breakage in r22897.
svn path=/nixpkgs/trunk/; revision=22901
2010-08-02 17:59:19 +00:00
Yury G. Kudryashov dea41a12ea Add rsibreak
svn path=/nixpkgs/trunk/; revision=22897
2010-08-02 17:19:44 +00:00
Yury G. Kudryashov 695b150844 Add polkit-qt-1, strigi, kdelibs-4.4.92
svn path=/nixpkgs/trunk/; revision=22890
2010-08-02 17:12:39 +00:00
Yury G. Kudryashov 915edddc5b Add parts of kdesupport for kde-4.5
svn path=/nixpkgs/trunk/; revision=22889
2010-08-02 17:11:19 +00:00
Eelco Dolstra d17f0f9cbc * Use callPackage for most packages in all-packages.nix.
`callPackage' was described here:

    http://www.mail-archive.com/nix-dev@cs.uu.nl/msg02624.html

  It allows all-packages.nix to be shortened significantly (from 10152
  to 6980 lines) by automatically filling in package functions'
  required arguments from `pkgs'.  That is, a function

    { stdenv, fetchurl, libfoo, libbar }: ...

  can now be called as

    callPackage ./<bla>.nix { };

  rather than

    import ./<bla>.nix {
      inherit stdenv fetchurl libfoo libbar;
    };

  This reduces boring typing work when adding a dependency and reduces
  the number of trivial commits to all-packages.nix.

  Overrides or arguments that don't exist in `pkgs' can be passed
  explicitly, e.g.,

    callPackage ./<bla>.nix {
      libfoo = libfoo_1_2_3;
    };

  The conversion was done automatically with a magic Perl regexp.  I
  checked that `nix-env' produces the same results before and after
  (except for three packages that depend on webkit, which uses
  deepOverride).

  `callPackage' applies `makeOverridable' automatically, so almost
  every package now exports an `override' function.

  There are two downsides to using callPackage:

  - Evaluation is a bit slower (about 15% on `nix-env -qa --drv-path
    \*').

  - There can be unexpected results for functions that have default
    argument values.  For instance, a function

      { libfoo ? null }: ...

    called using `callPackage' will be passed a `libfoo' argument
    provided that `pkgs.libfoo' exists.  If this is used to control
    whether a package has to have a certain dependency, you need to
    explicitly write:

    callPackage ./<bla>.nix {
      libfoo = null;
    };

svn path=/nixpkgs/trunk/; revision=22885
2010-08-02 16:26:58 +00:00
Lluís Batlle i Rossell 905963782b Fixing some stdenv2 details coming from the trunk merge.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22881
2010-08-02 16:09:20 +00:00
Eelco Dolstra cc84ac9e84 svn path=/nixpkgs/trunk/; revision=22880 2010-08-02 16:01:55 +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
Eelco Dolstra fd268b4852 * Add callPackage etc.
svn path=/nixpkgs/trunk/; revision=22876
2010-08-02 13:57:57 +00:00
Rob Vermaas 70c6ab18a3 added qrupdate, suitesparse needed to build octave from source
svn path=/nixpkgs/trunk/; revision=22867
2010-08-02 11:20:39 +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 edd061b295 Making uclibc receive the proper arguments (libiconv)
svn path=/nixpkgs/branches/stdenv-updates/; revision=22850
2010-08-01 21:24:35 +00:00
Lluís Batlle i Rossell da3ba13fb5 Trying to make gcc 4.5 cross-buildable
svn path=/nixpkgs/branches/stdenv-updates/; revision=22848
2010-08-01 21:21:26 +00:00
Lluís Batlle i Rossell 212161482f Setting the proper kernel headers in platforms
svn path=/nixpkgs/branches/stdenv-updates/; revision=22845
2010-08-01 21:05:32 +00:00
Lluís Batlle i Rossell 5cc46602ce Updating gettext to that decided in nixpkgs trunk (0.17 to 0.18)
svn path=/nixpkgs/branches/stdenv-updates/; revision=22842
2010-08-01 21:01:54 +00:00
Lluís Batlle i Rossell 8c0e984f91 The gettext update 0.18 yes builds on mips.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22841
2010-08-01 21:00:22 +00:00
Lluís Batlle i Rossell 937578d5ef Some first changes to get some evaluation working on the fuloong2f
svn path=/nixpkgs/branches/stdenv-updates/; revision=22840
2010-08-01 20:57:13 +00:00
Eelco Dolstra 283005d568 * GemRB updated to 0.6.1.
svn path=/nixpkgs/trunk/; revision=22837
2010-08-01 14:24:46 +00:00
Yury G. Kudryashov 3cae107cca Fix nixpkgs evaluation
I've removed rekonqScm but forgotten to remove it from all-packages

svn path=/nixpkgs/trunk/; revision=22836
2010-07-31 18:47:15 +00:00
Yury G. Kudryashov 45fd5a9836 Upgrade rekonq
svn path=/nixpkgs/trunk/; revision=22835
2010-07-31 13:06:10 +00:00
Yury G. Kudryashov 288c414bb4 pulseaudio: udev and bluez support
svn path=/nixpkgs/trunk/; revision=22834
2010-07-31 13:05:58 +00:00
Yury G. Kudryashov 65f0b956a2 Add libsndfile and fftw support to libsamplerate
svn path=/nixpkgs/trunk/; revision=22831
2010-07-30 20:17:37 +00:00
Yury G. Kudryashov 2835a98378 Add qt-4.7.0-beta2
svn path=/nixpkgs/trunk/; revision=22830
2010-07-30 19:45:07 +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 ef0ff49ad4 svn path=/nixpkgs/trunk/; revision=22826 2010-07-30 13:05:52 +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 35b4ccadba svn path=/nixpkgs/trunk/; revision=22824 2010-07-30 12:24:19 +00:00
Eelco Dolstra ee4fe6ea84 * Drop pkgsOverriden.
svn path=/nixpkgs/trunk/; revision=22823
2010-07-30 12:10:24 +00:00
Eelco Dolstra 3386a0e63d svn path=/nixpkgs/trunk/; revision=22822 2010-07-30 10:48:13 +00:00
Eelco Dolstra acd34843f0 * Move "checker" to lib. It seems to be unused though.
svn path=/nixpkgs/trunk/; revision=22819
2010-07-30 09:24:55 +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
Lluís Batlle i Rossell 2423a7c821 Enabling the build of uclibc (I don't know why it was commented)
svn path=/nixpkgs/trunk/; revision=22816
2010-07-29 23:18:49 +00:00
Eelco Dolstra 20db67154c * bclr: shrink fixes.patch from 3.6 MB (!) to 11 KB by not
including Autoconf/Automake generated code.

svn path=/nixpkgs/trunk/; revision=22815
2010-07-29 19:56:16 +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
Lluís Batlle i Rossell 79dec6e9a7 Adding Vigra
svn path=/nixpkgs/trunk/; revision=22809
2010-07-29 14:38:39 +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
Eelco Dolstra b1afe4e7ac * Finish renaming.
svn path=/nixpkgs/trunk/; revision=22801
2010-07-29 07:02:26 +00:00
Eelco Dolstra 5b2dcdd24d * Remove the old PHP.
svn path=/nixpkgs/trunk/; revision=22800
2010-07-29 07:00:00 +00:00
Eelco Dolstra f1598a8941 * More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
2010-07-28 18:01:17 +00:00
Eelco Dolstra d67aefc19d * Remove `customKernel' which is obsolete as far as I can tell.
* Remove `sumTwoArgs' since it has no remaining callers.

svn path=/nixpkgs/trunk/; revision=22797
2010-07-28 16:09:13 +00:00
Eelco Dolstra fa314f0724 * Remove KVM (obsolete -> qemu-kvm).
svn path=/nixpkgs/trunk/; revision=22796
2010-07-28 15:39:39 +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
Peter Simons 38bda8a8bf pkgs/top-level/python-packages.nix: added python-mock-0.6.0
This version seems to be an unofficial release from tahoe-lafs.org based
on the mock-0.1.0 release from python-mock.sourceforge.net. It should
probably replace the old version we have in here.

svn path=/nixpkgs/trunk/; revision=22791
2010-07-28 13:09:04 +00:00
Peter Simons 4630c1854d pycryptopp: base python wrapper on the Nix store version of libcrypto++
rather than the version that's included in the distribution archive

svn path=/nixpkgs/trunk/; revision=22788
2010-07-28 13:07:05 +00:00
Peter Simons df013849e4 python-numpy: improved support for BLAS and LAPACK via gfortran
svn path=/nixpkgs/trunk/; revision=22787
2010-07-28 13:05:35 +00:00
Peter Simons b89f310c7a pkgs/development/libraries/crypto++: fixed build impurity
* Don't build with "-march=native", because the generated binaries
   won't work reliably on systems with a different CPU. Instead,
   "--march=i686" is used on x86, and "--march=nocona" an x86_64.
   Otherwise, "--march" remains unset.

 * Compile with -O3 instead of -O2. This code is performance-critical.

 * Don't build with '-g'.

svn path=/nixpkgs/trunk/; revision=22785
2010-07-28 13:03:11 +00:00
Eelco Dolstra d81ed8201f * Turn vim/default.nix into a regular package. We don't need two
configurable VIMs.

svn path=/nixpkgs/trunk/; revision=22784
2010-07-28 12:52:54 +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
Peter Simons ea3ce74312 python-setuptools-darcs: the build process seems to depend on 'darcsver'
| source root is setuptools_darcs-1.2.9
 | patching sources
 | configuring
 | no configure script, doing nothing
 | building
 | running tests
 | Download error: [Errno -3] Temporary failure in name resolution -- Some packages may not be found!
 | Couldn't find index page for 'darcsver' (maybe misspelled?)
 | Download error: [Errno -3] Temporary failure in name resolution -- Some packages may not be found!
 | No local packages or download links found for darcsver>=1.2.0
 | Traceback (most recent call last):
 |   File "setup.py", line 79, in <module>
 |     zip_safe=False, # I prefer unzipped for easier access.
 |   File "/nix/store/r6xlmlf0amzwhkvkv0v656jgx7r299g7-python-2.6.5/lib/python2.6/distutils/core.py", line 113, in setup
 |     _setup_distribution = dist = klass(attrs)
 |   File "build/bdist.linux-x86_64/egg/setuptools/dist.py", line 260, in __init__
 |   File "build/bdist.linux-x86_64/egg/setuptools/dist.py", line 284, in fetch_build_eggs
 |   File "build/bdist.linux-x86_64/egg/pkg_resources.py", line 563, in resolve
 |   File "build/bdist.linux-x86_64/egg/pkg_resources.py", line 799, in best_match
 |   File "build/bdist.linux-x86_64/egg/pkg_resources.py", line 811, in obtain
 |   File "build/bdist.linux-x86_64/egg/setuptools/dist.py", line 327, in fetch_build_egg
 |   File "build/bdist.linux-x86_64/egg/setuptools/command/easy_install.py", line 434, in easy_install
 |   File "build/bdist.linux-x86_64/egg/setuptools/package_index.py", line 475, in fetch_distribution
 | AttributeError: 'NoneType' object has no attribute 'clone'
 | builder for `/nix/store/rkm5fzs0p6hh45mvpzv0qqphmsjnyag8-python-setuptools-darcs-1.2.9.drv' failed with exit code 1
 | error: build of `/nix/store/rkm5fzs0p6hh45mvpzv0qqphmsjnyag8-python-setuptools-darcs-1.2.9.drv' failed

svn path=/nixpkgs/trunk/; revision=22780
2010-07-28 09:33:35 +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
Peter Simons 3819998730 pycryptopp: updated to version 0.5.19
svn path=/nixpkgs/trunk/; revision=22772
2010-07-27 23:52:08 +00:00
Peter Simons ceb01a86ea python-nevow: updated to version 0.10.0
svn path=/nixpkgs/trunk/; revision=22771
2010-07-27 23:52:02 +00:00
Peter Simons d1b181e8bb python-foolscap: updated to version 0.5.1
svn path=/nixpkgs/trunk/; revision=22770
2010-07-27 23:51:56 +00:00
Peter Simons 07a0bf9be0 python-darcsver: updated to version 1.5.1
svn path=/nixpkgs/trunk/; revision=22769
2010-07-27 23:51:48 +00:00
Peter Simons 3a98d25dfd python-argparse: updated to version 1.1
svn path=/nixpkgs/trunk/; revision=22768
2010-07-27 23:51:42 +00:00
Peter Simons 810814b85a pyutil: updated to version 1.7.9 (and disabled test suite)
When the regression test suite is run, it tries to compile some plug-in
code into Twisted's store path, and fails. I'm not sure how to remedy
this problem.

svn path=/nixpkgs/trunk/; revision=22767
2010-07-27 23:51:36 +00:00
Peter Simons b3124aa13a python-zfec: updated to version 1.4.7
svn path=/nixpkgs/trunk/; revision=22766
2010-07-27 23:51:29 +00:00
Peter Simons 62ac430904 python-simplejson: updated to version 2.1.1
svn path=/nixpkgs/trunk/; revision=22765
2010-07-27 23:51:22 +00:00
Peter Simons 67b620b66f python-setuptools-trial: updated to version 0.5.9
svn path=/nixpkgs/trunk/; revision=22764
2010-07-27 23:51:16 +00:00
Peter Simons 3c5b7b846e python-setuptools-darcs: updated to version 1.2.9
svn path=/nixpkgs/trunk/; revision=22763
2010-07-27 23:51:10 +00:00
Peter Simons df093a358f python-twisted: updated to 10.1.0
svn path=/nixpkgs/trunk/; revision=22762
2010-07-27 23:51:04 +00:00
Peter Simons 9a72349f84 python-zope-interface: updated to version 3.6.1
svn path=/nixpkgs/trunk/; revision=22761
2010-07-27 23:50:57 +00:00
Peter Simons 84323ac979 pycryptopp: use the embedded crypto++ library when compiling this module
crypto++ has an impurity that leads to test suite failures in this
module, i.e. in sha256. When that impurity has been fixed, we should try
building on top of the the pristine crypto++ library again.

svn path=/nixpkgs/trunk/; revision=22760
2010-07-27 23:50:51 +00:00
Peter Simons 81a2c9d395 python-numpy: add buildInput gfortran to enable support for blas and lapack
svn path=/nixpkgs/trunk/; revision=22759
2010-07-27 23:50:45 +00:00
Peter Simons fb1142ee5c pkgs/top-level/all-packages.nix: crypto++-5.6.0 is compiled with "-O2 -march=native -mtune=native"
Ought to be fixed ASAP. I'll probably do it tomorrow.

svn path=/nixpkgs/trunk/; revision=22758
2010-07-27 23:50:35 +00:00
Eelco Dolstra 159d141fb8 * Make Thunderbird 3.x the default.
svn path=/nixpkgs/trunk/; revision=22749
2010-07-27 11:46:03 +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
Peter Simons 2e15430e47 pkgs/top-level/all-packages.nix: stripped trailing whitespace
svn path=/nixpkgs/trunk/; revision=22734
2010-07-26 13:41:09 +00:00
Peter Simons d137679f20 pkgs/applications/editors/emacs-modes/rudel: added rudel 0.2-4
A collaborative editing environment for GNU Emacs.

svn path=/nixpkgs/trunk/; revision=22733
2010-07-26 13:41:03 +00:00
Ludovic Courtès c0cafc5ec7 GNU IceCat 3.6.7.
svn path=/nixpkgs/trunk/; revision=22732
2010-07-25 14:16:09 +00:00
Eelco Dolstra 3f287cfb1d * Ensure that the dell-bluetooth device does not stay in the "hard
blocked" state.

svn path=/nixpkgs/branches/x-updates/; revision=22730
2010-07-25 12:15:59 +00:00
Eelco Dolstra 07afe31016 * Doh, we already had OpenSSL 1.0.0. Use the updated Darwin patch.
svn path=/nixpkgs/branches/x-updates/; revision=22722
2010-07-23 15:05:20 +00:00
Andres Löh 5503148e05 Minor fix for release.nix.
svn path=/nixpkgs/trunk/; revision=22716
2010-07-22 18:55:32 +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
Andres Löh 6c90771ac6 * Updated darcs to 2.4.4.
* Added Haskell Platform 2010.2.0.0.
* Added cairo package in preparation for adding a new gtk2hs.

svn path=/nixpkgs/trunk/; revision=22714
2010-07-22 18:04:39 +00:00
Eelco Dolstra 0db478d40b * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=22707
2010-07-22 13:18:07 +00:00
Eelco Dolstra fc47f20db1 * Try to build OpenOffice and Go-oo with Neon 0.29, since 0.26 doesn't
work anymore.

svn path=/nixpkgs/branches/x-updates/; revision=22702
2010-07-22 10:41:34 +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
Ludovic Courtès 35cbabdab4 ViTE from SVN.
svn path=/nixpkgs/trunk/; revision=22696
2010-07-22 09:01:42 +00:00
Ludovic Courtès 3c482c79d6 GNU Dico 2.1.
svn path=/nixpkgs/trunk/; revision=22695
2010-07-22 09:01:20 +00:00
Ludovic Courtès c4d05c0e3e Give Org-Mode a high priority.
svn path=/nixpkgs/trunk/; revision=22694
2010-07-22 08:59:46 +00:00
Ludovic Courtès f497701642 Add upstream Org-Mode.
svn path=/nixpkgs/trunk/; revision=22693
2010-07-22 08:59:12 +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
Andres Löh df9f4a8696 Added a couple of web-programming-related Haskell packages.
svn path=/nixpkgs/trunk/; revision=22683
2010-07-21 09:41:12 +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 9909fdbbd6 * Fix evaluation problems.
svn path=/nixpkgs/branches/x-updates/; revision=22668
2010-07-19 22:24:26 +00:00
Eelco Dolstra b8928b09fd * Okay, make zlib a propagated build input of glib.
svn path=/nixpkgs/branches/x-updates/; revision=22666
2010-07-19 11:43:45 +00:00
Eelco Dolstra b080c11720 * eggdbus now needs zlib because it uses glib's Requires.private.
Maybe zlib should be a propagatedBuildInput in glib, not sure.

svn path=/nixpkgs/branches/x-updates/; revision=22662
2010-07-19 10:32:31 +00:00
Eelco Dolstra 030981c1e7 * nbd requires a static glib. Since it's the only package that does
so, don't build the default glib statically but pass a custom glib
  to nbd.

svn path=/nixpkgs/branches/x-updates/; revision=22658
2010-07-19 08:44:32 +00:00
Eelco Dolstra fa38234d64 * Make Firefox 3.6 the default.
svn path=/nixpkgs/branches/x-updates/; revision=22653
2010-07-18 23:23:16 +00:00
Eelco Dolstra 0695a9707c * GTK+ 2.20, Glib 2.24 etc.
svn path=/nixpkgs/branches/x-updates/; revision=22652
2010-07-18 23:22:59 +00:00
Ludovic Courtès 3aee92f068 Geeqie: Use libchamplain.
svn path=/nixpkgs/trunk/; revision=22650
2010-07-18 22:47:23 +00:00
Ludovic Courtès cd06afd761 Add libchamplain, a library to display maps.
svn path=/nixpkgs/trunk/; revision=22649
2010-07-18 22:46:19 +00:00
Ludovic Courtès cbd5317e82 Add Clutter{,-GTK}, a library for fancy GUIs.
svn path=/nixpkgs/trunk/; revision=22648
2010-07-18 22:45:03 +00:00
Eelco Dolstra 3d442ad185 * Apply a patch that is apparently required to make the kernel work
properly on Amazon EC2.
* Always apply the CIFS timeout patch.  It's rather annoying to have
  to build a separate kernel for the VM tests.

svn path=/nixpkgs/trunk/; revision=22630
2010-07-18 21:10:46 +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