Commit graph

2167 commits

Author SHA1 Message Date
Rob Vermaas
3f9e764096 DBD-Pg 2.13.1
svn path=/nixpkgs/trunk/; revision=15350
2009-04-28 11:57:34 +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
dbc8b414be * Urgh.
svn path=/nixpkgs/trunk/; revision=15331
2009-04-27 09:27:15 +00:00
Eelco Dolstra
03844a3d9b * Revert to Qt 4.4.3. 4.5.1 breaks KDE 4.2.2. See e.g.
http://rdieter.fedorapeople.org/qt451_oxygen_borkage-2.jpg
  and also https://bugs.kde.org/show_bug.cgi?id=190485
  ("You're not meant to use Qt 4.5.1 with KDE 4.2.2.").
  Apparently this will be fixed in Qt 4.5.2.

svn path=/nixpkgs/trunk/; revision=15330
2009-04-27 09:25:48 +00:00
Marc Weber
761e653515 reenable curl support for php
-lssl was missing

svn path=/nixpkgs/trunk/; revision=15327
2009-04-27 01:18:03 +00:00
Eelco Dolstra
5a2284ac61 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Lluís Batlle i Rossell
1f8e1f296d Updating freeimage and vxl.
svn path=/nixpkgs/trunk/; revision=15307
2009-04-25 16:21:56 +00:00
Andres Löh
922c14e372 Added MonadRandom Haskell package.
svn path=/nixpkgs/trunk/; revision=15305
2009-04-25 15:33:37 +00:00
Andres Löh
2a1fae29f8 Added some SDL-related Haskell libs.
svn path=/nixpkgs/trunk/; revision=15304
2009-04-25 15:33:29 +00:00
Sander van der Burg
d1a57e454e Fixed version number of qt
svn path=/nixpkgs/branches/stdenv-updates/; revision=15303
2009-04-25 15:07:46 +00:00
Sander van der Burg
5ad095f5ed Upgraded to qt-4.5.1
svn path=/nixpkgs/branches/stdenv-updates/; revision=15302
2009-04-25 14:54:14 +00:00
Andres Löh
66f3af0bdd ghc-wrapper now detects installed pkgs automatically.
svn path=/nixpkgs/trunk/; revision=15301
2009-04-25 14:23:00 +00:00
Eelco Dolstra
96443f794e * Unfortunately, the Gentoo mirror of the attr library is no more
stable than the SGI source.  So we'll mirror it ourselves.  Thanks
  to Matthew Curry for reporting this.

svn path=/nixpkgs/trunk/; revision=15289
2009-04-24 20:27:54 +00:00
Andres Löh
2bb2373cf9 Try to link readline Haskell package against ncursesw.
svn path=/nixpkgs/trunk/; revision=15284
2009-04-23 17:48:06 +00:00
Andres Löh
cea9c12283 Trying to update haxr, but not finished.
svn path=/nixpkgs/trunk/; revision=15283
2009-04-23 17:48:03 +00:00
Andres Löh
cd018e50d4 64bit support in Cabal builder
svn path=/nixpkgs/trunk/; revision=15282
2009-04-23 17:21:14 +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
0f10222e4e * Merge libjpeg and libjpeg-static.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15275
2009-04-23 13:26:14 +00:00
Eelco Dolstra
7a891eabe2 * Apparently the pythondir hack isn't needed with libxml2 2.7.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15272
2009-04-23 12:35:36 +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
acd26a3353 * Fixed the gphoto2 build.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15267
2009-04-23 11:12:25 +00:00
Michael Raskin
35bb7d6412 Python-not-2.4 support for libxml2
svn path=/nixpkgs/trunk/; revision=15265
2009-04-23 10:24:40 +00:00
Eelco Dolstra
686ed295da * Disable curl support in PHP - it breaks for some reason.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15263
2009-04-23 09:56:15 +00:00
Eelco Dolstra
c274d068e4 * Fix neon.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15261
2009-04-22 23:15:00 +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
2021063052 Adding vwm, the console window manager.
svn path=/nixpkgs/trunk/; revision=15255
2009-04-22 21:33:24 +00:00
Eelco Dolstra
9609437573 * ffmpeg needs --enable-shared.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15254
2009-04-22 19:20:27 +00:00
Eelco Dolstra
7e4dcb6c2b * Urgh. Perl is built during the stdenv bootstrap, where we don't
have libpthread.  So don't build with thread support there.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15253
2009-04-22 17:44:44 +00:00
Eelco Dolstra
a98d8aee74 * Install Perl modules in $out/lib/perl5. This is what Perl wants by
default, but it didn't happen in Nixpkgs because the string "perl"
  appeared in the prefix, and in that case Perl uses $out/lib.
