Commit graph

11347 commits

Author SHA1 Message Date
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
Sander van der Burg
beee6e5e1d Moved 'zip' function from nixos/lib/build-vms.nix
svn path=/nixpkgs/trunk/; revision=22882
2010-08-02 16:10:01 +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
955b962993 Updating gcc to 4.5.1.
I removed two patches that don't apply anymore (dragonegg, softfp-hurd).
I hope this means it's all fixed upstream.

svn path=/nixpkgs/branches/stdenv-updates/; revision=22879
2010-08-02 15:58:03 +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
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
c8d53236b1 svn path=/nixpkgs/trunk/; revision=22874 2010-08-02 12:55:54 +00:00
Rob Vermaas
13cf7b0ade svn path=/nixpkgs/trunk/; revision=22872 2010-08-02 12:13:03 +00:00
Michael Raskin
76cef7e1b2 Set HOME for SBCL tests
svn path=/nixpkgs/trunk/; revision=22870
2010-08-02 11:37:23 +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
Michael Raskin
21580dc847 Update Wine
svn path=/nixpkgs/trunk/; revision=22866
2010-08-02 10:02:23 +00:00
Michael Raskin
5892d8ffc7 Update sbcl
svn path=/nixpkgs/trunk/; revision=22865
2010-08-02 09:57:12 +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
9724fb271b Fixing the unpack bootstrap tools script so it works not only for mips.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22855
2010-08-01 22:00:14 +00:00
Lluís Batlle i Rossell
0f4673788e Fixing the gcc-4.5 cross-build (the native strip destroys the .a cross-built
archives, so we disable it cross building)

svn path=/nixpkgs/branches/stdenv-updates/; revision=22854
2010-08-01 21:27:03 +00:00
Lluís Batlle i Rossell
4b79027f45 Updating the patchelf0.6 reference, so it gets the changes to work in mips
(16KiB pages)

svn path=/nixpkgs/branches/stdenv-updates/; revision=22853
2010-08-01 21:26:10 +00:00
Lluís Batlle i Rossell
908c67b7ee Fixing a bit the busybox expression and its new flexible config
svn path=/nixpkgs/branches/stdenv-updates/; revision=22852
2010-08-01 21:25:37 +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
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
40405d03ac Trying to add the fuloong2f for bootstrap-files. It bootstraps fine
(boostrap-files cross-built)

svn path=/nixpkgs/branches/stdenv-updates/; revision=22849
2010-08-01 21:22:51 +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
2954596106 Making gnugrep cross-build for mips
svn path=/nixpkgs/branches/stdenv-updates/; revision=22847
2010-08-01 21:17:29 +00:00
Lluís Batlle i Rossell
fbad1b3a56 Trying to make busybox more configurable
svn path=/nixpkgs/branches/stdenv-updates/; revision=22846
2010-08-01 21:06:45 +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
878792cade Patch (already upstream on glibc master) for configure in glibc to get the gnu89-inline gcc flag right
svn path=/nixpkgs/branches/stdenv-updates/; revision=22844
2010-08-01 21:03:53 +00:00
Lluís Batlle i Rossell
eb7ad28899 Patches for mpfr to work on mips with gcc newer or equal to 4.4
svn path=/nixpkgs/branches/stdenv-updates/; revision=22843
2010-08-01 21:02:30 +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
00c972ac7d svn path=/nixpkgs/trunk/; revision=22839 2010-08-01 15:14:33 +00:00
Eelco Dolstra
f1b8c40eb4 * Updated libogg and libvorbis.
svn path=/nixpkgs/trunk/; revision=22838
2010-08-01 14:33:43 +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
59a8bc0744 qt-4.7.0-beta2: fool phonon version
Qt guys updated source files but not version number

svn path=/nixpkgs/trunk/; revision=22833
2010-07-31 13:05:46 +00:00
Yury G. Kudryashov
d15fdc71f0 trailing spaces
svn path=/nixpkgs/trunk/; revision=22832
2010-07-31 13:05:22 +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
Lluís Batlle i Rossell
8eceafc755 Fixing the name of 'confuse'; now it includes the version.
svn path=/nixpkgs/trunk/; revision=22829
2010-07-30 17:42:52 +00:00
Eelco Dolstra
4bf5b0d36b * Fix some more "args: with args".
svn path=/nixpkgs/trunk/; revision=22828
2010-07-30 14:47:23 +00:00
Marco Maggesi
7835419d8a Upgrade fossil to version 2010-07-03
svn path=/nixpkgs/trunk/; revision=22827
2010-07-30 14:03:51 +00:00
Eelco Dolstra
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