Commit graph

367 commits

Author SHA1 Message Date
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 b68ed67fc5 remove old expression
svn path=/nixpkgs/trunk/; revision=19108
2009-12-25 12:50:27 +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
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 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
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
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
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
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 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 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
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
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 0d041d909b GNU Autoconf 2.65.
svn path=/nixpkgs/trunk/; revision=18511
2009-11-21 23:18:23 +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
Eelco Dolstra 973b9cfde6 * Remove some incorrect uses of makeOverridable.
svn path=/nixpkgs/trunk/; revision=18483
2009-11-20 12:51:14 +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 e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
Eelco Dolstra 7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Lluís Batlle i Rossell 2c7fa189fb Making the definition of the cross compiling target an attribute set.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18378
2009-11-16 23:21:13 +00:00
Lluís Batlle i Rossell 2aba922d30 My first attempt at getting cross compilers in nixpkgs.
My idea is to provide special stdenv expressions that will contain in the path
additional cross compilers. As most expressions for programs accept a stdenv parameter, 
we could substitute this parameter with the special stdenv, which will have a
generic builder that attempts the usual "--target=..." and can additionally
have an env variable like "cross" with the target architecture set.
So, finally we could have additional expressions like this:

bashRealArm = makeOverridable (import ../shells/bash) {
    inherit fetchurl bison;
    stdenv = stdenvCross "armv5tel-unknown-linux-gnueabi";
};

Meanwhile it does not work - I still cannot get the cross-gcc to build.

I think it does not fill the previous expressions with a lot of noise, so I
think it may be a good path to follow.

I only touched some files of the current stdenv: gcc-4.3, kernel headers
2.6.28, glibc 2.9, ...

I tried to use the gcc-cross-wrapper, that may be very outdated. Maybe I will
update it, or update the gcc-wrapper expression to make it fit the cross tools,
but meanwhile I even cannot build gcc, so I have not tested the wrapper.

This new idea on cross compiling is not similar to that of the
nixpkgs/branches/cross-compilation, which mostly added bare new expressions for
anything to be cross compiled, if I understood it correctly.

I cared not to break anything of the usual stdenv in all this work.


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

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


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Eelco Dolstra ac4d183051 * Added gnome-icon-theme.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18118
2009-11-04 21:44:01 +00:00
Ludovic Courtès 4c5fcfb0a8 GDB: Build with Expat support, to get syscall info.
svn path=/nixpkgs/trunk/; revision=18009
2009-10-28 22:25:50 +00:00
Eelco Dolstra f53195f29e * Improved a bunch of "name" attributes (mostly missing version
numbers).

svn path=/nixpkgs/trunk/; revision=17991
2009-10-28 14:06:56 +00:00
Eelco Dolstra cbfbaf736a * GNU Indent updated to 2.2.10.
svn path=/nixpkgs/trunk/; revision=17990
2009-10-28 13:11:09 +00:00
Peter Simons 97166d8a20 distcc 3.1: initial version
svn path=/nixpkgs/trunk/; revision=17893
2009-10-20 11:54:49 +00:00
Marc Weber 87a60a6afd fix ctags wrapper js regex
svn path=/nixpkgs/trunk/; revision=17856
2009-10-18 04:43:35 +00:00
Ludovic Courtès 666754f7aa GDB: Reinstate removal of duplicate Info files.
svn path=/nixpkgs/trunk/; revision=17750
2009-10-12 10:06:41 +00:00
Michael Raskin e131df67ee Update GDB
svn path=/nixpkgs/trunk/; revision=17742
2009-10-10 14:45:38 +00:00
Eelco Dolstra 4041f93fbf * SWIG apparently doesn't need Perl/Python/Guile/JDK/20 other
languages at build time.  It seems they're only used in "make
  check".
* Subversion: updated to 1.6.5.

svn path=/nixpkgs/trunk/; revision=17594
2009-10-02 11:49:21 +00:00
Ludovic Courtès 403a4f9ae6 Add GNU AutoGen.
svn path=/nixpkgs/trunk/; revision=17491
2009-09-29 09:01:40 +00:00
Lluís Batlle i Rossell f9035543d5 Made openocd work with ft2232 jtag chipset, that of the Sheevaplug.
svn path=/nixpkgs/trunk/; revision=17407
2009-09-24 21:28:27 +00:00
Eelco Dolstra b7a90c11d3 * selectMaintained (renamed): don't use meta.maintainer, just use
meta.platforms.
* Valgrind *should* work on Darwin now, except that our GCC doesn't
  recognise the -arch flag.

svn path=/nixpkgs/trunk/; revision=17372
2009-09-23 19:45:02 +00:00
Ludovic Courtès 7735b54340 Keep only one SWIG, with support for all languages.
svn path=/nixpkgs/trunk/; revision=17351
2009-09-22 11:59:41 +00:00
Eelco Dolstra 4c759795e0 svn path=/nixpkgs/trunk/; revision=17350 2009-09-22 10:41:33 +00:00
Michael Raskin 2750e04339 Adding uzbl experimental snapshot
svn path=/nixpkgs/trunk/; revision=17344
2009-09-22 03:51:04 +00:00
Ludovic Courtès 7b2932cd9b SWIG 1.3.40, with Guile support.
svn path=/nixpkgs/trunk/; revision=17343
2009-09-21 20:56:53 +00:00
Lluís Batlle i Rossell 3eeec96a31 Adding OpenOCD.
svn path=/nixpkgs/trunk/; revision=17302
2009-09-20 16:43:16 +00:00
Ludovic Courtès ebd78c51d0 GNU Cflow: Don't build on Darwin.
svn path=/nixpkgs/trunk/; revision=17204
2009-09-16 15:09:58 +00:00
Ludovic Courtès 90cdaa74e9 GNU Cflow: Don't depend on Emacs on Cyg/Dar.
svn path=/nixpkgs/trunk/; revision=17201
2009-09-16 14:53:27 +00:00
Andres Löh 5b20a89f11 Version bumps for a number of Haskell packages.
svn path=/nixpkgs/trunk/; revision=17107
2009-09-14 08:35:39 +00:00
Marc Weber 2f91d73018 adding texitohtml (dependency of lilypond)
svn path=/nixpkgs/trunk/; revision=17023
2009-09-10 16:57:42 +00:00
Eelco Dolstra 714555bb81 * Added PolicyKit and eggdbus. There is a newer version of PolicyKit
(0.93), but it doesn't compile with the current glib.

svn path=/nixpkgs/trunk/; revision=16704
2009-08-13 07:55:11 +00:00