* Enable thread-safe Perl while we're at it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15252
2009-04-22 17:37:21 +00:00
Eelco Dolstra
8b28c599a3 * Removed the hack to fix the installation path of some Perl
packages.  Turns out that those packages set INSTALLDIRS=perl, so we
  override it to INSTALLDIRS=site.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15251
2009-04-22 17:32:57 +00:00
Ludovic Courtès
26c3fe186f Glibc 2.9: Have rpcgen(1) look for cpp(1) in $PATH.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15244
2009-04-22 12:55:47 +00:00
Eelco Dolstra
47b27a6c00 * `mv .../* ...' no longer works if nullglob is on. However, the real
WTF is that the Perl module installation path suddenly has changed
  from $out/lib/site_perl to $out/lib/perl5/site_perl.  Investigating...

svn path=/nixpkgs/branches/stdenv-updates/; revision=15241
2009-04-22 07:41:31 +00:00
Eelco Dolstra
78fbf85483 * popt updated to 1.15.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15238
2009-04-22 07:16:45 +00:00
Eelco Dolstra
ac1d4fcdc5 * Strange configure script; add an explicit --disable-static.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15237
2009-04-22 07:05:50 +00:00
Eelco Dolstra
4af55f9dc8 * Jasper needs an explicit --enable-shared.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15236
2009-04-22 07:05:09 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra
ff057f0d07 * Build libperl.so.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15233
2009-04-21 22:38:52 +00:00
Eelco Dolstra
1966dded62 * OpenSSL 0.9.8k.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15232
2009-04-21 22:37:56 +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
Andres Löh
d2067c300f Updated editline for Haskell.
svn path=/nixpkgs/trunk/; revision=15229
2009-04-21 21:19:49 +00:00
Andres Löh
8cfa1a5034 Added readline package for Haskell.
svn path=/nixpkgs/trunk/; revision=15228
2009-04-21 21:12:56 +00:00
Andres Löh
d3b5bc4a20 * Fixed external library dependencies for some Haskell-Platform packages.
* Added Agda plus dependencies.

svn path=/nixpkgs/trunk/; revision=15227
2009-04-21 21:05:30 +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
1b3ee8bf6c Adding libewf.
svn path=/nixpkgs/trunk/; revision=15225
2009-04-21 19:47:41 +00:00
Lluís Batlle i Rossell
ff0483b3d8 Adding gtkdialog.
svn path=/nixpkgs/trunk/; revision=15224
2009-04-21 19:47:30 +00:00
Lluís Batlle i Rossell
a6e86e241f Updating lua5.
svn path=/nixpkgs/trunk/; revision=15223
2009-04-21 19:47:20 +00:00
Eelco Dolstra
0ebb410014 * Remove all the mesaSupported assertions.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15202
2009-04-20 22:06:12 +00:00
Lluís Batlle i Rossell
15f1feb702 Fixing mesa and xorgserver
svn path=/nixpkgs/branches/stdenv-updates/; revision=15199
2009-04-20 18:46:32 +00:00
Lluís Batlle i Rossell
2eb865a98f Fixing libdrm build
svn path=/nixpkgs/branches/stdenv-updates/; revision=15198
2009-04-20 18:43:08 +00:00
Eelco Dolstra
d2d05dc868 * libdrm 2.4.9.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15196
2009-04-20 18:09:15 +00:00
Eelco Dolstra
e05a069de9 * Mesa 7.4.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15195
2009-04-20 18:08:51 +00:00
Eelco Dolstra
077b0157a0 * Updated the generator to handle some missing dependencies.
Also updated some X.org packages (notably xorg-server)
  as well as freetype.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15191
2009-04-20 16:02:50 +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
Rob Vermaas
a00ef2d247 updated strategoxt 0.17pre to bootstrap build
svn path=/nixpkgs/trunk/; revision=15188
2009-04-20 14:49:51 +00:00
Andres Löh
035d7cb965 * Updated lhs2TeX.
* Propagated build inputs of Haskell pkgs are now automatically
  propagated user-env pkgs.
* Updated haskell-platform slightly.

svn path=/nixpkgs/trunk/; revision=15184
2009-04-20 14:23:50 +00:00
Andres Löh
3fd1093d2d xmonad and xmobar updates
svn path=/nixpkgs/trunk/; revision=15180
2009-04-20 13:01:34 +00:00
Andres Löh
f4cdb54fd3 Added vacuum and vacuum-cairo packages.
svn path=/nixpkgs/trunk/; revision=15179
2009-04-20 13:01:31 +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
Eelco Dolstra
ac24816344 * Move all the Perl packages out of all-packages.nix into a separate
file, perl-packages.nix.

svn path=/nixpkgs/trunk/; revision=15171
2009-04-20 12:08:09 +00:00
Sander van der Burg
63e318390d Fixed arts compilation with gcc 4.3.x
svn path=/nixpkgs/branches/stdenv-updates/; revision=15170
2009-04-20 11:49:54 +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
Eelco Dolstra
e72b00b2d7 * Leksah: forgot to commit. Also, use makeWrapper to set
XDG_DATA_DIRS to gtksourceview; otherwise, gtksourceview can't find
  its syntax highlighting files.
* Updated gtk2hs to the latest version from Darcs.  Otherwise Leksah
  crashes on GHC 6.10.2.

svn path=/nixpkgs/trunk/; revision=15162
2009-04-19 19:06:34 +00:00
Andres Löh
8b678d5308 Added final(?) set of Haskell Platform packages.
svn path=/nixpkgs/trunk/; revision=15160
2009-04-19 16:26:27 +00:00
Eelco Dolstra
e1cfa22536 * Let's see how far we get with separate locales.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15158
2009-04-19 16:07:00 +00:00
Eelco Dolstra
35e42d3e5c * Fix missing description errors.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15157
2009-04-19 16:00:46 +00:00
Andres Löh
6aa0719e53 OpenGL package
svn path=/nixpkgs/trunk/; revision=15156
2009-04-19 15:56:45 +00:00
Eelco Dolstra
40f01daa81 * A function to build Glibc's locale-archive separately from Glibc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15155
2009-04-19 15:28:37 +00:00
Eelco Dolstra
6e789bc2c8 * Added Leksah, an IDE for Haskell. It requires a newer version of
gtksourceview than the one provided in gnome/default.nix.  The
  stdenv branch already has this.
* Updated gtk2hs to 0.10.1.

svn path=/nixpkgs/trunk/; revision=15154
2009-04-19 13:58:13 +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
35ac416328 More Haskell platform packages.
svn path=/nixpkgs/trunk/; revision=15151
2009-04-19 13:21:40 +00:00
Eelco Dolstra
2a7ff23a8f * A patch to Glibc to allow the location of locale-archive to be
overriden at runtime (not enabled yet, but it works).  This will
  allow us to build Glibc with no or a minimal set of locales (which
  cuts 70 MB from the installed size of Glibc).  The locales that the
  user actually needs can then be built separately and enabled by
  setting the environment variable LOCALE_ARCHIVE.  For instance, on
  NixOS, we could set it to something like
  /var/run/current-system/locale-archive.  For setuid applications,
  the variable is ignored.

  This is especially useful on 64-bit systems, because there we tend
  to have *two* copies of locale-archive (namely in the 32-bit and
  64-bit builds of Glibc).  Having only one copy allows at least 70 MB
  to be cut from the NixOS installation CD.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15150
2009-04-19 12:57:23 +00:00
Andres Löh
b148543c3e Towards Haskell Platform support.
svn path=/nixpkgs/trunk/; revision=15148
2009-04-19 11:44:37 +00:00
Eelco Dolstra
5cfba3ac68 * Added GHC 6.10.1.
svn path=/nixpkgs/trunk/; revision=15147
2009-04-19 11:43:38 +00:00
Lluís Batlle i Rossell
e0b8a630a8 Fixing boost for a problem related to a "class R shadowing template...".
Taken from: http://wiki.freebsd.org/BoostPortingProject

svn path=/nixpkgs/trunk/; revision=15146
2009-04-19 11:20:51 +00:00
Eelco Dolstra
1c1967a9a1 * Call the wrapper "ghc-wrapper".
svn path=/nixpkgs/trunk/; revision=15143
2009-04-19 10:26:45 +00:00
Andres Löh
1643888f80 Added cabalized darcs-2 and associated Haskell libs.
svn path=/nixpkgs/trunk/; revision=15141
2009-04-19 10:07:41 +00:00
Eelco Dolstra
fd473913f5 * Removed some obsolete nullglobs.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15140
2009-04-19 08:55:27 +00:00
Eelco Dolstra
01fdf66360 * Turning on nullglob revealed an unintended wildcard expansion in
dbus' patchPhase.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15139
2009-04-19 08:54:11 +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
ffcd38403e * Install the package config files under
$out/lib/ghc-pkgs/ghc-<version>/<package>.conf instead of under
  $out/nix-support/ghc-package.conf.  This makes them visible in the
  user's profile when installed with nix-env.

svn path=/nixpkgs/trunk/; revision=15135
2009-04-18 20:24:36 +00:00
Eelco Dolstra
4ce5419f17 * Remove bad backslashes.
svn path=/nixpkgs/trunk/; revision=15134
2009-04-18 20:22:47 +00:00
Eelco Dolstra
ca8b45d441 * Cabal builder: put the GHC version in the default name attribute to
disambiguate between package instances built with different GHCs.

svn path=/nixpkgs/trunk/; revision=15132
2009-04-18 16:21:59 +00:00
Sander van der Burg
8f2e9e8634 Added iso-codes package
svn path=/nixpkgs/branches/stdenv-updates/; revision=15129
2009-04-18 15:47:41 +00:00
Eelco Dolstra
baad5d7cb4 * GHC setup hook: don't generate wrappers around ghc etc., instead
set GHC_PACKAGE_PATH.
* Let Cabal generate a package configuration file
  ($out/nix-support/ghc-package.conf) instead of a registration
  script.

svn path=/nixpkgs/trunk/; revision=15127
2009-04-18 15:23:00 +00:00
Eelco Dolstra
cee387e845 * Move the composition of Haskell packages out of all-packages.nix
into haskell-packages.nix, which depends on an instance of GHC.
  This allows a consistent set of packages to be built with the same
  GHC.  For instance,

  $ nix-build -A haskellPackages_ghc683.xmonad

  builds xmonad and all its dependencies with GHC 6.8.3, while

  $ nix-build -A haskellPackages_ghc6102.xmonad

  does the same with GHC 6.10.2.  This is the same technique used with
  kernelPackages.  It also means that we don't need things like
  "cabal682" and "cabal683" anymore.

* The setup hook is now in a separate wrapper package so that we don't
  have to recompile all of GHC every time we want to make a small
  change.

* cinelerra: this package appears to have an accidental dependency on
  the "X11" Haskell package.

svn path=/nixpkgs/trunk/; revision=15125
2009-04-18 12:47:11 +00:00
Eelco Dolstra
95a472cd55 * Doh.
svn path=/nixpkgs/trunk/; revision=15121
2009-04-17 19:46:28 +00:00
Eelco Dolstra
6f2da398be * Revert to GHC 6.10.1 binary for bootstrapping GHC 6.10.2 at Andres'
suggestion.  It's good to use an older GHC for bootstrapping because
  old versions can build newer versions but not vice versa.

svn path=/nixpkgs/trunk/; revision=15120
2009-04-17 19:43:05 +00:00
Sander van der Burg
dc192d36fe Added iso-codes package
svn path=/nixpkgs/trunk/; revision=15117
2009-04-17 15:08:14 +00:00
Peter Simons
047f6d20d5 Updated CMake to version 2.6.3.
svn path=/nixpkgs/trunk/; revision=15114
2009-04-17 13:48:22 +00:00
Peter Simons
2796d3a185 Updated fixCmakeFiles to handle file paths that contain whitespace.
svn path=/nixpkgs/trunk/; revision=15113
2009-04-17 13:48:11 +00:00
Sander van der Burg
549a829dec Fixed typo in URL
svn path=/nixpkgs/branches/stdenv-updates/; revision=15111
2009-04-17 11:08:18 +00:00
Ludovic Courtès
5bed8bd9e1 Add simplejson, a JSON encoded/decoded for Python.
svn path=/nixpkgs/trunk/; revision=15110
2009-04-17 09:06:42 +00:00
Ludovic Courtès
0d067c287b Add Foolscap, a distributed capability RPC protocol.
svn path=/nixpkgs/trunk/; revision=15109
2009-04-16 22:59:14 +00:00
Eelco Dolstra
ad07109bba * Added GHC 6.10.2.
svn path=/nixpkgs/trunk/; revision=15106
2009-04-16 22:00:41 +00:00
Ludovic Courtès
59db4694f2 Add Nevow, a webby Python thingie.
svn path=/nixpkgs/trunk/; revision=15104
2009-04-16 21:48:36 +00:00
Sander van der Burg
37c66308e4 Upgraded arts to 1.5.10
svn path=/nixpkgs/trunk/; revision=15103
2009-04-16 20:27:01 +00:00
Eelco Dolstra
dae40d9c62 * GHC apparently works with Perl 5.10 now.
svn path=/nixpkgs/trunk/; revision=15101
2009-04-16 19:59:41 +00:00