Commit graph

3050 commits

Author SHA1 Message Date
Eelco Dolstra 1d6d92c9a1 * Make Valgrind compile with Glibc 2.11.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19554
2010-01-19 22:27:07 +00:00
Eelco Dolstra f93620419f * The Linux 2.6.32 headers contain a "scsi" subdirectory, which
clashes with Glibc's "scsi" subdirectory.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19553
2010-01-19 18:28:48 +00:00
Eelco Dolstra d67f1d269e * binutils creates hard links to the programs in $out/bin in
$out/<platform>/bin.  Because the fixup phase causes those to be
  replaced by identical copies, use symlinks instead of hardlinks.
  This saves about 9 MB.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19549
2010-01-19 17:41:54 +00:00
Eelco Dolstra 4e65c8aa2a * Use patchelf 0.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19548
2010-01-19 17:15:47 +00:00
Eelco Dolstra d348b996cf svn path=/nixpkgs/branches/stdenv-updates/; revision=19546 2010-01-19 17:10:03 +00:00
Eelco Dolstra ca0464c067 * gmp 4.3.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19535
2010-01-19 11:23:42 +00:00
Lluís Batlle i Rossell 0dcc2967ef Updating cloog-ppl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19532
2010-01-19 08:41:49 +00:00
Lluís Batlle i Rossell 5968b490d6 The fix in r19516 made evident an error in the gnatboot expression, about
library paths. Fixing this, to get gnat properly built.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19531
2010-01-18 23:28:58 +00:00
Lluís Batlle i Rossell ec59bcbf37 Disable PPL tests (although maybe we did not reach a consensus, let's disable
it for the possible massive stdenv rebuilds to come)


svn path=/nixpkgs/branches/stdenv-updates/; revision=19530
2010-01-18 22:47:45 +00:00
Eelco Dolstra fa5a119fcd * Perl 5.10.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19517
2010-01-18 12:09:51 +00:00
Eelco Dolstra a9634c0c5a * The postInstall attribute in default.nix did nothing, because
builder.sh already sets postInstall.  As a result Glibc had a
  retained dependency on bootstrap-tools.  Added the "rm" to
  builder.sh.
* localesbuilder.sh -> locales-builder.sh.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19516
2010-01-18 10:50:32 +00:00
Armijn Hemel f33363a841 update to 1.2.3
svn path=/nixpkgs/branches/stdenv-updates/; revision=19511
2010-01-17 23:04:26 +00:00
Armijn Hemel e2a24424ec update to 1.1.4
svn path=/nixpkgs/branches/stdenv-updates/; revision=19510
2010-01-17 23:04:20 +00:00
Armijn Hemel d3288dd878 update to 3.6.22
svn path=/nixpkgs/branches/stdenv-updates/; revision=19509
2010-01-17 22:48:07 +00:00
Lluís Batlle i Rossell 67038ea160 Fixing the meta platforms of python 2.6.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19507
2010-01-17 22:19:10 +00:00
Armijn Hemel 6a503c7d61 remove GNUism
svn path=/nixpkgs/branches/stdenv-updates/; revision=19505
2010-01-17 22:08:22 +00:00
Armijn Hemel aec137add1 remove GNUism
svn path=/nixpkgs/branches/stdenv-updates/; revision=19504
2010-01-17 21:52:11 +00:00
Armijn Hemel e68a8a9575 patch for gcc44
svn path=/nixpkgs/branches/stdenv-updates/; revision=19503
2010-01-17 21:34:55 +00:00
Lluís Batlle i Rossell 5c8a2bf152 Add openssl to qt 4.5, for all the kde https communications to work.
svn path=/nixpkgs/trunk/; revision=19499
2010-01-17 14:01:47 +00:00
Lluís Batlle i Rossell 2ab641c39e Adding libiptcdata.
I'm attempting to build rawtherapee, but it wants the propietary library 'rawzor'.
Maybe upstream someone will allow building without it some day. Until then, no
rawtherapee.

svn path=/nixpkgs/trunk/; revision=19497
2010-01-17 00:46:57 +00:00
Lluís Batlle i Rossell 20e75e0cf0 Fixing the gcc-wrapper, so it does not link when gcc is called with '-x
something'.
It should not link at least for '-x c-header' and '-x c++-header', and maybe
link for '-x c' or '-x c++', but we expect noone will be linking using these
later strings.

Adding opencv, which required '-x c-header' working, and that's why I have
updated gcc wrapper.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19491
2010-01-16 21:26:10 +00:00
Lluís Batlle i Rossell 70dd97620c Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
2010-01-16 15:19:23 +00:00
Nicolas Pierron 841e48d19b Add libyaml and PyYAML.
svn path=/nixpkgs/trunk/; revision=19477
2010-01-16 10:37:29 +00:00
Lluís Batlle i Rossell 1f86f426ef Fixing the ghdl patch for gcc 4.4 (I missed a part in my last commit)
svn path=/nixpkgs/branches/stdenv-updates/; revision=19476
2010-01-15 23:31:05 +00:00
Lluís Batlle i Rossell 61be82ffd0 Updating the ghdl related expressions:
- Adding ghdl with gcc 4.4 (with a patch I built for it to work)
- Adding me as maintainer to both gccs and ghdl


