Commit graph

861 commits

Author SHA1 Message Date
Peter Simons a34580133a doxygen: qt depends on udev(!), so we cannot build the doxygen GUI on other Unix variants
svn path=/nixpkgs/trunk/; revision=28448
2011-08-09 23:35:21 +00:00
Peter Simons 3685cea8e9 Updated (almost) all Haskell package expressions with cabal2nix.
The new files ...

 * conform to the coding guidelines,

 * consistently specify meta.maintainers and meta.platforms,

 * have proper descriptions and licenses as specified in their Cabal file, and

 * take advantage of the new cabal.nix extensions, i.e. proper
   distinction between buildInputs and propagatedBuildInputs.

Furthermore, the following updates were performed:

 * haskell-Ranged-sets: updated to version 0.3.0
 * haskell-Shellac-haskeline: updated to version 0.2.0.1
 * haskell-cpphs: updated to version 1.12
 * haskell-hslogger: updated to version 1.1.5
 * haskell-xml: updated to version 1.3.9
 * haskell-HDBC-postgresql: updated to version 2.3.2.0
 * haskell-HDBC-sqlite3: updated to version 2.3.3.0
 * haskell-HDBC: updated to version 2.3.1.0
 * haskell-base-unicode-symbols: updated to version 0.2.2.1
 * haskell-convertible: updated to version 1.0.11.0
 * haskell-monad-control: updated to version 0.2.0.2
 * haskell-murmur-hash: updated to version 0.1.0.4
 * haskell-repa: updated to version 2.1.1.3
 * haskell-statistics: updated to version 0.9.0.0
 * haskell-ansi-terminal: updated to version 0.5.5

haskell-maybench was dropped, because it cannot be built with recent
versions of Cabal:

   Configuring maybench-0.2.4.1...
   Setup: At least the following dependencies are missing:
   Cabal >=1.2 && <1.5

