Commit graph

1736 commits

Author SHA1 Message Date
Eelco Dolstra
31b1ba6b11 * apr: don't use accept4(), because it's not support on Linux <
2.6.28.  It's rather unfortunate that the result of building apr
  depends on the capabilities of the kernel on which it's built...

svn path=/nixpkgs/trunk/; revision=19903
2010-02-10 13:30:57 +00:00
Ludovic Courtès
da1f088b3f TDB, the trivial database.
svn path=/nixpkgs/trunk/; revision=19895
2010-02-10 11:28:18 +00:00
Rob Vermaas
becfc4fd55 * opendbx: rewrite hack to preConfigure
svn path=/nixpkgs/trunk/; revision=19880
2010-02-09 11:46:27 +00:00
Rob Vermaas
66e655fce8 shared lib patch for libmilter
svn path=/nixpkgs/trunk/; revision=19876
2010-02-09 10:37:44 +00:00
Rob Vermaas
a5cecee12e added libmilter, opendkim
svn path=/nixpkgs/trunk/; revision=19875
2010-02-09 10:32:55 +00:00
Rob Vermaas
10acccb622 added tre-0.8.0
svn path=/nixpkgs/trunk/; revision=19873
2010-02-09 09:09:25 +00:00
Rob Vermaas
b3dfc53d15 added opendbx 1.4.4
svn path=/nixpkgs/trunk/; revision=19872
2010-02-09 09:05:14 +00:00
Eelco Dolstra
97a6ecb879 * Incorrect filename: 4.3.2 -> 4.3.1
svn path=/nixpkgs/trunk/; revision=19869
2010-02-08 17:46:34 +00:00
Rob Vermaas
2bbb78ab94 use gmp 4.3.2 on i686-darwin
svn path=/nixpkgs/trunk/; revision=19864
2010-02-08 13:58:25 +00:00
Eelco Dolstra
d8c6bb130c * Sync with the trunk one last time.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
2010-02-05 23:06:36 +00:00
Eelco Dolstra
aee659e1e2 * Fix various broken URLs / mirrors.
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
2010-02-05 22:00:51 +00:00
Lluís Batlle i Rossell
df0800e91d Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19825
2010-02-04 19:08:28 +00:00
Peter Simons
4193cac8de Added an interactive variant of sqlite3 that has readline support enabled.
svn path=/nixpkgs/trunk/; revision=19823
2010-02-04 16:07:15 +00:00
Lluís Batlle i Rossell
c83ce140e1 Adding 'duplicity', and its dependency 'librsync'
svn path=/nixpkgs/trunk/; revision=19813
2010-02-04 13:42:41 +00:00
Sander van der Burg
318dc53aa3 Fixed dbus-glib compilation on FreeBSD
svn path=/nixpkgs/branches/stdenv-updates/; revision=19793
2010-02-03 20:20:00 +00:00
Sander van der Burg
d26683f5a9 Fixed compilation for GLib on FreeBSD
svn path=/nixpkgs/branches/stdenv-updates/; revision=19790
2010-02-03 16:12:19 +00:00
Eelco Dolstra
a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Eelco Dolstra
096cd4d17d * Contrary to what configure --help' says, --enable-threadsafe' is
not the default.  So turn it on.

svn path=/nixpkgs/trunk/; revision=19772
2010-02-03 10:51:11 +00:00
Eelco Dolstra
a066167a9e * Fix building apr on Cygwin.
svn path=/nixpkgs/trunk/; revision=19766
2010-02-02 16:49:07 +00:00
Eelco Dolstra
a697127fcd * SQLite updated to 3.6.22. Use the amalgamation tarball since it now
installs the pkg-config files that other packages expect.  This also
  makes the dependency on tcl unnecessary.

svn path=/nixpkgs/trunk/; revision=19765
2010-02-02 15:49:48 +00:00
Lluís Batlle i Rossell
1741bb2597 Making 'boost' optionally build with -fPIC (with enableStatic, will produce
static libraries linkable in a shared object)


