Commit graph

4189 commits

Author SHA1 Message Date
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
Michael Raskin 50f2d32ce9 Use updated QCA2 for psi
svn path=/nixpkgs/trunk/; revision=22914
2010-08-03 07:39:56 +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
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