Commit graph

400 commits

Author SHA1 Message Date
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
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
Ludovic Courtès 9cd30e68e3 GNU Cflow 1.3.
svn path=/nixpkgs/trunk/; revision=16338
2009-07-13 14:54:01 +00:00
Ludovic Courtès 1bc6e5c847 GLOBAL: Install the Emacs mode.
svn path=/nixpkgs/trunk/; revision=16334
2009-07-13 09:21:04 +00:00
Ludovic Courtès 474c54071b Add GNU GLOBAL, a source code tag system.
svn path=/nixpkgs/trunk/; revision=16333
2009-07-13 09:05:56 +00:00
Marc Weber 738858983a ctags wrapper: find ruby classes (eg class Gem::Dependency)
svn path=/nixpkgs/trunk/; revision=16058
2009-06-26 16:52:52 +00:00
Eelco Dolstra e7edaef873 * Latest patchelf.
svn path=/nixpkgs/trunk/; revision=16017
2009-06-22 11:14:51 +00:00
Eelco Dolstra 143787ad74 * PatchELF 0.5pre15500. Needed for --force-rpath.
svn path=/nixpkgs/trunk/; revision=15951
2009-06-13 16:10:24 +00:00
Ludovic Courtès 20701b16cc Automake 1.11: Run the test suite by default.
svn path=/nixpkgs/trunk/; revision=15674
2009-05-20 12:21:53 +00:00
Ludovic Courtès 599b1c1af2 Add GNU Automake 1.11.
svn path=/nixpkgs/trunk/; revision=15673
2009-05-20 12:20:51 +00:00
Marc Weber 52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Michael Raskin 852603e4df Fix indent build
svn path=/nixpkgs/trunk/; revision=15572
2009-05-12 16:00:26 +00:00
Michael Raskin 370eb21986 Update yodl sources. Unofrtunately, old ones are unavailable. Icmake is still needed to build yodl
svn path=/nixpkgs/trunk/; revision=15539
2009-05-10 20:16:33 +00:00
Michael Raskin d02609f7dc Fix includes in xxdiff
svn path=/nixpkgs/trunk/; revision=15521
2009-05-10 05:27:52 +00:00
Marc Weber 90344f9e1e use svn sources for ctgas.
The last release has a bug. I got "no end of file expected" while tagging

svn path=/nixpkgs/trunk/; revision=15501
2009-05-07 18:28:19 +00:00
Marc Weber 5d9d28fb1f mend
svn path=/nixpkgs/trunk/; revision=15477
2009-05-06 16:06:49 +00:00
Marc Weber 3cf455286f adding ctags-wropped. A wrapper for ctags adding some language (more)
language support for .php .js .nix and .as files

svn path=/nixpkgs/trunk/; revision=15476
2009-05-06 16:06:45 +00:00
Eelco Dolstra f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra 7ec61219db * lib/site_perl -> lib/perl5/site_perl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15258
2009-04-22 23:04:18 +00:00
Lluís Batlle i Rossell ff0483b3d8 Adding gtkdialog.
svn path=/nixpkgs/trunk/; revision=15224
2009-04-21 19:47:30 +00:00
Eelco Dolstra b1e2bb54f2 * Doh! This broke pam_console (and probably system-config-printer).
svn path=/nixpkgs/branches/stdenv-updates/; revision=15190
2009-04-20 16:01:57 +00:00
Eelco Dolstra c61c9dc35b * Drop the "perl" prefix from Perl attribute names. It's redundant
now that Perl packages are in their own namespace
  (perlPackages.<pkg>).

svn path=/nixpkgs/trunk/; revision=15176
2009-04-20 12:49:35 +00:00
Andres Löh 0fc7bf4f00 Added vacuum plus deps.
svn path=/nixpkgs/trunk/; revision=15166
2009-04-20 00:18:51 +00:00
Eelco Dolstra 6b9ccbaf78 * setup.sh: turn on nullglob globally.
* setup.sh: removed some obsolete features, specifically some that
  were only used by the old build farm.
* addToSearchPath: removed some parameters that weren't used
  anywhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
2009-04-18 22:22:51 +00:00
Eelco Dolstra a4c304ef84 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
2009-04-15 13:25:01 +00:00
Marc Weber 5951e31121 updating unifdef source location
Why did the hash change as well?

svn path=/nixpkgs/trunk/; revision=15029
2009-04-14 13:03:43 +00:00
Eelco Dolstra 2eb05cf933 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
2009-04-09 12:19:57 +00:00
Armijn Hemel 349fea53b7 update to 1.3.39
svn path=/nixpkgs/trunk/; revision=14890
2009-04-05 19:47:23 +00:00
Eelco Dolstra e01be47e53 * aclocal wrapper: skip directories in ACLOCAL_PATH that don't exist,
otherwise aclocal barfs.  Updated the builder to use makeWrapper
* Made Automake 1.10 the default.
* Fixed `make check' in Automake by turning off indented logging in
  Make (there is a flag for that now).
* Disabled the `make check' in Automake by default because it takes a
  REALLY long time (e.g. more than 2 hours on Cygwin, 50 minutes on
  Darwin, 25 minutes on Linux) which is a lot for a package that
  otherwise takes 10 seconds to build.  We can add a Hydra job with
  doCheck enabled to do regression testing.
* make-wrapper: allow --run commands to add additional flags to the
  invocation of the wrapped program.  An example is the aclocal
  wrapper: it adds additional -I ... flags.
