Commit Graph

555 Commits

Author SHA1 Message Date
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
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
4f839e9a54 * Sync with the trunk.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18122
2009-11-04 22:37:24 +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
Lluís Batlle i Rossell
ae1f064c0c Updating doxygen from 1.5.8 to 1.6.1
svn path=/nixpkgs/trunk/; revision=18099
2009-11-04 14:58:39 +00:00
Marco Maggesi
a0207b3dc7 Updated Coq to version 8.2pl1
svn path=/nixpkgs/trunk/; revision=18069
2009-11-02 11:44:27 +00:00
Marco Maggesi
c4533b8d24 Added camlp5 the preprocessor-pretty-printer for OCaml
svn path=/nixpkgs/trunk/; revision=18068
2009-11-02 10:47:24 +00:00
Ludovic Courtès
f8d95145b2 G-Wrap 1.9.13.
svn path=/nixpkgs/trunk/; revision=18012
2009-10-29 11:23:10 +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
Lluís Batlle i Rossell
57a544d59c Adding 'remake': a patched and modernized version of GNU make utility that adds
improved error reporting, the ability to trace execution in a comprehensible
way, and a debugger.

svn path=/nixpkgs/trunk/; revision=17744
2009-10-11 15:03:13 +00:00
Michael Raskin
e131df67ee Update GDB
svn path=/nixpkgs/trunk/; revision=17742
2009-10-10 14:45:38 +00:00
Ludovic Courtès
c1e5a9d2fb G-Wrap: Propagate libffi.
svn path=/nixpkgs/trunk/; revision=17656
2009-10-05 22:21:45 +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
a5945916f0 More Apache mirrors; use them for Ant.
svn path=/nixpkgs/trunk/; revision=17563
2009-10-01 09:07:09 +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
Ludovic Courtès
c1f7e5ff90 ant-gcj: Add missing file.
svn path=/nixpkgs/trunk/; revision=17402
2009-09-24 14:50:42 +00:00
Ludovic Courtès
18e946cb9d Add Apache Ant, built from source with GCJ.
svn path=/nixpkgs/trunk/; revision=17401
2009-09-24 14:49:15 +00:00
Eelco Dolstra
0fe3d3a313 * Doh.
svn path=/nixpkgs/trunk/; revision=17373
2009-09-23 19:50:31 +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
Eelco Dolstra
880e6ba1f7 * Valgrind 3.5.0.
svn path=/nixpkgs/trunk/; revision=17369
2009-09-23 18:46:07 +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
Lluís Batlle i Rossell
8515a7fa68 Adding me as a maintainer, with a pair of packages.
svn path=/nixpkgs/trunk/; revision=17295
2009-09-20 09:37:55 +00:00
Lluís Batlle i Rossell
f85146e2fc Making radare more flexible on build options.
svn path=/nixpkgs/trunk/; revision=17294
2009-09-20 09:33:37 +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
4c89d4f833 * Clean up the coverage report in the case where absolute paths are
used in the *.gcno files.

svn path=/nixpkgs/trunk/; revision=16925
2009-09-02 09:37:52 +00:00
Eelco Dolstra
54a5ad0c6f * Hacked up a patch to let lcov find source files referenced by a
path relative to some arbitrary parent of the .gcno file.  For
  instance, this happens when building Subversion with coverage.

svn path=/nixpkgs/trunk/; revision=16902
2009-08-31 15:02:01 +00:00
Eelco Dolstra
024c82ee04 * lcov 1.7.
svn path=/nixpkgs/trunk/; revision=16888
2009-08-28 14:11:09 +00:00
Andres Löh
543483d99f Added mkcabal.
svn path=/nixpkgs/trunk/; revision=16875
2009-08-27 06:35:17 +00:00
Lluís Batlle i Rossell
62a8e0806b Radare update from 1.4.1 to 1.4.2
svn path=/nixpkgs/trunk/; revision=16778
2009-08-19 20:19:08 +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
Andres Löh
738b44d9d2 Some Haskell package updates.
svn path=/nixpkgs/trunk/; revision=16702
2009-08-12 15:28:47 +00:00
Ludovic Courtès
7dd05fc776 Autoconf: Don't run the test suite on Cygwin.
svn path=/nixpkgs/trunk/; revision=16521
2009-07-30 15:26:30 +00:00
Ludovic Courtès
4456c7496a Autoconf: Patch sloppy test case.
svn path=/nixpkgs/trunk/; revision=16511
2009-07-29 19:39:15 +00:00
Ludovic Courtès
8f6228ee5b Autoconf: Disable the test suite on {Cyg,Dar}win.
svn path=/nixpkgs/trunk/; revision=16499
2009-07-29 08:38:26 +00:00
Ludovic Courtès
60027c8198 GNU Autoconf 2.64.
svn path=/nixpkgs/trunk/; revision=16494
2009-07-28 19:43:40 +00:00