Michael Raskin
50f2d32ce9
Use updated QCA2 for psi
...
svn path=/nixpkgs/trunk/; revision=22914
2010-08-03 07:39:56 +00:00
Michael Raskin
a7adc46a3b
Update parts of QCA to build with fresher OpenSSL
...
svn path=/nixpkgs/trunk/; revision=22913
2010-08-03 07:35:29 +00:00
Lluís Batlle i Rossell
de5e1de89b
Fixing the dynamic linker in the gcc-cross-wrapper so it takes also the dynamic
...
linker of glibc on mips (specifically ld.so.1, and not ld-*.so.? as we had before)
svn path=/nixpkgs/trunk/; revision=22912
2010-08-02 22:44:41 +00:00
Lluís Batlle i Rossell
4b42d5f7a9
Fixing the openssl 1.0.0 cross build
...
svn path=/nixpkgs/trunk/; revision=22910
2010-08-02 22:10:42 +00:00
Yury G. Kudryashov
aadea685af
Restrict qt-4.7 to linux only
...
svn path=/nixpkgs/trunk/; revision=22909
2010-08-02 21:47:28 +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
Michael Raskin
ef3606a0ae
Update XNeur to 0.9.9
...
svn path=/nixpkgs/trunk/; revision=22906
2010-08-02 19:28:15 +00:00
Michael Raskin
fb10fb0d19
Fix sed commands for xneur 0.8 build
...
svn path=/nixpkgs/trunk/; revision=22905
2010-08-02 19:24:59 +00:00
Lluís Batlle i Rossell
02bf0db39e
Making the X keyboard settings go in xorg.conf, and not in HAL anymore.
...
Setting to the synaptics default speeds the speeds I like. I think we were having
defaults still from the time the values meant some different speeds.
The 'synclient' program now does not work, but the 'xinput' program (xorg.xinput)
can modify in runtime the touchpad settings too.
svn path=/nixos/trunk/; revision=22904
2010-08-02 19:06:42 +00:00
Michael Raskin
0dfe4c37ed
Fix SBCL build
...
svn path=/nixpkgs/trunk/; revision=22903
2010-08-02 19:02:47 +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
a162c597e1
akonadi-1.4.0
...
svn path=/nixpkgs/trunk/; revision=22898
2010-08-02 17:20:40 +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
230c31d020
Really make qt-4.7
...
svn path=/nixpkgs/trunk/; revision=22896
2010-08-02 17:18:56 +00:00
Yury G. Kudryashov
2d998d8fc3
Add kdebindings-4.4.95
...
svn path=/nixpkgs/trunk/; revision=22895
2010-08-02 17:18:23 +00:00
Yury G. Kudryashov
c21bd4a0c6
Add kdepimlibs
...
svn path=/nixpkgs/trunk/; revision=22894
2010-08-02 17:17:41 +00:00
Yury G. Kudryashov
1e095067cc
kdelibs-4.4.95: fix python install dir
...
svn path=/nixpkgs/trunk/; revision=22893
2010-08-02 17:17:06 +00:00
Yury G. Kudryashov
ea891200d8
kde-4.5 snapshot
...
svn path=/nixpkgs/trunk/; revision=22892
2010-08-02 17:16:24 +00:00
Yury G. Kudryashov
5245e8f885
small fixes, kdepimlibs, oxygen-icons
...
svn path=/nixpkgs/trunk/; revision=22891
2010-08-02 17:14:59 +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
Sander van der Burg
21eb6ed412
Renamed lib.zip into lib.zipTwoLists, since it refers to the wrong function
...
svn path=/nixos/trunk/; revision=22888
2010-08-02 16:51:33 +00:00
Sander van der Burg
1e9dc2b254
It seems that lib.zip is already taken from attributesets, therefore renaming it to zipTwoLists
...
svn path=/nixpkgs/trunk/; revision=22887
2010-08-02 16:48: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
Sander van der Burg
58204f0a8a
Changed zip into lib.zip. Sorry :$
...
svn path=/nixos/trunk/; revision=22884
2010-08-02 16:24:24 +00:00
Sander van der Burg
388c8e0c60
Removed the zip function, since it is in pkgs.lib now
...
svn path=/nixos/trunk/; revision=22883
2010-08-02 16:11:44 +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