Commit graph

8848 commits

Author SHA1 Message Date
Marc Weber
976def943b nix lib: add nixType returning type of value as string which is used in
eqStrict now to return false when a b have different types. Passing
string and {} to eqStrict caused coercion failures when running tests
previously

svn path=/nixpkgs/trunk/; revision=18539
2009-11-22 21:28:43 +00:00
Marc Weber
88e654b1ed follow runTests change prefixing all tests by "test"
svn path=/nixpkgs/trunk/; revision=18538
2009-11-22 21:28:41 +00:00
Marc Weber
02972b92d5 nix lang runTests: ignore tests which are not prefixed by "test"
svn path=/nixpkgs/trunk/; revision=18537
2009-11-22 21:28:38 +00:00
Marc Weber
715d09d836 add some debugging functions
traceCallXml is used to trace arguments and result

svn path=/nixpkgs/trunk/; revision=18536
2009-11-22 21:28:36 +00:00
Marc Weber
d0cc584711 myhasktags: new hash
svn path=/nixpkgs/trunk/; revision=18535
2009-11-22 21:28:28 +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
Michael Raskin
2b606fe313 Allow libusb in gnokii
svn path=/nixpkgs/trunk/; revision=18533
2009-11-22 19:28:56 +00:00
Ludovic Courtès
87a62e5409 gutenprint: Fix name, improve style.
svn path=/nixpkgs/trunk/; revision=18532
2009-11-22 19:11:27 +00:00
Lluís Batlle i Rossell
9dcff09187 Fixing the coreutils reference in the gcc-wrapper - they did not get properly
in the path still.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18531
2009-11-22 18:39:27 +00:00
Nicolas Pierron
b29073af25 * Add an adapter which abort an install if the installed package depends
on a derivation with a meta.license attribute which does not satisfy the
  license predicate.

With this adapter you can abort any install which depends on software
which are not free by default.  You can try it with MPlayer, because
MPlayer depends of win32codecs flagged as "unfree".

svn path=/nixpkgs/trunk/; revision=18530
2009-11-22 17:04:33 +00:00
Eelco Dolstra
11c3e92738 * Bring back Emacs 22 by request from Ludovic.
svn path=/nixpkgs/trunk/; revision=18529
2009-11-22 16:29:15 +00:00
Ludovic Courtès
af198a162d Switch to glibc 2.11 for the Info manual and for locales.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18527
2009-11-22 16:04:01 +00:00
Ludovic Courtès
04a15b29b0 glibc 2.11: Factorize the libc/info/locales expressions.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18526
2009-11-22 16:03:56 +00:00
Ludovic Courtès
1b5b1b62e1 glibc 2.11: Fix i686-linux builds.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18525
2009-11-22 16:03:43 +00:00
Rob Vermaas
132a1db1ee newer version of chrome (32599)
svn path=/nixpkgs/trunk/; revision=18520
2009-11-22 14:41:38 +00:00
Ludovic Courtès
544032ea33 glibc 2.11: Try again to fix link errors for `nscd'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18518
2009-11-22 00:57:20 +00:00
Ludovic Courtès
60a661259b glibc 2.11: Try to fix link errors for `nscd'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18513
2009-11-22 00:22:47 +00:00
Ludovic Courtès
3548887c27 GNU Coreutils: Comment on test failures.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18512
2009-11-22 00:22:42 +00:00
Ludovic Courtès
0d041d909b GNU Autoconf 2.65.
svn path=/nixpkgs/trunk/; revision=18511
2009-11-21 23:18:23 +00:00
Ludovic Courtès
96d3032ea0 Fix Ufraw.
svn path=/nixpkgs/trunk/; revision=18510
2009-11-21 22:30:00 +00:00
Nicolas Pierron
00efa9c2dd * Add a script to retrieve licenses of the current derivation and of all
its dependencies.  To make it works, you need to change the default
  stdenv as documented in the error message.

	./maintainers/scripts/dep-licenses.sh <attribute name>