svn path=/nixpkgs/trunk/; revision=28446
2011-08-09 23:00:20 +00:00
Peter Simons c13f967ed5 Replaced the obsolete 'haskellPlatforms' attribute with the platforms exported by GHC.
svn path=/nixpkgs/trunk/; revision=28418
2011-08-09 09:54:50 +00:00
Andres Löh 23e5a11a1d Updated a few Haskell packages.
svn path=/nixpkgs/trunk/; revision=28399
2011-08-08 19:02:17 +00:00
Peter Simons e29935f9b3 hlint: updated to version 1.8.13
svn path=/nixpkgs/trunk/; revision=28231
2011-08-07 18:22:13 +00:00
Andres Löh 8fdb3c9e63 Make ghc-7.0.4 the default. Add experimental ghc-7.2.1rc1.
svn path=/nixpkgs/trunk/; revision=28163
2011-08-05 08:52:35 +00:00
Eelco Dolstra fcce78c0f4 * Sync with the trunk.
svn path=/nixpkgs/branches/kde-4.7/; revision=28144
2011-08-03 22:00:49 +00:00
Peter Simons 21b8ff7aee haskell-packages.nix: added bnfc version 2.4
svn path=/nixpkgs/trunk/; revision=28132
2011-08-03 07:49:21 +00:00
Eelco Dolstra 1b427fe052 * Sync with the trunc.
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
2011-07-31 19:44:58 +00:00
Eelco Dolstra 35781b1bf3 * Cmake 2.8.5 doesn't build on i686-linux
(http://hydra.nixos.org/build/1181148), so revert to 2.8.4 for now.

svn path=/nixpkgs/branches/kde-4.7/; revision=27990
2011-07-28 14:09:16 +00:00
Eelco Dolstra 489d1be918 * Cmake updated to 2.8.5. Also added a patch that prevents Cmake from
looking in /usr and similar locations.  However, it *will* now look
  in the Nixpkgs Glibc lib and include directories.  This ensures that
  find_library can find libraries in Glibc.

svn path=/nixpkgs/branches/kde-4.7/; revision=27884
2011-07-21 18:21:38 +00:00
Ludovic Courtès 9c2f9fd2f2 GNU Bison 2.5.
svn path=/nixpkgs/trunk/; revision=27813
2011-07-18 08:36:01 +00:00
Eelco Dolstra f4ac1126ff * Sync with the trunk.
svn path=/nixpkgs/branches/kde-4.7/; revision=27796
2011-07-15 10:02:22 +00:00
Peter Simons 13e0b7bbed Revert "cmake: updated to version 2.8.5".
The latest version doesn't compile on Hydra. It does compile on my
machine, though. Not sure what happened.

svn path=/nixpkgs/trunk/; revision=27699
2011-07-10 22:21:39 +00:00
Peter Simons 03446e108d cmake: updated to version 2.8.5
svn path=/nixpkgs/trunk/; revision=27696
2011-07-10 20:17:38 +00:00
Eelco Dolstra 32abd0987d * doxygen: only build the Qt GUI in doxygen_gui.
svn path=/nixpkgs/branches/kde-4.7/; revision=27641
2011-07-07 20:02:59 +00:00
Eelco Dolstra eedbc3ce5a * Whitepace.
svn path=/nixpkgs/branches/kde-4.7/; revision=27630
2011-07-07 17:24:53 +00:00
Ludovic Courtès 4d7d10da6b GNU Automake: Append `-I' flags stemming from $ACLOCAL_PATH instead of prepending them.
See <http://lists.gnu.org/archive/html/bug-gnulib/2011-07/msg00100.html>
for an illustration of the bug.

svn path=/nixpkgs/trunk/; revision=27622
2011-07-07 15:10:40 +00:00
Ludovic Courtès 7b34224abd Update Hydra.
svn path=/nixpkgs/trunk/; revision=27598
2011-07-04 14:44:54 +00:00
Ludovic Courtès 08e6c13dee GNU GLOBAL 5.9.7.
svn path=/nixpkgs/trunk/; revision=27587
2011-07-04 11:52:30 +00:00
Ludovic Courtès 3a8af0ddf7 GNU Libtool: Use dontStrip' instead of the non-existent dontNativeStrip'.
svn path=/nixpkgs/trunk/; revision=27571
2011-07-01 10:11:06 +00:00
Ludovic Courtès 3da30b6770 GNU Libtool: Don't run the native `strip' when cross-compiling.
svn path=/nixpkgs/trunk/; revision=27568
2011-07-01 07:42:23 +00:00
Florian Friesdorf c53fc3b65e jscoverage-0.5.1
svn path=/nixpkgs/trunk/; revision=27508
2011-06-21 07:28:30 +00:00
Eelco Dolstra ce3cb35e53 * strace updated to 4.6.
svn path=/nixpkgs/trunk/; revision=27473
2011-06-15 13:28:04 +00:00
Sander van der Burg 22b9fd78a4 Fixed the comments tool
svn path=/nixpkgs/trunk/; revision=27469
2011-06-15 12:04:31 +00:00
Eelco Dolstra 12c9ba62ac * Fix some evaluation problems.
svn path=/nixpkgs/trunk/; revision=27457
2011-06-14 15:55:11 +00:00
Sander van der Burg 7f26b06961 Added ninka, an experimental sentence based license detector
svn path=/nixpkgs/trunk/; revision=27455
2011-06-14 15:15:34 +00:00
Ludovic Courtès d45757e581 Hydra: Update.
svn path=/nixpkgs/trunk/; revision=27454
2011-06-14 12:32:19 +00:00
Nicolas Pierron f76edfb1e1 gdb: Add support for python instrumentation.
svn path=/nixpkgs/trunk/; revision=27446
2011-06-14 02:39:03 +00:00
Ludovic Courtès 0d67ee1913 GNU GLOBAL 5.9.6.
svn path=/nixpkgs/trunk/; revision=27439
2011-06-13 20:52:26 +00:00
Rob Vermaas 0ccfc552f5 update hydra
svn path=/nixpkgs/trunk/; revision=27403
2011-06-09 13:43:02 +00:00
Ludovic Courtès 97675e8344 Add GNU Complexity.
svn path=/nixpkgs/trunk/; revision=27344
2011-06-04 21:46:07 +00:00
Ludovic Courtès 0add50ed1b GNU GLOBAL 5.9.5.
svn path=/nixpkgs/trunk/; revision=27321
2011-05-30 21:48:55 +00:00
Peter Simons db7c4adb80 doxygen: updated to version 1.7.4
svn path=/nixpkgs/trunk/; revision=27157
2011-05-05 09:43:21 +00:00
Eelco Dolstra 92bf0b92d3 * Provide "null" defaults for the optional dependencies, otherwise
binutilsCross gives an evaluation error.

svn path=/nixpkgs/trunk/; revision=27138
2011-05-04 12:22:56 +00:00
Rob Vermaas 8f7cab5d5c add some versions of cppunit/boost/protobuf, added binutils with gold, added nlopt
svn path=/nixpkgs/trunk/; revision=27132
2011-05-04 10:03:46 +00:00
Michael Raskin 8a00dfcc18 Update teeworlds
svn path=/nixpkgs/trunk/; revision=26814
2011-04-13 05:47:51 +00:00
Lluís Batlle i Rossell 6cfba00e1b Adding giv.
svn path=/nixpkgs/trunk/; revision=26709
2011-04-06 10:00:48 +00:00
Lluís Batlle i Rossell 48748dedcb Adding the rally game Trigger. As a side effect, I add jam.
svn path=/nixpkgs/trunk/; revision=26615
2011-03-30 18:45:11 +00:00
Peter Simons 05474e174b cmake: updated meta.platforms to reflect the fact that CMake is supposed to build on all Unix-like platforms
svn path=/nixpkgs/trunk/; revision=26512
2011-03-25 12:55:33 +00:00
Peter Simons 5ba10a94e1 cmake: add install_name_tool on Darwin to fix the build
svn path=/nixpkgs/trunk/; revision=26511
2011-03-25 12:55:29 +00:00
Ludovic Courtès 497c46e5e5 Hydra: Update.
svn path=/nixpkgs/trunk/; revision=26323
2011-03-15 14:01:33 +00:00
Ludovic Courtès 2dcf4fbfcc Hydra: Update.
svn path=/nixpkgs/trunk/; revision=26320
2011-03-15 13:42:01 +00:00
Andres Löh 3e0ac9b040 Major Haskell packages overhaul.
Several changes, some highlights:

  * Structure of haskell-packages.nix updated. It's now easier to
    select different default versions of packages for different
    versions of GHC.

  * GHC 7.0.2 is now default.

  * Haskell Platform 2011.2.0.0 has been added and is now default.

  * Several packages have been updated
    (gtk2hs, gitit, xmonad, darcs, ...).

  * Some old packages have been removed.

svn path=/nixpkgs/trunk/; revision=26288
2011-03-12 17:28:15 +00:00
Ludovic Courtès 7b395420a0 GNU DejaGNU 1.5.
svn path=/nixpkgs/trunk/; revision=26285
2011-03-11 19:45:51 +00:00
Ludovic Courtès 69fec8a6a0 GNU GLOBAL 5.9.4.
svn path=/nixpkgs/trunk/; revision=26252
2011-03-10 14:53:24 +00:00
Ludovic Courtès 117c51cf2a Hydra: Update from SVN.
svn path=/nixpkgs/trunk/; revision=26209
2011-03-08 15:01:18 +00:00
Eelco Dolstra 5a437c99d6 * Valgrind 3.6.1.
svn path=/nixpkgs/trunk/; revision=26191
2011-03-07 12:37:01 +00:00
Yury G. Kudryashov 53a7f85871 cmake-2.8.4
svn path=/nixpkgs/trunk/; revision=26137
2011-03-02 18:49:56 +00:00
Ludovic Courtès 7201a275db GNU AutoGen 5.11.6.
svn path=/nixpkgs/trunk/; revision=26060
2011-02-22 13:40:01 +00:00
Yury G. Kudryashov 3b3f50e405 Move automoc4 out of kde-4.x/
kde-4.x/ is for software that is released with kde releases,
not for anything hosted on *.kde.org or in kde svn/git.

svn path=/nixpkgs/trunk/; revision=26048
2011-02-22 06:19:05 +00:00
Yury G. Kudryashov 2e92a0cd12 cmake-2.8.3
svn path=/nixpkgs/trunk/; revision=25859
2011-02-09 21:08:53 +00:00
Ludovic Courtès e314e1f2de GNU Autoconf: Disable tests on Solaris.
svn path=/nixpkgs/trunk/; revision=25671
2011-01-22 22:20:52 +00:00
Ludovic Courtès 0db18b0d5f GNU GLOBAL 5.9.3.
svn path=/nixpkgs/trunk/; revision=25608
2011-01-18 09:34:52 +00:00
Rob Vermaas 6a3c13835c build hydra on linux
svn path=/nixpkgs/trunk/; revision=25568
2011-01-14 14:50:13 +00:00
Rob Vermaas 046125bd1d add hydra
svn path=/nixpkgs/trunk/; revision=25567
2011-01-14 14:47:48 +00:00
Eelco Dolstra 2b464d6e13 * lcov updated to 1.9.
svn path=/nixpkgs/trunk/; revision=25475
2011-01-09 19:24:32 +00:00
Rob Vermaas 431141cb27 only build distcc on linux
svn path=/nixpkgs/trunk/; revision=25416
2011-01-05 10:11:06 +00:00
Rob Vermaas 5b408a85da build cmake only on linux and freebsd
svn path=/nixpkgs/trunk/; revision=25412
2011-01-05 10:04:49 +00:00
Rob Vermaas 7e57ff0c7f only build cflow on linux
svn path=/nixpkgs/trunk/; revision=25410
2011-01-05 09:58:15 +00:00
Karn Kallio 8af7cabe21 Update patchelf 0.6 to latest prerelease 23458.
The older prerelease did not download; Hydra said the product had disappeared.

svn path=/nixpkgs/trunk/; revision=25350
2011-01-02 22:35:02 +00:00
Eelco Dolstra aa6f43149a * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
2010-12-28 16:42:00 +00:00
Marco Maggesi 51d6c8df91 * Handle variable createFindlibDestdir correctly in ocaml-findlib
* Fix HOL Light derivation

svn path=/nixpkgs/trunk/; revision=25269
2010-12-23 19:28:06 +00:00
Eelco Dolstra c14382cb45 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
2010-12-21 15:14:33 +00:00
Marco Maggesi eb33e01ac7 * Add variable createFindlibDestdir to the setupHook of findlib
* Set createFindlibDestdir to various ocaml packages.

svn path=/nixpkgs/trunk/; revision=25220
2010-12-21 09:37:35 +00:00
Marco Maggesi 2c85e4b96f * Remove the automatic creation of a directory from the setupHook of findlib since this can silently produce empty paths in derivations
svn path=/nixpkgs/trunk/; revision=25219
2010-12-21 08:33:37 +00:00
Marco Maggesi e7accaf8d3 * Update camlp5
svn path=/nixpkgs/trunk/; revision=25206
2010-12-20 10:32:22 +00:00
Marco Maggesi d3f00b9cf5 * Add findlib to hydra
svn path=/nixpkgs/trunk/; revision=25205
2010-12-20 09:53:41 +00:00
Ludovic Courtès ac9fac1ba1 GNU Binutils 2.21.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25091
2010-12-12 23:35:16 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Marco Maggesi ac457478e3 * Add ocaml packages findlib, camlzip, ocaml-ssl, ocaml-batteries, menhir, camomile, ocaml-lwt, cryptokit, ocaml-cryptgps, ounit, ocaml-react
svn path=/nixpkgs/trunk/; revision=25041
2010-12-09 15:40:04 +00:00
Peter Simons baa9150130 pkgs/development/tools/build-managers/scons: cosmetic build improvements
- The flag "--mandir" has no effect with setup.py. Instead, "--install-data"
   must be used.

 - Don't generate wrappers for trivial symlink aliases in bin.

 - Prefer symlinks over hard-links.

 - The dependencies of this expression don't need to be propagated.

svn path=/nixpkgs/trunk/; revision=25021
2010-12-07 11:41:25 +00:00
Peter Simons 747604d740 pkgs/development/tools/misc/distcc: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25011
2010-12-06 18:01:40 +00:00
Peter Simons e47468ce76 pkgs/development/tools/documentation/doxygen: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25010
2010-12-06 18:01:34 +00:00
Peter Simons 1e1610b37e pkgs/development/tools/build-managers/scons: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25009
2010-12-06 18:01:28 +00:00
Lluís Batlle i Rossell cd9d91306c Fixing the dependency of cscope on 'emacs'.
On the other hand, cross-building emacs fails even to evaluate. I did not investigate.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24970
2010-12-04 21:43:24 +00:00
Lluís Batlle i Rossell cf79eb4d89 Making gdb cross-build (python apart)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24965
2010-12-04 10:35:04 +00:00
Ludovic Courtès 0d122e7c6f OProfile: Add dependency on zlib.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24925
2010-11-29 17:42:50 +00:00
Lluís Batlle i Rossell 1cb59660e0 Removing valgrind patches, as we got a recent valgrind already.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24853
2010-11-25 09:32:12 +00:00
Michael Raskin 31b22ed108 Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24820
2010-11-23 08:57:29 +00:00
Lluís Batlle i Rossell 8cd20e6f61 Adding valkyrie, a frontend for some valgrind 3.6 tools.
svn path=/nixpkgs/trunk/; revision=24815
2010-11-22 19:10:15 +00:00
Michael Raskin 6af8a1debd Merging from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
2010-11-22 11:39:42 +00:00
Lluís Batlle i Rossell e8320167d2 Updating valgrind to 3.6.0
svn path=/nixpkgs/trunk/; revision=24803
2010-11-22 09:03:22 +00:00
Lluís Batlle i Rossell c1620ef552 Fixing a stdenv problem... 'binutils' where linked with zlib from
bootstrap-tools, because zlib was there and binutils were not having an
explicit buildInput for zlib. Due to that, we ended up with stdenv
(gcc-wrapper) depending on bootstrap-tools as runtime dependency.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24790
2010-11-21 14:29:20 +00:00
Michael Raskin fb58f74d82 Updating from trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
2010-11-17 17:03:09 +00:00
Russell O'Connor 7f27566ef5 Adding wrapper to get users packages
Haddock calls directly into ghclib by passing our carefully crafted ghc-wrapper.
This means that haddock needs to be wrapped itself, which this patch does.

svn path=/nixpkgs/trunk/; revision=24716
2010-11-17 00:18:39 +00:00
Ludovic Courtès e729128faa GNU Make 3.82: Ignore test failures on Darwin.
See <http://hydra.nixos.org/build/740597/nixlog/1/raw>.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24626
2010-11-09 13:12:26 +00:00
Ludovic Courtès 7ecc652da4 Re-add GNU Make 3.81.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24623
2010-11-09 09:14:07 +00:00
Lluís Batlle i Rossell f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Peter Simons 4f784157f1 pkgs/development/tools/misc/distcc: allow users to override sysconfdir
svn path=/nixpkgs/trunk/; revision=24486
2010-10-26 11:14:40 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Russell O'Connor 9bcb9bcea1 Patching scons to give an absolute path to python rather than using ".../bin/env python"
When users install scons, users no longer need to also install python in their environment.


svn path=/nixpkgs/trunk/; revision=24425
2010-10-22 19:10:02 +00:00
Lluís Batlle i Rossell 18372e5a56 Reverting the patch that disabled using the 'binutils snapshot', because it's
needed for the fuloong minipc. It was not enough having the loongson2f patches;
only having the patches, we got troubles building cups with a segfault on the
dynamic loader running their 'genstrings' program.  And if sysvinit needs newer
binutils (I can't remember why, but I wrote it in the all-packages.nix before),
then let's use the snapshot.

As a note about "why this snapshot" (civodul was interested), when I knew that
we needed an unreleased version of binutils I went to download the snapshot of
the day. And it worked. This is all the story.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24229
2010-10-11 23:18:00 +00:00
Lluís Batlle i Rossell aedebd300f Fixing the binutils expression and patches, so they work fine.
I also added some comments on why these patches.
Now I tested that the patches work.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24165
2010-10-07 22:45:28 +00:00
Lluís Batlle i Rossell bdb096bb92 Instead of using binutils snapshot for the loongson2f, let's use the released version + patches.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24164
2010-10-07 22:44:18 +00:00
Ludovic Courtès 71d0ed964e GNU Libtool 2.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24162
2010-10-07 22:29:20 +00:00
Ludovic Courtès f93e0b7517 GNU M4 1.4.15.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24161
2010-10-07 22:29:15 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Ludovic Courtès d6c74382d9 GNU Autoconf 2.68.
svn path=/nixpkgs/trunk/; revision=24104
2010-10-05 22:08:58 +00:00
Andres Löh 657572abc8 Added new (modular) gtk2hs and threadscope.
svn path=/nixpkgs/trunk/; revision=24086
2010-10-05 17:30:17 +00:00