svn path=/nixpkgs/trunk/; revision=19759
2010-02-01 19:55:40 +00:00
Eelco Dolstra
822db4b9a9 * Glibc updated to 2.11.1. Also cleaned up the expression a bit
(don't use args.<attr> for instance).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19745
2010-02-01 09:32:40 +00:00
Ludovic Courtès
f75cf224ee libffi 3.0.9.
svn path=/nixpkgs/trunk/; revision=19728
2010-01-29 11:40:39 +00:00
Eelco Dolstra
f79a0a323c * Urgh.
svn path=/nixpkgs/trunk/; revision=19726
2010-01-29 08:04:31 +00:00
Eelco Dolstra
0a882d423b * Fix stdenv evaluation - use ${stdenv.shell} instead of
${stdenv.bash}/bin/bash.

svn path=/nixpkgs/trunk/; revision=19723
2010-01-29 00:17:59 +00:00
Ludovic Courtès
279d597082 MPICH2 1.2.1.
svn path=/nixpkgs/trunk/; revision=19717
2010-01-27 22:13:19 +00:00
Lluís Batlle i Rossell
db04d4f644 Making opencascade put header files in 'include', and not 'inc'. I also make
it to install the documentation.

svn path=/nixpkgs/trunk/; revision=19715
2010-01-27 18:27:55 +00:00
Rob Vermaas
13417770a3 applying patches provided by griswold
svn path=/nixpkgs/trunk/; revision=19707
2010-01-27 12:12:35 +00:00
Lluís Batlle i Rossell
62c315a723 Adding libofx and updating opensp (to get libofx built).
(I may have broken openjade... I will check later).


svn path=/nixpkgs/trunk/; revision=19697
2010-01-26 22:04:54 +00:00
Peter Simons
30bbff2b68 pkgs/development/libraries/science/math/liblapack: fixed license tag
Thanks to Ludovic Courtès for pointing that out.

svn path=/nixpkgs/trunk/; revision=19687
2010-01-26 19:28:09 +00:00
Peter Simons
6a61d675bb pkgs/development/libraries/science/math/blas: set license to "public domain"
It's not entirely clear whether BLAS is in the public domain, but according to
<87636orixx.fsf@gnu.org> Debian did classify it that way, and the license text
sure feels like the authors intend the package to be in the public domain. So
here we are.

svn path=/nixpkgs/trunk/; revision=19686
2010-01-26 19:28:03 +00:00
Peter Simons
8cb6ced793 pkgs/development/libraries/science/math/liblapack: fixed build and updated to version 3.2.1
svn path=/nixpkgs/trunk/; revision=19672
2010-01-26 14:53:13 +00:00
Peter Simons
a5030f06df pkgs/development/libraries/science/math/blas: added BLAS version 20070405
svn path=/nixpkgs/trunk/; revision=19671
2010-01-26 14:53:08 +00:00
Lluís Batlle i Rossell
bcba809460 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Lluís Batlle i Rossell
d1c34b3a47 Updating chmlib.
svn path=/nixpkgs/trunk/; revision=19646
2010-01-25 10:34:51 +00:00
Eelco Dolstra
ede6283180 * Revert libpng to 1.2.x because 1.4 breaks too many things.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19641
2010-01-24 23:14:26 +00:00
Marc Weber
cb582a87c9 cabal: add noHadock env var. Eg haddock can't create docs for haskell-src-exts
svn path=/nixpkgs/trunk/; revision=19636
2010-01-24 15:39:46 +00:00
Armijn Hemel
f8df44abb1 update to 4.6.1.
svn path=/nixpkgs/trunk/; revision=19631
2010-01-23 16:02:45 +00:00
Lluís Batlle i Rossell
d47aead668 Setting the difference buildInputs/buildNativeInputs in some gtk related packages.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
2010-01-22 18:49:16 +00:00
Eelco Dolstra
c7194fe7cf * Added Firefox 3.6. It's not entirely stable yet though. In
particular it segfaults with the `-P' option.

svn path=/nixpkgs/trunk/; revision=19606
2010-01-21 22:23:59 +00:00
Eelco Dolstra
ed3ebb7c2c * libjpeg updated to version 8.
* libpng updated to 1.4.0.
* For libjpegStatic, use a stdenv adapter to build a static library.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19605
2010-01-21 21:42:17 +00:00
Lluís Batlle i Rossell
3c206efa1f Updating qhull
svn path=/nixpkgs/trunk/; revision=19597
2010-01-21 14:44:15 +00:00
Lluís Batlle i Rossell
218c918909 Updating glew
svn path=/nixpkgs/trunk/; revision=19596
2010-01-21 14:39:57 +00:00
Lluís Batlle i Rossell
a3e4c7640f Updating meshlab.
Their build system has changed, and the source tree they distribute too, so the
dependencies changed a bit.
To get meshlab working, I update lib3ds and add levmar.

svn path=/nixpkgs/trunk/; revision=19595
2010-01-21 14:39:53 +00:00
Andres Löh
b56c549f26 Version bump for uu-parsinglib.
svn path=/nixpkgs/trunk/; revision=19590
2010-01-21 09:46:48 +00:00
Lluís Batlle i Rossell
a2a51f2ae3 Trying to make glibc211 build not only with the bootstrap-files compiler.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19581
2010-01-20 19:13:18 +00:00
Eelco Dolstra
8e885c0a52 * openssl 0.9.8l
svn path=/nixpkgs/branches/stdenv-updates/; revision=19570
2010-01-20 13:49:07 +00:00
Ludovic Courtès
8e3a1e09c0 GNU Libtasn1 2.4.
svn path=/nixpkgs/trunk/; revision=19566
2010-01-20 11:09:04 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a8a0edb60d Fix GStreamer 'good' plugins
svn path=/nixpkgs/trunk/; revision=18952
2009-12-15 07:47:45 +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
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
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
89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +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
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
Michael Raskin
fb82f5c79f Update cl-ppcre..
svn path=/nixpkgs/trunk/; revision=18822
2009-12-05 22:20:05 +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
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
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
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
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
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
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
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
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
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