svn path=/nixpkgs/trunk/; revision=18508
2009-11-21 17:50:00 +00:00
Ludovic Courtès
e5e6e853de glibc 2.11: Link against `libssp'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18507
2009-11-21 15:40:52 +00:00
Lluís Batlle i Rossell
c9ecbf7894 Adding a note about a change to do in the big-renaming to allow clear
buildInputs and buildNativeInputs, on pkgconfig, which now works always
as buildDrv even asking for its hostDrv.
Key string: cross_renaming


svn path=/nixpkgs/branches/stdenv-updates/; revision=18506
2009-11-21 15:39:20 +00:00
Ludovic Courtès
b1e17f71a6 glibc 2.11: Remove unneeded patches.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18502
2009-11-21 14:55:51 +00:00
Lluís Batlle i Rossell
d0d2c6e3fe Overriding some xorg expressions for them to cross-build. Now SDL cross-builds clean.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18501
2009-11-21 14:49:25 +00:00
Lluís Batlle i Rossell
ca5d91aa60 Made more libraries cross compile. fontconfig, libxcb, bzip2, libdrm, zlib...
I was trying to cross compile SDL. Many dependencies work, but I ended seeing
libX11 not ready for cross compilation. Other xorg libraries cross-compile
well. libX11 may need a small patch. The problem is the usual "configure test
cannot be run in cross compilation", so the configure script halts.

I made the pkgconfig expression always return buildDrv, as I think it rarely
will be needed as buildInput. So to avoid rewriting all its mentions to use
it as buildNativeInput, I prefered this small change.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
2009-11-21 10:44:22 +00:00
Lluís Batlle i Rossell
3136303d63 Fixing the libxcb native build: missing dependency.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18499
2009-11-21 10:11:44 +00:00
Lluís Batlle i Rossell
a263cb814e Fixed some details on cross compilation. Among others:
- Stating better the guile dependencies (native/host) for guile to build
- Fixing cross-linking, through --rpath-link (ld(1) explains well about it
- Made gcc call the linker and the assembler through the gcc wrapper instead of
  directly. I thought this was the source of missing -rpath's, but the source
  of the problem ended up being the lack of --rpath-link. But I think the
  native gcc calls the wrapped ld and as, so let's do the same cross
  compiling.
- Removed the binutilsCross from the glibc expressions. Now they are built
  using the gcc-cross-wrapper, and they were built with the direct gcc and
  binutils before this change.
- I think patchelf and strip don't break the cross-compiled binaries, so I
  reallow them on cross compilation.
- I disable the checkPhase on cross compilation. This made gmp and libtool
  fail when cross compiled, iirc.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18498
2009-11-21 02:42:52 +00:00
Lluís Batlle i Rossell
a5fee3325a Fixing some things on the gcc-cross-wrapper (libc was not properly added to the
linking path), and with this achieved bash being cross-compilable.
I fixed the few expressions involved in bash building, so they have well stated
native and non-native inputs.

I also tried to cross-build guile, and with this I found a problem in the
actual cross-gcc: it calls the binutils ld, instead of the ld wrapper. This
way, the programs/shared_libraries don't get the proper -rpath.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18497
2009-11-20 22:56:58 +00:00
Lluís Batlle i Rossell
b27cf66ee2 argh. Bad commenting style and a commit too blind.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18496
2009-11-20 20:29:32 +00:00
Lluís Batlle i Rossell
7748e9e964 Disabling the coreutils tests
svn path=/nixpkgs/branches/stdenv-updates/; revision=18495
2009-11-20 20:28:43 +00:00
Lluís Batlle i Rossell
9effdda93b Updating the dependencies of the new coreutils: they need perl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18494
2009-11-20 20:26:36 +00:00
Ludovic Courtès
ab61e5b40d stdenv: Let GNU tar select the decompression method.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18492
2009-11-20 17:10:00 +00:00
Ludovic Courtès
be4dfd41be GNU Libtool: Disable tests for now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18491
2009-11-20 17:09:54 +00:00
Lluís Batlle i Rossell
e10632e7d5 Trying to fix the stdenv used on i686-darwin, which stopped working after my
statement of the gcc-wrapper coreutils dependency on r17867.
I don't have i686-darwin to try this.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18490
2009-11-20 16:56:11 +00:00
Lluís Batlle i Rossell
28d9e73d34 Adding a new mkDerivation flag for the cross stdenv, selfNativeBuildInput =
true/false, which tells whether the derivation needs itself as
buildNativeInput.
For example, in order to build cross ncurses, we need the a native build
ncurses.
(As libtool does not work in stdenv, I have not tested this change, to check
whether finally ncurses cross-build)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18489
2009-11-20 16:38:01 +00:00
Eelco Dolstra
86f8f47d87 * eclipse-classic -> eclipse.
svn path=/nixpkgs/trunk/; revision=18486
2009-11-20 15:33:06 +00:00
Eelco Dolstra
e0491358eb * Removed a lot of old Eclipse versions.
* Cleaned up the Eclipse classic expression a bit (e.g. use
  makeWrapper).  Also fall back to GTK 2.16 to fix some GUI glitches.

svn path=/nixpkgs/trunk/; revision=18485
2009-11-20 15:19:00 +00:00
Sander van der Burg
853bfbd0b6 Upgraded eigen to 2.0.9
svn path=/nixpkgs/trunk/; revision=18484
2009-11-20 13:21:58 +00:00
Eelco Dolstra
973b9cfde6 * Remove some incorrect uses of makeOverridable.
svn path=/nixpkgs/trunk/; revision=18483
2009-11-20 12:51:14 +00:00
Lluís Batlle i Rossell
4497215410 Allowing in the cross stdenv adapter the calls to mkDerivation without name.
I don't know why there are such calls, but there are.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18482
2009-11-20 12:33:43 +00:00
Sander van der Burg
f08928cfe6 Increased the heap size of the GWT compiler to 256 MiB
svn path=/nixpkgs/trunk/; revision=18481
2009-11-20 11:37:11 +00:00
Lluís Batlle i Rossell
a270563c80 Updating boost
svn path=/nixpkgs/trunk/; revision=18480
2009-11-20 08:35:28 +00:00
Lluís Batlle i Rossell
7983251ce0 Fixing a trivial error in the glibc-2.11 longDescription, and fixing the
arguments for the ncurses expression.

We should find a way to express a dependency in cross compilation of the style
"cross-ncurses depends on having the native-ncurses".



svn path=/nixpkgs/branches/stdenv-updates/; revision=18479
2009-11-20 08:27:59 +00:00
Ludovic Courtès
e1af625517 Add tentative glibc 2.11 expression, based on that of glibc 2.9.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18478
2009-11-19 23:28:45 +00:00
Lluís Batlle i Rossell
6f3630e128 Attention, people who care on the builders for native builds. In the stdenv
derivation, the "buildInputs" in every stdenv mkDerivation don't map now
directly to the environment
variable "buildInputs" in the builder, but "buildNativeInputs". So, the inputs
build by the native compiler.
When cross compiling, they will map to the environment variable "buildInputs"
(yes, now the same name), which means does to be built with the cross compiler.

I think I improved the naming of variables a bit. There was a big mess,
specially in the stdenv adapter for cross building, and also in the default
builder script.

I also tried to add proper manager of propagatedInputBuilds, these being
propagated considering the host or build origin of that input build (so, at the
end, being those propagatedInputBuilds being propagated properly to the native
or the cross compiler.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18477
2009-11-19 23:05:11 +00:00
Ludovic Courtès
40e564c87c GNU Coreutils 8.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18476
2009-11-19 22:46:45 +00:00
Ludovic Courtès
640db0323d GNU Libtool 2.2.6b.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18475
2009-11-19 22:46:40 +00:00
Lluís Batlle i Rossell
5c14f92b30 Reverting a wrong name change I once did, when I thought that we would update
all the naming in nixpkgs to match the new build/host cross compilation stdenv.
Nevertheless, we decided not to do the renaming, but I forgot this change in
readline until ludo told me about it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18474
2009-11-19 22:15:13 +00:00
Lluís Batlle i Rossell
4dfc635cbb Fixing the uboot cross-build.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18473
2009-11-19 21:43:03 +00:00