Commit graph

609 commits

Author SHA1 Message Date
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
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
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 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
Ludovic Courtès 43f4d29bb8 Add FastJar.
svn path=/nixpkgs/trunk/; revision=16469
2009-07-27 10:43:20 +00:00
Andres Löh df8def8dfb Added HAppS and gitit plus dependencies.
svn path=/nixpkgs/trunk/; revision=16419
2009-07-18 15:25:28 +00:00
Peter Simons 2ec77fdc7e scons: don't overwrite a pre-existing PYTHONPATH in the wrapper
svn path=/nixpkgs/trunk/; revision=16342
2009-07-13 20:08:44 +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 676f4c4e2d haskellPackages: adding bytestring, networkBytestring, getOptions, ghcSyb, hslogger, tar
svn path=/nixpkgs/trunk/; revision=16296
2009-07-09 22:24:02 +00:00
Peter Simons afa04f4576 Updated scons to version 1.2.0.
svn path=/nixpkgs/trunk/; revision=16111
2009-06-30 18:51:01 +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
Rob Vermaas e89d4a39c6 * added checkstyle, pmd, jdepends.
* changed version of ant to 1.7

svn path=/nixpkgs/trunk/; revision=15995
2009-06-18 12:52:10 +00:00
Rob Vermaas c1c7dce5d5 * added checkstyle, pmd, jdepends.
* changed version of ant to 1.7

svn path=/nixpkgs/trunk/; revision=15994
2009-06-18 12:51:51 +00:00
Lluís Batlle i Rossell 4855ff6979 Updating radare.
svn path=/nixpkgs/trunk/; revision=15966
2009-06-15 18:37:31 +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
Lluís Batlle i Rossell 3fae4aa6b3 Updating radare to 1.4.
svn path=/nixpkgs/trunk/; revision=15847
2009-06-03 19:45:38 +00:00
Lluís Batlle i Rossell 94d2e57c62 Trying to fix the cmake-qt problems, fixing cmake's FindQt4. Paraview now builds beyond 25%, while
before it didn't. Through this commit I expect the build farm to try to build kde, and see
whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook.

svn path=/nixpkgs/trunk/; revision=15838
2009-06-03 09:19:19 +00:00
Andres Löh 107d41f96c New Haskell Platform release.
svn path=/nixpkgs/trunk/; revision=15837
2009-06-03 08:44:41 +00:00
Lluís Batlle i Rossell 07caf9a9bd Updated cmake
svn path=/nixpkgs/trunk/; revision=15807
2009-05-31 08:34:57 +00:00
Marc Weber f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
2009-05-24 10:57:41 +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
Lluís Batlle i Rossell 166f375bd2 Fixing spin's references to cpp
svn path=/nixpkgs/trunk/; revision=15478
2009-05-06 21:03:49 +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
Lluís Batlle i Rossell ef25944cdb Updating tcl/tk
svn path=/nixpkgs/trunk/; revision=15434
2009-05-03 14:35:56 +00:00
Lluís Batlle i Rossell 63c8ccf84c Adding spin
svn path=/nixpkgs/trunk/; revision=15433
2009-05-03 14:35:43 +00:00
Lluís Batlle i Rossell 621b56e233 Radare version bump
svn path=/nixpkgs/trunk/; revision=15349
2009-04-28 10:31:16 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +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
Andres Löh e62cb1aa20 Added HLint plus dependencies.
svn path=/nixpkgs/trunk/; revision=15231
2009-04-21 21:48:10 +00:00
Lluís Batlle i Rossell 672890153e Fixing lua and perl for radare.
svn path=/nixpkgs/trunk/; revision=15230
2009-04-21 21:31:08 +00:00
Lluís Batlle i Rossell 233cf74781 Adding radare
svn path=/nixpkgs/trunk/; revision=15226
2009-04-21 19:47:51 +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
Andres Löh 035c84d06f Haskell package updates.
svn path=/nixpkgs/trunk/; revision=15165
2009-04-19 23:25:58 +00:00
Andres Löh e42598c74b Added Haskell platform meta package.
(Doesn't quite work nicely yet.)

svn path=/nixpkgs/trunk/; revision=15163
2009-04-19 19:18:07 +00:00
Andres Löh 12a05f1638 More Haskell Platform.
svn path=/nixpkgs/trunk/; revision=15153
2009-04-19 13:38:34 +00:00
Andres Löh b148543c3e Towards Haskell Platform support.
svn path=/nixpkgs/trunk/; revision=15148
2009-04-19 11:44:37 +00:00