* make-wrapper: call the wrapped program .foo-wrapped instead of
  .wrapped-foo to make it easier to tell programs apart in `ps'
  output.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14885
2009-04-05 18:13:59 +00:00
Ludovic Courtès 4b663632ed GNU M4 1.4.13.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14834
2009-04-02 12:33:27 +00:00
Eelco Dolstra d27514cb28 * Sync with the trunk once more.
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
2009-03-31 15:30:47 +00:00
Lluís Batlle i Rossell 9fde2b1a38 Binutils got in 2.18 GPLv3
svn path=/nixpkgs/trunk/; revision=14796
2009-03-30 22:13:42 +00:00
Eelco Dolstra 9455f37ce9 * acl, attr: updated, and use libtool 2.
* Removed libtoolOld.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14792
2009-03-30 15:55:10 +00:00
Lluís Batlle i Rossell 6b8acbd2dc Fixing the name of xxdiff.
svn path=/nixpkgs/trunk/; revision=14692
2009-03-24 19:24:14 +00:00
Eelco Dolstra 3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Marc Weber 51289a41b0 adjust packages to overridableDelayableArgs
svn path=/nixpkgs/trunk/; revision=14427
2009-03-06 23:21:24 +00:00
Eelco Dolstra fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00
Eelco Dolstra 6d62e290a0 * elfutils: updated to 0.140. The older versions don't seem to be
needed.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14105
2009-02-17 16:42:51 +00:00
Ludovic Courtès f59b3d14dc Add SLOCCount, a tool to count source lines of code (SLOCs).
svn path=/nixpkgs/trunk/; revision=14091
2009-02-17 10:11:33 +00:00
Eelco Dolstra 390695e73f * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
2009-02-12 21:16:55 +00:00
Michael Raskin 7590daad42 Extra mirror for lsof
svn path=/nixpkgs/trunk/; revision=14036
2009-02-11 21:51:05 +00:00
Eelco Dolstra efbfa0c395 * Latest lsof.
svn path=/nixpkgs/trunk/; revision=14025
2009-02-10 23:11:29 +00:00
Ludovic Courtès 6aa15fcfb0 GNU gperf 3.0.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13987
2009-02-05 16:49:41 +00:00
Ludovic Courtès 8b87ac3eeb GNU Binutils 2.19.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13975
2009-02-03 19:36:56 +00:00
Eelco Dolstra e8358099f5 * Doh.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13959
2009-02-02 15:41:13 +00:00
Eelco Dolstra a68773a3ea * GNU m4: `make check' fails on Darwin:
===
Checking ./219.improved_f
Checking ./stackovf.test
Stack soft limit set to 300K
Failure - m4 aborted unexpectedly
Output from m4:
m4: internal error detected; please report this bug to <bug-m4@gnu.org>: Bus error

Skipped checks were:
  ./116.changeword ./117.changeword ./118.changeword ./119.changeword ./120.changeword ./121.changeword
Failed checks were:
  ./stackovf.test
make[2]: *** [check] Error 1
make[1]: *** [check-recursive] Error 1
===

  So disable the check on Darwin for now.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13958
2009-02-02 15:34:59 +00:00
Eelco Dolstra 15258b7f50 * Disable make check.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13937
2009-02-01 21:21:21 +00:00
Eelco Dolstra c1579d2e78 * stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
2009-01-16 10:59:27 +00:00
Ludovic Courtès c18603c3b3 GDB: Use the system Readline library.
svn path=/nixpkgs/trunk/; revision=13746
2009-01-12 18:06:32 +00:00
Michael Raskin f87ad9b663 Autoconf 2.13 (older version used by Mozilla)
svn path=/nixpkgs/trunk/; revision=13691
2009-01-03 13:42:36 +00:00
Marc Weber 1b30419aa6 added yodl, dependency for zsh documentation
svn path=/nixpkgs/trunk/; revision=13669
2008-12-22 18:36:02 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Eelco Dolstra 0cf7b1c811 * Latest strace.
svn path=/nixpkgs/trunk/; revision=13607
2008-12-10 17:09:11 +00:00
Eelco Dolstra e31341510d * Merged from the trunk. Let's see how well this works with
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
2008-12-10 09:59:21 +00:00
Ludovic Courtès 3918c63518 GNU Automake 1.10.2.
svn path=/nixpkgs/trunk/; revision=13562
2008-12-03 08:32:47 +00:00
Marc Weber fd3148dd5e new version icon-naming-utils-0.8.2
svn path=/nixpkgs/trunk/; revision=13551
2008-12-02 12:27:55 +00:00
Marc Weber 1a4a270855 bumped intltool to version 0.40.5
svn path=/nixpkgs/trunk/; revision=13434
2008-11-26 14:38:05 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Michael Raskin c5363217ad meta.function -> passthru.function, not killing other contents of passthru
svn path=/nixpkgs/trunk/; revision=13190
2008-11-04 21:24:10 +00:00
Ludovic Courtès 6e9e3c0cc6 GNU Libtool 1.5.x: Add `meta' attribute.
svn path=/nixpkgs/trunk/; revision=13178
2008-11-03 10:23:33 +00:00
Ludovic Courtès fccfff91dd GNU Libtool 2.x: Add `meta' attribute.
svn path=/nixpkgs/trunk/; revision=13177
2008-11-03 10:22:41 +00:00
Ludovic Courtès e967438c48 Add GNU Libtool 2.2.x.
svn path=/nixpkgs/trunk/; revision=13176
2008-11-03 10:15:37 +00:00
Ludovic Courtès c4df2f80d5 GNU M4 1.4.12.
Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13142
2008-10-29 08:58:48 +00:00
Ludovic Courtès c0892721d0 GNU Binutils 2.19.
Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13141
2008-10-29 08:57:58 +00:00
Ludovic Courtès 79bcd85e81 GNU cflow: Fix reference to `cpp'.
svn path=/nixpkgs/trunk/; revision=13132
2008-10-28 10:25:10 +00:00