Commit graph

953 commits

Author SHA1 Message Date
Lluís Batlle i Rossell
9ef11e4c4d Made the linux kernel expressions support 'platform' again (thinking on reusing
most of the kernel expressions for the sheevaplug).
I still have not added anything in the kernels about cross compilation.
I moved the platform definitions out of all-packages.
I have not written good platform definitions for the sheevaplug - only for the
PC.
Only the linux-2.6.32 expression uses the platforms kernelConfig.
The linux-2.6.31 was broken, and I left it broken.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19046
2009-12-19 12:12:24 +00:00
Lluís Batlle i Rossell
5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Eelco Dolstra
c122c7a5ba * Hm, I thought I tested this...
svn path=/nixpkgs/trunk/; revision=19032
2009-12-18 12:23:13 +00:00
Lluís Batlle i Rossell
3e1a06bae1 Updating the nvidia drivers to the latest version.
I added 'perl' as their buildInputs to get them built.
I don't know if it is something new from nvidia, but I imagine it may be
introduced in 2.6.31, for any module building.

svn path=/nixpkgs/trunk/; revision=19029
2009-12-18 11:36:36 +00:00
Eelco Dolstra
fb6d227127 * Merged the kernel-config branch.
svn path=/nixpkgs/trunk/; revision=19022
2009-12-18 10:04:23 +00:00
Lluís Batlle i Rossell
28eef7beaa Updating wpa_supplicant, and enabling its possible syslog output.
svn path=/nixpkgs/trunk/; revision=19001
2009-12-16 19:45:00 +00:00
Eelco Dolstra
cfd6dd29fe * Linux 2.6.32.1.
svn path=/nixpkgs/branches/kernel-config/; revision=19000
2009-12-16 19:22:42 +00:00
Marc Weber
0888bf7107 remove mapRecordFlatten & fix source autofs
svn path=/nixpkgs/trunk/; revision=18987
2009-12-16 05:52:36 +00:00
Eelco Dolstra
f833d465e6 * Enable Kernel Samepage Merging.
svn path=/nixpkgs/branches/kernel-config/; revision=18949
2009-12-14 19:30:25 +00:00
Eelco Dolstra
2e5908b1df * Use the kernel config generator for Linux 2.6.25.
svn path=/nixpkgs/branches/kernel-config/; revision=18948
2009-12-14 19:08:20 +00:00
Eelco Dolstra
fda6775efa * Get rid of some obsolete Linux kernel headers.
svn path=/nixpkgs/branches/kernel-config/; revision=18946
2009-12-14 18:36:43 +00:00
Eelco Dolstra
00c641d336 * Use the kernel config generator for Linux 2.6.28.
* Get rid of Linux 2.6.20 and 2.6.26 (the former was only used for
  building UML).

