Commit graph

3227 commits

Author SHA1 Message Date
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 99f8d729b0 Updating nix's aterm from aterm242fixes to aterm25 (proposed by niksnut).
svn path=/nixpkgs/branches/stdenv-updates/; revision=18879
2009-12-10 14:50:50 +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
Michael Raskin 3871c1ebd2 Update xboard
svn path=/nixpkgs/trunk/; revision=18870
2009-12-10 06:55:12 +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
Michael Raskin 13b91e2ca8 Update CouchDB; add Apache-related snippets to update-upstream-data.
svn path=/nixpkgs/trunk/; revision=18851
2009-12-09 12:59: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
Lluís Batlle i Rossell 7cae967c7c Removing the coreutils-7.5, which were needed in armv5tel in contrast to
coreutils 7.6, which did not build well. The newer coreutils 8.1 work perfectly,
and we don't need to rely in older versions.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18836
2009-12-08 10:04:43 +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 d2c7ef9524 svn path=/nixpkgs/trunk/; revision=18830 2009-12-07 14:56:48 +00:00
Rob Vermaas da0863d21f build stratego-shell for darwin
svn path=/nixpkgs/trunk/; revision=18829
2009-12-07 14:26:24 +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
Eelco Dolstra 589ba9982d * Added s3backer.
svn path=/nixpkgs/trunk/; revision=18811
2009-12-04 15:51:02 +00:00
Eelco Dolstra 20845cabfc * Remove an unused file.
svn path=/nixpkgs/trunk/; revision=18810
2009-12-04 15:42:27 +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
Rob Vermaas af84eef331 some more x86_64 darwin changes
svn path=/nixpkgs/trunk/; revision=18774
2009-12-02 22:19:49 +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
Lluís Batlle i Rossell 6fadcfbd03 Building coreutils with gmp, only because it is possible to do so.
I don't know the advantage, though.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18770
2009-12-02 19:34:34 +00:00
Andres Löh 30468489ca Added httpd-shed.
svn path=/nixpkgs/trunk/; revision=18756
2009-12-02 12:48:34 +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 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 edca11fec6 svn path=/nixpkgs/trunk/; revision=18678 2009-11-27 20:24:55 +00:00
Rob Vermaas 98f9ab70c0 stratego shell
svn path=/nixpkgs/trunk/; revision=18677
2009-11-27 20:22:43 +00:00
Ludovic Courtès f310356cbc Switch to GCC 4.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18676
2009-11-27 17:59:03 +00:00
Peter Simons af0a961e3d pkgs/applications/editors/emacs-modes/prolog: initial version of prolog-mode for Emacs
svn path=/nixpkgs/trunk/; revision=18675
2009-11-27 17:40:56 +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
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 3cda62f6e1 Trying to merge from trunk the eclipse-classic -> eclipse move.
svn merge -r 18485:18486 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18660
2009-11-26 21:42:46 +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
Eelco Dolstra a71971f671 * Inkscape 0.47.
svn path=/nixpkgs/trunk/; revision=18641
2009-11-26 12:39:22 +00:00
Ludovic Courtès 22c531b162 Switching back to Flex 2.5.4a as it caused a major rebuild.
svn path=/nixpkgs/trunk/; revision=18635
2009-11-25 23:20:11 +00:00
Ludovic Courtès 46526b4ac9 Default to Flex 2.5.35; move 2.5.4a out of the way.
svn path=/nixpkgs/trunk/; revision=18633
2009-11-25 23:13:28 +00:00
Ludovic Courtès aca6f17400 Add Geeqie, a GQview fork.
svn path=/nixpkgs/trunk/; revision=18613
2009-11-25 08:58:42 +00:00
Rob Vermaas 2ffa48af25 update maven2
svn path=/nixpkgs/trunk/; revision=18609
2009-11-25 07:51:06 +00:00
Eelco Dolstra f52952e504 * Nix updated to nix-0.14pre18592.
svn path=/nixpkgs/trunk/; revision=18594
2009-11-24 14:19:20 +00:00
Lluís Batlle i Rossell 6f2e018c7a Enabling plugins in avidemux.
Adding an assertion, for stdenv having glibc. avidemux wants pthreads.

svn path=/nixpkgs/trunk/; revision=18593
2009-11-24 14:01:48 +00:00
Lluís Batlle i Rossell d634b32abf Adding avidemux.
svn path=/nixpkgs/trunk/; revision=18584
2009-11-24 08:27:18 +00:00
Ludovic Courtès 807655e1f9 Switch to glibc 2.11 and hope for the best.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18578
2009-11-23 23:35:59 +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
Michael Raskin 2b606fe313 Allow libusb in gnokii
svn path=/nixpkgs/trunk/; revision=18533
2009-11-22 19:28:56 +00:00