svn path=/nixpkgs/branches/stdenv-updates/; revision=19475
2010-01-15 23:22:28 +00:00
Marc Weber 92a0256e8e ruby update:
* xrefresh server on Linux (only paths config option is honored)
* sup can be started without hacks now :)
* rubygems update 1.3.5
* fix handling of /bin/* ruby scripts
* only recognize runtime dependencies when creating nix derivations.
  Some development dependencies are no longer available.
* make ruby lib ffy compile by using NIX_POST_EXTRACT_FILES_HOOK
* update rubygems patch: Even if there is a missing dep create attr
  item. Maybe this missing source can be fixed manually.

svn path=/nixpkgs/trunk/; revision=19470
2010-01-15 19:35:06 +00:00
Marc Weber 11f8b98ccc adding inotify-tools
svn path=/nixpkgs/trunk/; revision=19469
2010-01-15 19:35:02 +00:00
Michael Raskin 36f6b1873d Also fix ppc* copying in source fpc builder
svn path=/nixpkgs/trunk/; revision=19462
2010-01-15 10:43:21 +00:00
Michael Raskin 164bb7e1d7 Copy ppc* independently of architecture
svn path=/nixpkgs/trunk/; revision=19461
2010-01-15 10:05:29 +00:00
Michael Raskin 62c0c25b2a Update flup
svn path=/nixpkgs/trunk/; revision=19460
2010-01-15 09:50:27 +00:00
Michael Raskin 25a0d5e5a0 FPC on x86-64 seems to need fpcmake invocation
svn path=/nixpkgs/trunk/; revision=19459
2010-01-15 09:37:03 +00:00
Lluís Batlle i Rossell 742a4b5191 Adding a global wrapper that provides the user with ready-to-use opensc tools and
a 'firefox-dnie' that will launch the firefox in the path with the proper
environment variables to allow firefox access the Spanish national id SmartCard
as a Security Device.
For the later to work cleanly, it will require the user to enable the opensc-pkcs11
module as Security Devices in firefox.

svn path=/nixpkgs/trunk/; revision=19452
2010-01-14 23:43:56 +00:00
Lluís Batlle i Rossell 2ef0816647 Moving the library nixpkgs file/attribute names from 'opensc-dnie' to 'libopensc-dnie'
svn path=/nixpkgs/trunk/; revision=19451
2010-01-14 23:21:46 +00:00
Lluís Batlle i Rossell aaa4eafcbf Moving most of the ghdl logic outside the middle of the gcc expression.
Agreed on a final naming logic for the ghdl package: ghdl-wrapper-0.29


svn path=/nixpkgs/branches/stdenv-updates/; revision=19450
2010-01-14 23:03:31 +00:00
Michael Raskin f573c32327 Make fpc binary builder more explicit and more verbose
svn path=/nixpkgs/trunk/; revision=19445
2010-01-14 20:35:04 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Michael Raskin 64eb415722 Update WebKit nightly
svn path=/nixpkgs/trunk/; revision=19423
2010-01-14 08:41:48 +00:00
Michael Raskin 555eff3a08 Updating Lazarus
svn path=/nixpkgs/trunk/; revision=19422
2010-01-14 08:39:41 +00:00
Michael Raskin 8706bd4591 Update FPC
svn path=/nixpkgs/trunk/; revision=19420
2010-01-14 08:00:50 +00:00
Ludovic Courtès 54322bbd02 BuildBot: Fix erroneous absolute paths.
svn path=/nixpkgs/trunk/; revision=19415
2010-01-13 21:34:50 +00:00
Lluís Batlle i Rossell 0407211253 Making openct point to /var/lib and not $out/var/lib
svn path=/nixpkgs/trunk/; revision=19408
2010-01-13 20:56:01 +00:00
Rob Vermaas 5a787b0ab7 ant version 1.8.0RC1
svn path=/nixpkgs/trunk/; revision=19400
2010-01-13 15:20:24 +00:00
Lluís Batlle i Rossell 33618e21c5 Updating ghdl to 0.29.
I feel impelled to write nicer expressions for it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19395
2010-01-13 13:50:32 +00:00
Andres Löh 6b4a920e51 Updated uu-parsinglib.
svn path=/nixpkgs/trunk/; revision=19394
2010-01-13 13:49:03 +00:00
Eelco Dolstra f189022d13 * Updated mesa to 7.6.1.
* Removed mesa-headers as it's not used anymore.

svn path=/nixpkgs/trunk/; revision=19389
2010-01-13 12:43:17 +00:00
Eelco Dolstra 35257ada4e * Updated gtk+, glib, pango.
svn path=/nixpkgs/trunk/; revision=19388
2010-01-13 12:11:06 +00:00
Ludovic Courtès f47d0d4011 Coccinelle 0.2.0.
svn path=/nixpkgs/trunk/; revision=19384
2010-01-13 08:51:22 +00:00
Ludovic Courtès cc6cc10a93 GNU Libidn 1.16.
svn path=/nixpkgs/trunk/; revision=19383
2010-01-13 08:51:18 +00:00
Lluís Batlle i Rossell 4672cc340c Adding propietary drivers for the SCM smart card readers.
svn path=/nixpkgs/trunk/; revision=19378
2010-01-12 19:22:22 +00:00
Andres Löh fccd7f7604 Updated regular (Haskell lib).
svn path=/nixpkgs/trunk/; revision=19369
2010-01-12 10:37:48 +00:00
Marc Weber 2eb0633c5f fix ghc package versions
svn path=/nixpkgs/trunk/; revision=19367
2010-01-12 10:34:14 +00:00
Andres Löh 55e2661690 Updated Agda to 2.2.6.
svn path=/nixpkgs/trunk/; revision=19365
2010-01-12 10:18:00 +00:00
Rob Vermaas 662d29e61a LD_LIBRARY_PATH fix for qt-4.6
svn path=/nixpkgs/trunk/; revision=19364
2010-01-12 09:24:18 +00:00
Ludovic Courtès 8670c51227 Merge the two BuildBot expressions.
svn path=/nixpkgs/trunk/; revision=19358
2010-01-11 17:00:46 +00:00
Lluís Batlle i Rossell 24a46bbf12 Downgrading the opensc library version to 0.11.7, that required
for the Spanish national id smartcard (DNIe).
Adding the opensc dnie driver.


svn path=/nixpkgs/trunk/; revision=19325
2010-01-10 00:22:29 +00:00
Lluís Batlle i Rossell 000e1c7c22 Adding engine_pkcs11, a openssl engine for pkcs11 implementations for smartcards.
svn path=/nixpkgs/trunk/; revision=19324
2010-01-09 22:22:41 +00:00
Lluís Batlle i Rossell abffb0bdcb Fixing the descsription of some packages. Previously I misunderstood what
they were for, in particular.


svn path=/nixpkgs/trunk/; revision=19321
2010-01-09 21:33:28 +00:00
Lluís Batlle i Rossell 517fdec44b Adding more muscle programs and libraries.
svn path=/nixpkgs/trunk/; revision=19320
2010-01-09 18:06:37 +00:00
Lluís Batlle i Rossell a4473b8205 Adding calibre. This involved also:
- Adding podofo
- Adding some new python packages
- Making new pkgs attributes for python packages to build with python 2.6
- Updating some python packages expressions to allow python 2.6, and not only 2.5.


svn path=/nixpkgs/trunk/; revision=19303
2010-01-07 22:47:30 +00:00
Lluís Batlle i Rossell 9dcfc5263b Updating poppler
svn path=/nixpkgs/trunk/; revision=19299
2010-01-07 20:39:52 +00:00
Eelco Dolstra fc9d2d63d6 * php-xdebug doesn't have a "lib" argument. This causes Hydra to barf
on the entire nixpkgs:trunk jobset.  It should probably be a bit
  more robust...

svn path=/nixpkgs/trunk/; revision=19282
2010-01-07 10:59:49 +00:00
Marc Weber 900a1c22a4 moving xdebug into its own package. This means you have to specify an additional php.ini file to make php debugger work for command line php.
svn path=/nixpkgs/trunk/; revision=19266
2010-01-06 17:04:38 +00:00
Ludovic Courtès 4220742818 Coccinelle 0.2.0rc1.
svn path=/nixpkgs/trunk/; revision=19257
2010-01-06 13:05:13 +00:00
Peter Simons ad0b6441f8 pkgs/development/compilers/ghc/ghc-get-packages.sh: append global "package.conf" to the list of package config files
The wrapper script for ghc-pkg changes the command's default behavior such that
global packages -- i.e. packages that are part of GHC itself -- are no longer
found:

  $ ghc-pkg describe base
  ghc-pkg: cannot find package base

This patch remedies the problem.

svn path=/nixpkgs/trunk/; revision=19256
2010-01-06 12:55:25 +00:00
Ludovic Courtès 07393ba7f0 GNU Guile 1.9: Reinstate gcov workaround.
Reverts r18418.

svn path=/nixpkgs/trunk/; revision=19254
2010-01-06 08:43:42 +00:00
Peter Simons 1dfec1c467 pkgs/development/libraries/haskell/cabal/cabal.nix: build haddock documentation for Haskell libraries
svn path=/nixpkgs/trunk/; revision=19237
2010-01-05 15:17:17 +00:00
Rob Vermaas a6fae68ca9 update strategoxt 0.18 to r20449
svn path=/nixpkgs/trunk/; revision=19233
2010-01-05 13:44:13 +00:00
Ludovic Courtès 1bc4535ed9 GNU Readline 6.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19222
2010-01-05 11:27:54 +00:00
Ludovic Courtès eaf1e51ab7 GNU libmicrohttpd 0.4.4.
svn path=/nixpkgs/trunk/; revision=19218
2010-01-05 11:16:37 +00:00
Ludovic Courtès 59bb7dd1ef GNU adns: Add URLs.
svn path=/nixpkgs/trunk/; revision=19217
2010-01-05 11:16:34 +00:00
Ludovic Courtès 3c1304aef2 GNU libextractor 0.5.23.
svn path=/nixpkgs/trunk/; revision=19216
2010-01-05 11:16:30 +00:00
Ludovic Courtès 91d825d620 libmpeg2: Build the shared library.
svn path=/nixpkgs/trunk/; revision=19215
2010-01-05 11:16:26 +00:00
Andres Löh e9bb8f666a Haskell libs version bumps in order to improve ghc-6.12.1 compatibility.
svn path=/nixpkgs/trunk/; revision=19211
2010-01-04 17:40:51 +00:00
Rob Vermaas c5157f7d9d re-added libjpeg62 for chrome, updated chrome
svn path=/nixpkgs/trunk/; revision=19199
2010-01-04 07:47:32 +00:00
Marc Weber c62430f6a6 ghc version bump to latest stable release 6.12.1
make cabal expression add etxra library paths only if they exist.
Adding myself as maintainer so that the buildfarm builds ghc.

svn path=/nixpkgs/trunk/; revision=19198
2010-01-04 07:44:32 +00:00
Marc Weber 568a6e56eb enable fcsh (Adobe Flex compiler shell) - result: faster (flex / as3) compilation using mxmlc
flex sdk version bump

svn path=/nixpkgs/trunk/; revision=19196
2010-01-04 07:44:27 +00:00
Sander van der Burg 1fd64ed634 Added dbus-java and libmatthew-java (dependency for dbus-java) packages
svn path=/nixpkgs/trunk/; revision=19170
2010-01-02 13:28:51 +00:00
Eelco Dolstra 05fce85edc * Thunderbird 3.0. It doesn't use the Xulrunner package, as building
against an external Xulrunner seems to be unsupported currently.

svn path=/nixpkgs/trunk/; revision=19169
2010-01-02 13:21:50 +00:00
Andres Löh bc7ba3994c Added mozart system (compiles, but untested).
svn path=/nixpkgs/trunk/; revision=19146
2009-12-29 14:57:01 +00:00
Lluís Batlle i Rossell d864771e26 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
2009-12-28 11:40:34 +00:00
Armijn Hemel 88af9b98d1 add farsight2
svn path=/nixpkgs/trunk/; revision=19135
2009-12-27 15:27:45 +00:00
Armijn Hemel c9e8b92980 add libnice
svn path=/nixpkgs/trunk/; revision=19134
2009-12-27 14:22:00 +00:00
Armijn Hemel 2dc9c266e7 update to 0.10.25
svn path=/nixpkgs/trunk/; revision=19133
2009-12-27 14:00:13 +00:00
Armijn Hemel d2e97d4983 update to 0.6c11
svn path=/nixpkgs/trunk/; revision=19110
2009-12-25 14:17:57 +00:00
Armijn Hemel b68ed67fc5 remove old expression
svn path=/nixpkgs/trunk/; revision=19108
2009-12-25 12:50:27 +00:00
Armijn Hemel a6024ea7fb update to latest versions
svn path=/nixpkgs/trunk/; revision=19098
2009-12-24 22:15:38 +00:00
Armijn Hemel faead7fa2e Qt 4.6
svn path=/nixpkgs/trunk/; revision=19089
2009-12-24 09:49:35 +00:00
Armijn Hemel be1108423e Qt 4.5 was never released as QPL
svn path=/nixpkgs/trunk/; revision=19087
2009-12-23 21:29:27 +00:00
Lluís Batlle i Rossell 7ee537f955 Getting a new gcc-wrapper on the way. After gnat-wrapper, I introduce
ghdl-wrapper.
I made the gcc-4.3.4 expression allow the 'vhdl' language through ghdl.
The ghdl developer recommends this gcc version; maybe it would work with
gcc-4.4. If not this ghdl version, maybe next versions.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19071
2009-12-21 23:02:06 +00:00
Lluís Batlle i Rossell 7ab9bff48a I forgot a gcc flag in the last commit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19061
2009-12-21 07:49:59 +00:00
Lluís Batlle i Rossell fb82bac2fc Adding first built version of the gnat compiler for gcc 4.4.
Some things don't work:
- The ghdl expression (it still needs the gcc 4.3.4 src, ...)
- The gnat wrappers need to be more generic - now they work only for the
  given gnatboot (taken from gentoo) and gnats installed to their $out
  store path.
- Using the cloogppl and ppl. We will need our own gnatboot built with c++
  libraries for that.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19060
2009-12-21 07:49:31 +00:00
Ludovic Courtès cb130281ba perl: Fix for impure GNU/kFreeBSD builds.
svn path=/nixpkgs/trunk/; revision=19059
2009-12-21 01:02:47 +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
Lluís Batlle i Rossell 76fa225eaa Making cyrus-sasl build with gcc 4.4. I took a patch from the fedora cvs:
http://cvs.fedoraproject.org/viewvc/rpms/cyrus-sasl/devel/cyrus-sasl-2.1.22-bad-elif.patch?revision=1.1&view=markup


svn path=/nixpkgs/branches/stdenv-updates/; revision=19044
2009-12-19 09:09:39 +00:00
Lluís Batlle i Rossell 405bbecba1 Updating cyrus-sasl (hoping for it to build with gcc 4.4)
svn path=/nixpkgs/trunk/; revision=19043
2009-12-19 08:59:36 +00:00
Ludovic Courtès 246c17dc9e GNU MPFR 2.4.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19042
2009-12-18 17:48:31 +00:00
Ludovic Courtès f7c171f73f GNU Guile 1.9.6.
svn path=/nixpkgs/trunk/; revision=19026
2009-12-18 10:49:35 +00:00
Lluís Batlle i Rossell 72fe687cd0 Attempting to fix ntp's MOD_NANO problems.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19021
2009-12-17 22:09:28 +00:00
Eelco Dolstra 06d295f51b * Urgh. Get ATerm 2.4.2-fixes to build with the -fno-strict-aliasing
flag.  Note that ATerm 2.5 causes Nix to segfault, and ATerm 2.8
  doesn't even build on x86_64-linux (see
  http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=1042).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19020
2009-12-17 21:22:58 +00:00
Michael Raskin 48e3b81712 Adding libtasn1 dependency for gst-plugins
svn path=/nixpkgs/trunk/; revision=18956
2009-12-15 09:37:42 +00:00
Michael Raskin 6320a15c36 Fixing a typo
svn path=/nixpkgs/trunk/; revision=18954
2009-12-15 08:41:29 +00:00
Michael Raskin a8a0edb60d Fix GStreamer 'good' plugins
svn path=/nixpkgs/trunk/; revision=18952
2009-12-15 07:47:45 +00:00
Michael Raskin 7f9c1761b9 Bringing Io snapshot hash in sync with what github currently gives..
svn path=/nixpkgs/trunk/; revision=18951
2009-12-15 07:29:49 +00:00
Ludovic Courtès 1ca40e6a71 guile: Revert r18907 ("Improve `disable-gc-sensitive-tests.patch'.").
This patch no longer applies to `master' and may be unnecessary now.

svn path=/nixpkgs/trunk/; revision=18936
2009-12-14 15:20:05 +00:00
Michael Raskin c0a4109daa Adding NCBI C language toolbox
svn path=/nixpkgs/trunk/; revision=18924
2009-12-13 20:22:13 +00:00
Ludovic Courtès f4e365b3a0 GNU libgcrypt 1.4.5.
svn path=/nixpkgs/trunk/; revision=18922
2009-12-13 20:19:14 +00:00
Ludovic Courtès 1bf9e1eadc GNU libsigsegv 2.8.
svn path=/nixpkgs/trunk/; revision=18921
2009-12-13 20:19:08 +00:00
Ludovic Courtès c685880825 libsndfile 1.0.21.
svn path=/nixpkgs/trunk/; revision=18920
2009-12-13 20:19:03 +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
Ludovic Courtès f63059dd05 Add Coccinelle, a semantic patch interpreter for C.
svn path=/nixpkgs/trunk/; revision=18909
2009-12-12 00:47:14 +00:00
Ludovic Courtès b4ae0db5a5 guile: Improve `disable-gc-sensitive-tests.patch'.
svn path=/nixpkgs/trunk/; revision=18907
2009-12-11 21:48:14 +00:00
Lluís Batlle i Rossell 9976583c97 As agreed with ludo, I remove the getConfig around the cscope expression,
which deals only with a build time dependency. Let's better have hydra
build cscope (I set me as a maintainer), and prefer simpler expressions
to options on build-time dependencies.

svn path=/nixpkgs/trunk/; revision=18902
2009-12-11 14:47:16 +00:00
Lluís Batlle i Rossell 2ccf2984eb Updating cscope, and making its dependency on emacs optional (and off by default),
due to something called 'install emacs mode'.

svn path=/nixpkgs/trunk/; revision=18901
2009-12-11 14:03:27 +00:00
Marc Weber 78a1418e6d ghcs: provide list of core packages. Required by solver of thE haskell-nix-overlay
svn path=/nixpkgs/trunk/; revision=18896
2009-12-11 13:58:29 +00:00
Marc Weber 5d6b65d339 fix perl-5.8 build
svn path=/nixpkgs/trunk/; revision=18895
2009-12-11 13:58:26 +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 2dd9764a9e Major update to cmake, from 2.6.4 to 2.8.0.
I tried some kde4 builds, and the worked.

svn path=/nixpkgs/trunk/; revision=18890
2009-12-11 07:58:54 +00:00
Lluís Batlle i Rossell f5c5c0b4b6 Updating vtk; simplifying the openal cmake build expression.
svn path=/nixpkgs/trunk/; revision=18888
2009-12-11 07:16:16 +00:00
Lluís Batlle i Rossell f3c23487a2 Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild
stdenv.

In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared
objects through direct pass as ld command arguments of the absolute path to shared
objects, instead of using the -L/-l combinations.

cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly
passing the absolute path to the shared object to the linker, and as our wrapper did
not add any -rpath for those, writting the nix expressions for some cmake packages
resulted in a lot of tricks, compared to using this gcc-wrapper2.

This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a
stdenv update.

I also updated some cmake expressions to use this gcc-wrapper2, and reduced its
tricks.

I also updated the cmake setup-hook for it to make cmake not touch any rpath decided
at build time, when running the 'make install' of makefiles created by cmake.

svn path=/nixpkgs/trunk/; revision=18885
2009-12-10 22:19:52 +00:00
Ludovic Courtès 164eb9c699 Typo.
svn path=/nixpkgs/trunk/; revision=18883
2009-12-10 21:39:02 +00:00
Ludovic Courtès 19d02b6ca4 ocaml: Add description.
svn path=/nixpkgs/trunk/; revision=18882
2009-12-10 21:27:19 +00:00
Ludovic Courtès 3b6cc2a5c2 Update Automake (CVE-2009-4029 security fix).
svn path=/nixpkgs/trunk/; revision=18881
2009-12-10 20:54:58 +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
Marco Maggesi adbaa14548 Add expression for PolyML
svn path=/nixpkgs/trunk/; revision=18875
2009-12-10 13:16:06 +00:00
Eelco Dolstra d869913b27 * RPM updated to 4.7.2.
* nspr updated to 4.8.2.
* nss updated to 3.12.4.
* elfutils updated to 0.143.

svn path=/nixpkgs/trunk/; revision=18867
2009-12-09 22:34:51 +00:00
Peter Simons abebc10cf1 pkgs/development/compilers/swi-prolog/default.nix: updated to version 5.6.64 and enabled GUI support
svn path=/nixpkgs/trunk/; revision=18853
2009-12-09 14:07:09 +00:00
Lluís Batlle i Rossell 48bb7745e7 gcc 4.4.2 is also affected by the wrong CPP passed to the configure script of
the target libraries, as 4.3.4
I trigger the breaking build using uclibc, instead of glibc, and then the
mixture of CPP getting the build glibc headers, and CC getting the uclibc
headers, makes the problem evident.
In 4.3.4 it only affected libmudflap. In 4.4.2, it affects libmudflap and
libstdc++.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18850
2009-12-09 10:05:47 +00:00
Lluís Batlle i Rossell 916896e252 I took away the patch about the -Bxxx not being passed to target libraries
through libtool.
I found a make variable holding flags that will not be trimmed by libtool:
FLAGS_FOR_TARGET.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18846
2009-12-08 19:46:32 +00:00
Lluís Batlle i Rossell 21b2bc74b2 The bison elf may call m4 (I saw that building binutils' gold).
svn path=/nixpkgs/branches/stdenv-updates/; revision=18845
2009-12-08 19:42:18 +00:00
Lluís Batlle i Rossell e1082c8ac6 Updating openocd from 0.2.0 to 0.3.1
svn path=/nixpkgs/trunk/; revision=18843
2009-12-08 19:31:04 +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
Lluís Batlle i Rossell d0ae140f69 Renamed some old glibcCross to libcCross (we can use uclibc in cross builds already).
Dealt with the gcc 4.4 expression for it to work well for a native and a cross
compiler, adding a pair of patches to get the job done without much side
effects. One (libtool problems on -B) comes from the gcc 4.3 expression, while
the other fixes a bug already fixed in gcc 4.4.3.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18833
2009-12-08 09:36:19 +00:00
Rob Vermaas 86fa4600dc aspectj front for strategoxt 0.18
svn path=/nixpkgs/trunk/; revision=18831
2009-12-07 14:57:10 +00:00
Rob Vermaas 506c2f37c0 strategoshell based on strategoxt 0.18
svn path=/nixpkgs/trunk/; revision=18828
2009-12-07 14:19:23 +00:00
Michael Raskin fb82f5c79f Update cl-ppcre..
svn path=/nixpkgs/trunk/; revision=18822
2009-12-05 22:20:05 +00:00
Ludovic Courtès c73d5761de binutils: Fix `as' patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18816
2009-12-05 15:02:10 +00:00
Ludovic Courtès 9cb2e0aed7 binutils: Apply GNU assembler bug fix.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18815
2009-12-05 14:28:17 +00:00
Lluís Batlle i Rossell 917760a425 Adding the patch for gcc-4.3 I should have commited in already two recent commit attempts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18814
2009-12-04 21:35:47 +00:00
Lluís Batlle i Rossell 9651069240 Adding a gcc patch I forgot to add in the proper commit, while it is already
referenced in the gcc 4.3 expression.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18813
2009-12-04 18:42:44 +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
Eelco Dolstra 135cfab57e * PHP 5.2.11.
svn path=/nixpkgs/trunk/; revision=18786
2009-12-03 14:33:40 +00:00
Rob Vermaas 0b20c5c38f merged x86_64 changes back to trunk
svn path=/nixpkgs/trunk/; revision=18773
2009-12-02 21:03:02 +00:00
Lluís Batlle i Rossell 6c0b8d954a Adding gdbCross, to have a gdb for other targets than native.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18772
2009-12-02 20:54:40 +00:00
Andres Löh 30468489ca Added httpd-shed.
svn path=/nixpkgs/trunk/; revision=18756
2009-12-02 12:48:34 +00:00
Sander van der Burg 253575002c Upgraded little CMS to version 1.19
svn path=/nixpkgs/trunk/; revision=18754
2009-12-02 12:09:21 +00:00
Lluís Batlle i Rossell 2a0344bb39 I forgot about updating the glibc locales expressions for glibc 2.10 and 2.11.
I also set the 'glibcLocales' top-level attribute point to 2.11 instead of
2.10, to match that of the 'glibc' top-level attribute.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18746
2009-12-01 21:44:41 +00:00
Lluís Batlle i Rossell 8910d4e646 Adding ports to glibc-2.11.
Making glibc-2.11 the default in cross-compiling and also for the native armv5tel.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18744
2009-12-01 21:33:11 +00:00
Lluís Batlle i Rossell fe75d617b2 Setting gcc 4.3.4 as the default cross-gcc, and fixing glibc-2.10 for cross
building with it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18736
2009-12-01 15:20:13 +00:00
Lluís Batlle i Rossell 03fc55deeb Making the gcc 4.4 expression more friendly. Nevertheless it still cannot be
used to cross-compile, because of some bug in 4.4.2 I think. This bug does not
allow building a cross-compiler without libc:
http://archives.free.net.ph/message/20091119.140407.040d3c5b.en.html

Maybe we should wait for 4.4.3 or stay with 4.4.1 cross compiling. By now I
will keep 4.3.4 on cross compilation.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18730
2009-12-01 10:29:22 +00:00
Marc Weber 4a999a3811 adding neko
adding repository locations for haxe* and neko repositories

svn path=/nixpkgs/trunk/; revision=18709
2009-11-30 01:05:07 +00:00
Marc Weber c5b2c2c40a adding haxe
svn path=/nixpkgs/trunk/; revision=18708
2009-11-30 01:05:04 +00:00
Marc Weber 09474b8ca1 adding glefw
svn path=/nixpkgs/trunk/; revision=18707
2009-11-30 01:05:02 +00:00
Lluís Batlle i Rossell f4720cd5f9 Trying to get the gcc-4.4 cross-build also.
Fixing the glibc-2.10 expression on cross-builds (which should be ported to
the glibc-2.11 expression once we get "ports" there)

Making kde3 and cyrus-sasl use gcc-4.3, because the strictness in gcc-4.4 does
not allow them build.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18706
2009-11-29 23:27:35 +00:00
Lluís Batlle i Rossell 2b580b9846 Updating the perl-5.10 expression to support the bootstrapping stdenv better
- I still have not understood why it worked without this fix before, and I think
this has been triggered by the gcc-4.4, but I have not investigated this much. I
went with the trivial fix.

Adding a glibc-2.10.1 expression, because the glibc-2.11 still does not have
a ports release, so it cannot be used in arm. I'm using it only in native
compilation by now.

Making the default glibc to be 2.10 instead of 2.11 in armv5tel-linux.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18688
2009-11-28 12:57:42 +00:00
Rob Vermaas 48717cfa4f missing dep for strategoshell
svn path=/nixpkgs/trunk/; revision=18680
2009-11-27 20:31:12 +00:00
Rob Vermaas 56808c21ff typo
svn path=/nixpkgs/trunk/; revision=18679
2009-11-27 20:27:34 +00:00
Rob Vermaas 98f9ab70c0 stratego shell
svn path=/nixpkgs/trunk/; revision=18677
2009-11-27 20:22:43 +00:00
Rob Vermaas 746c502acc changes for x86_64-darwin support
svn path=/nixpkgs/trunk/; revision=18667
2009-11-27 10:56:07 +00:00
Rob Vermaas d8800474f7 x86_64 darwin related changes
svn path=/nixpkgs/trunk/; revision=18665
2009-11-27 10:16:42 +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
Lluís Batlle i Rossell adc61253b9 Merging from trunk, partially, to get rid of the annoying failing commits from
svn when files were removed, recreated and whatever...
 svn merge -r 18479:18485 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18659
2009-11-26 21:34:53 +00:00
Lluís Batlle i Rossell 8a115c13ad Fixing the fontconfig native build (cross-building related)
svn path=/nixpkgs/branches/stdenv-updates/; revision=18658
2009-11-26 21:26:42 +00:00
Ludovic Courtès f1f286052e Remove `unpackCmd's not needed with GNU tar format auto-detection (r18492).
svn path=/nixpkgs/branches/stdenv-updates/; revision=18653
2009-11-26 15:50:26 +00:00
Rob Vermaas 95970eb095 x86_64-darwin support for perl
svn path=/nixpkgs/trunk/; revision=18652
2009-11-26 15:50:10 +00:00
Rob Vermaas 4a0fd9efbb sendmail patch for CS173Tourney
svn path=/nixpkgs/trunk/; revision=18586
2009-11-24 09:39:51 +00:00
Michael Raskin be75df0b0d update webkit
svn path=/nixpkgs/trunk/; revision=18575
2009-11-23 22:31:12 +00:00
Lluís Batlle i Rossell fce5b7fe78 Adding a hack for gettext to cross-build with gcc+glibc in linux.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18568
2009-11-23 19:38:34 +00:00
Lluís Batlle i Rossell c6b526495b Improving the crossStripping. A cross-glibc gets broken if stripped by the
native strip. So we now distinguish dontStrip and dontCrossStrip. I updated
the expressions for glibc-2.9 and glibc-2.11 accordingly.
I could get rid of the cross-glibc depending on the cross-gcc-stage-static.

Enabling nls in the final cross-gcc.

I still have problems on wint_t/wchar_t not working on cross build. Gettext
does not build.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18562
2009-11-23 17:06:57 +00:00
Lluís Batlle i Rossell 75b60caea0 Updating guile so it uses gawk as a buildNativeInput and not as buildInput.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18561
2009-11-23 17:01:28 +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 45886e474d On native builds:
- Disabling guile test, because one fails. I commented on that in the source.
On cross builds:
- Adding stripping
- Updating the glibc-2.11 expression to match the parameters of glibc-2.9,
  which I was updating more.
- Renaming from selfNativeBuildInput to selfBuildNativeInput, so this matches
  better the pattern buildNativeInputs.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18550
2009-11-22 22:48:43 +00:00
Ludovic Courtès 98af7b9cb9 GNU Guile 1.8: Clean up.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18545
2009-11-22 22:16:58 +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
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
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 0d041d909b GNU Autoconf 2.65.
svn path=/nixpkgs/trunk/; revision=18511
2009-11-21 23:18:23 +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
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 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 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
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 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 973b9cfde6 * Remove some incorrect uses of makeOverridable.
svn path=/nixpkgs/trunk/; revision=18483
2009-11-20 12:51:14 +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
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 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
Lluís Batlle i Rossell 7ade207f6b - Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining
the cross compilation functionality.
- I renamed some expected stdenv.mkDerivation parameter attributes so we can
  keep this branch properly updated from trunk. We agreed with Nicolas Pierron
  doing a massive renaming, so all current buildInputs become hostInputs (input
  as build for the host machine, in autotools terminology) , and
  then buildInputs would mean "input as for the build machine".
  By now, the specific "input as for the build machine" is specified through
  buildNativeInputs. We should fix this in the merge to trunk.
- I made the generic stdenv understand the buildNativeInputs, otherwise if
  we start changing nixpkgs expressions so they distinguish the current
  buildInputs into buildInputs and buildNativeInputs, we could break even more
  nixpkgs for other platforms.
- I changed the default result of mkDerivation so it becomes the derivation for
  to be run in the build machine. This allows, without any special rewriting,
  "fetchurl" derivations to be always results for the build machine to use
  them.
- The change above implies that, for anyone wanting to cross-compile, has to
  build the hostDrv of the wanted derivation. For example, after this commit,
  the usual test of "nix-build -A bison.hostDrv arm.nix" works. I described
  the contents of this arm.nix in r18398.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18471
2009-11-19 19:03:34 +00:00
Ludovic Courtès 1f9e87871e GNU Guile 1.9: Remove unnecessary patch.
svn path=/nixpkgs/trunk/; revision=18418
2009-11-18 13:41:17 +00:00
Ludovic Courtès e615bc4574 GNU Guile 1.9.5.
svn path=/nixpkgs/trunk/; revision=18415
2009-11-18 13:18:24 +00:00
Eelco Dolstra b4636d333c svn path=/nixpkgs/trunk/; revision=18406 2009-11-18 11:46:35 +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 e7c8e8da4f I made the whole nixpkgs dependencies available to the cross compiler, no
needing to keep a new tree of expressions apart for the expressions to get
cross-compiled.

I changed the whole way of using cross compilation with nixpkgs, which before
was done through a simple adapter.

Now the adapter became complex, and I've tried to avoid the most obvious
recursivities. For example, the fetchurl expression should
never be cross-compiled, as the gmp, mpfr, and some others, like
some ncurses, perl, ... I made overrided copies of those necessary as
perlNoCross, ncursesNoCross, as stdenvNoCross, keeping in mind that
the stdenv (capable of cross compilation) is built upon stdenvNoCross using
an adapter.

So, to cross compile, instead of building using "nixpkgs/default.nix",
you should build with your
own "myarchiteture.nix", which should have contents like these, for example:

import /etc/nixos/nixpkgs/default.nix
{
    crossSystem = {
        config = "armv5tel-unknown-linux-gnueabi";
        bigEndian = false;
        arch = "arm";
        float = "soft";
    };
}


svn path=/nixpkgs/branches/stdenv-updates/; revision=18398
2009-11-17 22:58:48 +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