svn path=/nixpkgs/branches/kernel-config/; revision=18945
2009-12-14 18:34:46 +00:00
Eelco Dolstra
ec2fd60f88 * Doh!
svn path=/nixpkgs/branches/kernel-config/; revision=18944
2009-12-14 18:30:52 +00:00
Eelco Dolstra
a6d31beba7 * qemu-kvm updated to 0.11.1.
svn path=/nixpkgs/branches/kernel-config/; revision=18943
2009-12-14 18:30:36 +00:00
Eelco Dolstra
c3e80cbc9f * Get User-Mode Linux to build with a newer kernel. Yes, SHELL really
has to be "/bin/sh" - other values such as "sh" or "bash" or "$(type
  -tP sh)" cause a build error:

  LD      .tmp_vmlinux1
  /nix/store/1yv8i1m76cvwk5w5i5wrk4gj5zyfj6vh-binutils-2.19.1/bin/ld:arch/um/kernel/vmlinux.lds:1: ignoring invalid character `#' in expression
  /nix/store/1yv8i1m76cvwk5w5i5wrk4gj5zyfj6vh-binutils-2.19.1/bin/ld:arch/um/kernel/vmlinux.lds:1: syntax error
  collect2: ld returned 1 exit status

  This is caused by Bash 4.0
  (http://bugzilla.kernel.org/show_bug.cgi?id=13343).

svn path=/nixpkgs/branches/kernel-config/; revision=18941
2009-12-14 17:22:38 +00:00
Eelco Dolstra
03b4efe9c8 * Use the kernel config generator for Linux 2.6.27.
* Move kernel patches out of all-packages.nix to
  os-specific/linux/kernel/patches.nix.
* Make the kernel config available under $out/config (it's also in
  $out/lib/modules/$version/build/.config, but that's kind of hard to
  find).

svn path=/nixpkgs/branches/kernel-config/; revision=18937
2009-12-14 15:28:55 +00:00
Eelco Dolstra
98101f9cb1 * Linux 2.6.32.
svn path=/nixpkgs/branches/kernel-config/; revision=18932
2009-12-14 10:15:52 +00:00
Eelco Dolstra
15c6ede144 * Allow options to be ignored if they don't exist by marking them with
a "?".

svn path=/nixpkgs/branches/kernel-config/; revision=18931
2009-12-14 09:27:15 +00:00
Eelco Dolstra
71ed6194e1 * Get fbcondecor to work.
* Barf on ignored options.

svn path=/nixpkgs/branches/kernel-config/; revision=18914
2009-12-12 18:55:17 +00:00
Lluís Batlle i Rossell
dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Eelco Dolstra
03e45e0cb4 * Added a script to generate the kernel configuration.
`generate-config.pl' runs `make config' to generate a Linux kernel
  configuration file.  For each question (i.e. kernel configuration
  option), unless an override is provided, it answers "m" if possible,
  and otherwise uses the default answer (as determined by the default
  config for the architecture).  This is safer than allmodconfig,
  which answers "y" everywhere it can't answer "m" and thus ends up
  enabling a lot of experimental or debug options.  (For this reason,
  a configuration generated by allmodconfig must be carefully checked
  with every new release to ensure that nothing dangerous is enabled.
  The default config should be safer wrt new kernel releases.)

  Overrides are specified in the `config' argument to generic.nix,
  which is a string that contains lines such as `EXT2_FS_POSIX_ACL y'.
  The script warns about ignored options, and aborts if `make config'
  selects an answer inconsistent with the one in `config'.  This
  allows us to be sure that `make config' doesn't silently override
  our configuration values (e.g., depending on other options, it will
  set FB_TILEBLITTING to "y" even if we want it to be "n").

svn path=/nixpkgs/branches/kernel-config/; revision=18910
2009-12-12 13:51:07 +00:00
Marc Weber
5319704f80 removing old bleeding edge cruft replacing it by a niftier version using
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +00:00
Lluís Batlle i Rossell
61a6bdad88 Reverting some changes I brought in by error for util-linux-ng (I was trying
their git version, to check some bugfixes they did for my reports).


svn path=/nixpkgs/branches/stdenv-updates/; revision=18880
2009-12-10 15:05:26 +00:00
Lluís Batlle i Rossell
89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Lluís Batlle i Rossell
60788973d0 Adding a required option to uclibc for util-linux-ng (the git master version,
not that of nixpkgs, which still has bugs) to link well with uclibc.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18852
2009-12-09 13:33:23 +00:00
Eelco Dolstra
87fcfb0df2 * davfs2 updated to 1.4.5.
* neon updated to 0.28.6.

svn path=/nixpkgs/trunk/; revision=18841
2009-12-08 13:08:27 +00:00
Eelco Dolstra
83ee756b0a * Latest FUSE and sshfs.
svn path=/nixpkgs/trunk/; revision=18839
2009-12-08 11:38:34 +00:00
Eelco Dolstra
ebeacec489 * Linux 2.6.27.39.
svn path=/nixpkgs/trunk/; revision=18838
2009-12-08 11:38:19 +00:00
Eelco Dolstra
c726012afe * Refactoring: move most filesystem utilities / FUSE filesystems to
tools/filesystems.  Previously they were all over the place.

svn path=/nixpkgs/trunk/; revision=18809
2009-12-04 15:39:49 +00:00
Lluís Batlle i Rossell
4164de326a Making the cross-builds work with uclibc. There is no easy way of switching
between uclibc/glibc still.
I started the renaming from glibc to libc regarding the cross-toolchain, but I
still have to finish.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18801
2009-12-04 13:35:58 +00:00
Lluís Batlle i Rossell
e9abf7bb0c Updating util-linux-ng
svn path=/nixpkgs/branches/stdenv-updates/; revision=18800
2009-12-04 13:34:18 +00:00
Michael Raskin
84eb2eadef Apply patch from Lluis needed for future ARM merge..
svn path=/nixpkgs/trunk/; revision=18776
2009-12-03 07:08:51 +00:00
Lluís Batlle i Rossell
980d7c04a0 Patching uclibc for it to cope well with glibc-2.10 and above
This goes similar to the kernel-headers recent patch for the same file and
purpose.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18743
2009-12-01 20:52:13 +00:00
Lluís Batlle i Rossell
0e691fca14 Fixing the kernel headers patchPhase.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18697
2009-11-29 18:21:20 +00:00
Ludovic Courtès
83f8715475 linux-headers-2.6.28: Verbosely apply the patch against `unifdef.c'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18692
2009-11-29 14:59:41 +00:00
Lluís Batlle i Rossell
a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Ludovic Courtès
cfbe19781d Fix `kernelHeaders2628' compilation with glibc 2.11.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18657
2009-11-26 21:04:47 +00:00
Ludovic Courtès
a70f26e178 Fix `kernelHeaders2618' compilation with glibc 2.11.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18656
2009-11-26 20:55:52 +00:00
Lluís Batlle i Rossell
3881f13ad6 Updating the nvidia legacy drivers. Without this update, the drivers
did not work with xorg-server-1.7

