Commit Graph

931 Commits

Author SHA1 Message Date
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
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
Lluís Batlle i Rossell
1b37fc42bb Updating options for the versatileARM kernel, so it matches something
usable and buildable from a sheevaplug.
I took the additional settings from:
http://fedoraproject.org/wiki/Architectures/ARM/HowToQemu


svn path=/nixpkgs/branches/stdenv-updates/; revision=18296
2009-11-08 20:09:37 +00:00
Lluís Batlle i Rossell
7769ad11bd Updating the logic to put the resulting kernel image into its store path.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18289
2009-11-08 17:19:46 +00:00
Marco Maggesi
e3204aa407 New version of cryopid.
Update package cryopid to a new (unstable) version.
The old (stable) version of cryopid works only with old linux kernels.

svn path=/nixpkgs/trunk/; revision=18286
2009-11-08 10:38:07 +00:00
Lluís Batlle i Rossell
4326d07c11 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates2/; revision=18278
2009-11-08 01:57:40 +00:00
Lluís Batlle i Rossell
f1ee14bfaf Removing fetchgit --depth and its usage. It does not provide much advantages...
I think it takes the recent N commits into the repository, which says very little,
even for wanting master/HEAD.

svn path=/nixpkgs/trunk/; revision=18277
2009-11-08 01:51:20 +00:00
Lluís Batlle i Rossell
4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Michael Raskin
6e86ca940f Make a medium-depth checkout
svn path=/nixpkgs/trunk/; revision=18266
2009-11-07 19:43:53 +00:00
Michael Raskin
dca59abcca Update Zen Kernel
svn path=/nixpkgs/trunk/; revision=18174
2009-11-05 23:32:48 +00:00
Michael Raskin
df69473bd2 Add directvnc. Not sure whether it works - for me it hangs, but I have known Radeon issues, it seems
svn path=/nixpkgs/trunk/; revision=18159
2009-11-05 21:10:51 +00:00
Eelco Dolstra
4f839e9a54 * Sync with the trunk.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18122
2009-11-04 22:37:24 +00:00
Eelco Dolstra
45ba16864f * Deleted some obsolete kernels (2.6.20, 2.6.21, 2.6.22, 2.6.23 and
the 2.6.31rcs).

svn path=/nixpkgs/trunk/; revision=18065
2009-11-01 17:17:40 +00:00
Eelco Dolstra
c9b79a3d84 * Oops, wrong version.
svn path=/nixpkgs/trunk/; revision=18057
2009-10-30 18:13:08 +00:00
Eelco Dolstra
65d399ff81 * Upstart 0.6.2.
svn path=/nixpkgs/trunk/; revision=18056
2009-10-30 18:12:28 +00:00
Eelco Dolstra
97ea4b3375 * Updated ALSA.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18055
2009-10-30 15:05:13 +00:00
Eelco Dolstra
35593f5cd5 * NVIDIA X11 driver updated to 190.42.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18023
2009-10-29 13:47:44 +00:00
Eelco Dolstra
41879a5c74 * Linux 2.6.27.38.
svn path=/nixpkgs/trunk/; revision=17985
2009-10-28 12:07:00 +00:00
Michael Raskin
ab85fbeec4 Updating fbterm
svn path=/nixpkgs/trunk/; revision=17981
2009-10-27 23:49:59 +00:00
Ludovic Courtès
37b42b3ab7 Linux: Enable `sdhci', for Ricoh SD readers.
svn path=/nixpkgs/trunk/; revision=17954
2009-10-25 15:22:54 +00:00
Michael Raskin
c6c9129761 Removing references to old zen-kernels that are in archived branches; Updating from zen-sources.org to zen-kernel.org; Updating revision; Adding patch by Pierre to enable external hubs
svn path=/nixpkgs/trunk/; revision=17930
2009-10-23 05:21:54 +00:00
Eelco Dolstra
21ddf5e52e * Linux 2.6.27.37.
svn path=/nixpkgs/trunk/; revision=17909
2009-10-21 13:07:09 +00:00