svn path=/nixpkgs/trunk/; revision=18574
2009-11-23 21:40:51 +00:00
Michael Raskin
bbd6e56d69 Fix the cleanup-induced problems
svn path=/nixpkgs/trunk/; revision=18554
2009-11-23 12:21:34 +00:00
Lluís Batlle i Rossell
585ba8c27f Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell
e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
Eelco Dolstra
7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Lluís Batlle i Rossell
2c7fa189fb Making the definition of the cross compiling target an attribute set.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18378
2009-11-16 23:21:13 +00:00
Lluís Batlle i Rossell
9b977f5c60 Fixing many things related to the cross compilation in stdenvCross.
It still does not work, but I think I already get glibc cross compiled.
Next: gcc and g++, and set some setup script hooks on stdenvCross.

It took quite enough hours for this commit.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18351
2009-11-15 05:28:35 +00:00
Lluís Batlle i Rossell
2aba922d30 My first attempt at getting cross compilers in nixpkgs.
My idea is to provide special stdenv expressions that will contain in the path
additional cross compilers. As most expressions for programs accept a stdenv parameter, 
we could substitute this parameter with the special stdenv, which will have a
generic builder that attempts the usual "--target=..." and can additionally
have an env variable like "cross" with the target architecture set.
So, finally we could have additional expressions like this:

bashRealArm = makeOverridable (import ../shells/bash) {
    inherit fetchurl bison;
    stdenv = stdenvCross "armv5tel-unknown-linux-gnueabi";
};

Meanwhile it does not work - I still cannot get the cross-gcc to build.

I think it does not fill the previous expressions with a lot of noise, so I
think it may be a good path to follow.

I only touched some files of the current stdenv: gcc-4.3, kernel headers
2.6.28, glibc 2.9, ...

I tried to use the gcc-cross-wrapper, that may be very outdated. Maybe I will
update it, or update the gcc-wrapper expression to make it fit the cross tools,
but meanwhile I even cannot build gcc, so I have not tested the wrapper.

This new idea on cross compiling is not similar to that of the
nixpkgs/branches/cross-compilation, which mostly added bare new expressions for
anything to be cross compiled, if I understood it correctly.

I cared not to break anything of the usual stdenv in all this work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18343
2009-11-14 08:11:30 +00:00
Lluís Batlle i Rossell
6864119104 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18341
2009-11-13 19:19:34 +00:00
Lluís Batlle i Rossell
605b62da11 Enabling ipv6 at least as module in the zen5 arm kernel
svn path=/nixpkgs/branches/stdenv-updates/; revision=18315
2009-11-09 23:26:34 +00:00
Lluís Batlle i Rossell
6d092c3371 Adding kvm88, although without the patches kvm86 had for some nix advantages (samba, ...),
because they don't apply directly.

svn path=/nixpkgs/trunk/; revision=18309
2009-11-09 11:55:23 +00:00
Michael Raskin
6722c6c22f A package to feed to HAL to get synaptics support
svn path=/nixpkgs/trunk/; revision=18299
2009-11-08 22:12:55 +00:00