Commit graph

11370 commits

Author SHA1 Message Date
Eelco Dolstra 4cbec5ca20 * Latest Flash player.
svn path=/nixpkgs/trunk/; revision=23204
2010-08-17 13:13:34 +00:00
Eelco Dolstra ed5011cc02 * Make sure that in an override like:
python = pkgs.python27Full;
    pythonBase = pkgs.python27Base;

  a build of (say) Firefox doesn't depend on python26 as well as
  python27.  This happens because python27Full has this line:

    inherit (xlibs) libX11 xproto;

  which causes python27Full to use libX11 from pkgsOrig, where the
  override hasn't been applied.  The solution is to change it to
  
    inherit (pkgs.xlibs) libX11 xproto;

  In the future, to prevent this, we should make all-packages.nix a
  non-rec set and require all package references to explicitly go
  through pkgs.<attr>.  (Then we can also drop the ugly __overrides
  language "feature".)

svn path=/nixpkgs/trunk/; revision=23203
2010-08-17 11:35:49 +00:00
Peter Simons f99f1bc055 pkgs/top-level/all-packages.nix: lower priority of the various python versions to give preference to pythonWrapper
svn path=/nixpkgs/trunk/; revision=23202
2010-08-17 10:19:48 +00:00
Peter Simons 7b00a8c39f pkgs/development/python-modules/pygtk: move installed python code down one directory hierarchy so that $PYTHONPATH can be guessed
svn path=/nixpkgs/trunk/; revision=23201
2010-08-17 10:18:17 +00:00
Peter Simons f01ceffb9e pkgs/development/interpreters/python/wrapper.nix: clean up debug code
svn path=/nixpkgs/trunk/; revision=23200
2010-08-17 10:17:32 +00:00
Yury G. Kudryashov ee967575e6 Add kdetoys-4.5.0
svn path=/nixpkgs/trunk/; revision=23198
2010-08-17 09:57:03 +00:00
Yury G. Kudryashov 501117b1c5 Rewrite builsystem fixes in upstream-supported manner
svn path=/nixpkgs/trunk/; revision=23195
2010-08-16 20:37:18 +00:00
Peter Simons 9670fca780 Added "python-$version-wrapper" expression.
The python wrapper expression expects a list of Python modules, $extraLibs,
which are added to $PYTHONPATH before executing the actual Python interpreter.

svn path=/nixpkgs/trunk/; revision=23194
2010-08-16 17:03:35 +00:00
Peter Simons 42b5198e5b pkgs/top-level/all-packages.nix: disable doCheck for setuptools when run with Python 2.7
The regression test suite fails with the following error:

  ======================================================================
  FAIL: test_get_script_header_jython_workaround (setuptools.tests.test_resources.ScriptHeaderTests)
  ----------------------------------------------------------------------
  Traceback (most recent call last):
    File "/tmp/nix-build-0zz04maf217x7a6fq18ccmx5s1mrijlr-setuptools-0.6c11.drv-0/setuptools-0.6c11/setuptools/tests/test_resources.py", line 524, in test_get_script_header_jython_workaround
      self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
  AssertionError: False is not True

I'm not sure yet what the problem is.

svn path=/nixpkgs/trunk/; revision=23193
2010-08-16 17:03:19 +00:00
Yury G. Kudryashov 6d97359a61 Add kdegraphics-4.5.0
svn path=/nixpkgs/trunk/; revision=23190
2010-08-16 12:40:41 +00:00
Yury G. Kudryashov f9a218b691 Add ebook-tools-0.1.1
svn path=/nixpkgs/trunk/; revision=23189
2010-08-16 12:40:03 +00:00
Yury G. Kudryashov 0ee0fb9387 Add libktorrent
svn path=/nixpkgs/trunk/; revision=23186
2010-08-16 08:34:26 +00:00
Yury G. Kudryashov 737262c779 Add kdeaccessibility-4.5.0
svn path=/nixpkgs/trunk/; revision=23185
2010-08-16 08:23:59 +00:00
Eelco Dolstra 0c9a370aa0 * Updated desktop-file-utils to 0.16.
svn path=/nixpkgs/trunk/; revision=23182
2010-08-16 07:45:39 +00:00
Andres Löh 1a7a128b58 Version bumps for a number of Haskell packages.
svn path=/nixpkgs/trunk/; revision=23181
2010-08-15 18:28:08 +00:00
Yury G. Kudryashov 4db5058475 Add libqalculate
svn path=/nixpkgs/trunk/; revision=23180
2010-08-15 13:55:02 +00:00
Yury G. Kudryashov db36f89eca Add cln
svn path=/nixpkgs/trunk/; revision=23179
2010-08-15 13:54:27 +00:00
Andres Löh 36ec694b7b uu-parsinglib version bump.
svn path=/nixpkgs/trunk/; revision=23178
2010-08-15 11:42:54 +00:00
Michael Raskin f2fb66e606 Update DirectFB
svn path=/nixpkgs/trunk/; revision=23177
2010-08-14 20:32:35 +00:00
Michael Raskin 69a9e0a9fa Fix stupid typo in linux_2_6_35_oldI686 definition
svn path=/nixpkgs/trunk/; revision=23174
2010-08-14 17:13:42 +00:00
Michael Raskin 3a2f493750 Add latest Linux kernel for real i686 platform, not modern amd64-in-32bit-mode
svn path=/nixpkgs/trunk/; revision=23173
2010-08-14 16:04:02 +00:00
Yury G. Kudryashov 1975eefcb4 Add kdemultimedia-4.5.0
svn path=/nixpkgs/trunk/; revision=23172
2010-08-14 09:46:55 +00:00
Michael Raskin 2d062ba772 Allow override options being required in kernel configuration.. Otherwise modifying significantly config via extraConfig becomes practically impossible.
svn path=/nixpkgs/trunk/; revision=23171
2010-08-14 09:18:57 +00:00
Yury G. Kudryashov dc831feb4b Add kdeutils-4.5.0
svn path=/nixpkgs/trunk/; revision=23170
2010-08-13 23:50:44 +00:00
Yury G. Kudryashov e7b1d4c69e Add kdebase-runtime-4.5.0
svn path=/nixpkgs/trunk/; revision=23169
2010-08-13 23:14:16 +00:00
Yury G. Kudryashov 83a87e9959 More meta.platforms
svn path=/nixpkgs/trunk/; revision=23168
2010-08-13 23:11:58 +00:00
Yury G. Kudryashov c55090ec78 Upgrade iproute, add meta info
svn path=/nixpkgs/trunk/; revision=23167
2010-08-13 23:11:11 +00:00
Yury G. Kudryashov c5e44e6829 More metadata
svn path=/nixpkgs/trunk/; revision=23166
2010-08-13 23:09:53 +00:00
Yury G. Kudryashov 5ee59b9f2e Make unix_chkpwd suid root
svn path=/nixpkgs/trunk/; revision=23164
2010-08-13 14:06:41 +00:00
Yury G. Kudryashov 794c9dd1d7 Add kdeartwork-4.5.0
svn path=/nixpkgs/trunk/; revision=23163
2010-08-13 14:06:36 +00:00
Yury G. Kudryashov dfd195020a Add eigen to kde-4.5
svn path=/nixpkgs/trunk/; revision=23162
2010-08-13 14:06:29 +00:00
Yury G. Kudryashov 5422f21700 xscreensaver: move hacks to default location, use stdenv, more deps
svn path=/nixpkgs/trunk/; revision=23161
2010-08-13 14:06:23 +00:00
Andres Löh 2bf5f684c9 GHC 6.12 compatibility of some Haskell libraries.
svn path=/nixpkgs/trunk/; revision=23160
2010-08-13 13:04:30 +00:00
Andres Löh ced0d6de0d emacsPackages should inherit emacs to add the correct version
to the inner scope

svn path=/nixpkgs/trunk/; revision=23159
2010-08-13 07:55:57 +00:00
Michael Raskin ac8fda68f6 Enable some more WebKit options
svn path=/nixpkgs/trunk/; revision=23158
2010-08-12 22:05:04 +00:00
Michael Raskin 6c4b96434e Update BzrTools together with Bazaar
svn path=/nixpkgs/trunk/; revision=23157
2010-08-12 19:59:30 +00:00
Michael Raskin c4fb841955 An update for Bazaar was long overdue
svn path=/nixpkgs/trunk/; revision=23156
2010-08-12 19:53:38 +00:00
David Guibert 92d437c54f kernel updates and add kernel 2.6.35.1
svn path=/nixpkgs/trunk/; revision=23155
2010-08-12 16:33:19 +00:00
Peter Simons b42dfe40ec Fix akonadi startup failure.
Patch akonadiserver so as to correct the datadir parameter passed to
mysql. Without this patch akonadiserver in KDE 4.4.5 would not start and
consequently kmail would crash during start up.

svn path=/nixpkgs/trunk/; revision=23154
2010-08-12 14:58:02 +00:00
Peter Simons 9be0b9fea6 Update version of ncftp.
The old version 3.2.3 seems to have disappeared from the hosting server.

svn path=/nixpkgs/trunk/; revision=23153
2010-08-12 14:57:15 +00:00
Peter Simons 961fda939c Fix some broken URLs.
svn path=/nixpkgs/trunk/; revision=23152
2010-08-12 14:56:14 +00:00
Peter Simons 04ee1d78ad pkgs/top-level/all-packages.nix: obsoleted setuptools_python26 and setuptools_python27
Instead of having different setuptools expressions, buildPythonPackage
uses override to choose the desired python version. Now, technically,
buildPythonPackage shouldn't exist in multiple versions either. Maybe
the whole thing should be moved into python packages?

svn path=/nixpkgs/trunk/; revision=23151
2010-08-12 14:01:51 +00:00
Michael Raskin a30807b8fd Update WebKit. Enable MathML. Not maximum set of options is enabled now, probably..
svn path=/nixpkgs/trunk/; revision=23150
2010-08-12 13:56:57 +00:00
Yury G. Kudryashov ca1914fa1a Remove old patch, add new one
Let other KDE modules install polkit policy files to $out,
not $kdelibs

svn path=/nixpkgs/trunk/; revision=23147
2010-08-12 13:01:06 +00:00
Peter Simons 63ce55d859 pkgs/top-level/all-packages.nix: lower priority of python27Base to ensure the full version is installed by default
svn path=/nixpkgs/trunk/; revision=23146
2010-08-12 12:53:51 +00:00
Peter Simons 65eb1a248f pkgs/development/python-modules/zope: updated to version 3.4.0
svn path=/nixpkgs/trunk/; revision=23145
2010-08-12 12:53:45 +00:00
Peter Simons 8c1717677e pkgs/top-level/all-packages.nix: dropped TODO note from Python 2.7
The expression used to say "FIXME: We lack ncurses support", but it
looks to me like ncurses *is* supported.

svn path=/nixpkgs/trunk/; revision=23144
2010-08-12 12:53:36 +00:00
Peter Simons 70a603c4bb pkgs/top-level/all-packages.nix: dropped getConfig support for Python 2.7
Python 2.7 can no longer be configured using the obsolete "getConfig"
mechanism. Instead, use "override" to fine-tune the installation.

svn path=/nixpkgs/trunk/; revision=23143
2010-08-12 12:53:26 +00:00
Eelco Dolstra 19158d7dec * CURL: build without scp support on Cygwin because libssh2 doesn't
build.

svn path=/nixpkgs/trunk/; revision=23142
2010-08-12 11:54:55 +00:00
Peter Simons ff1c057f7a pkgs/top-level/all-packages.nix: removed lowPri modifier from python27Full
The "full" version is preferrable over the "base" version in user
profiles.

svn path=/nixpkgs/trunk/; revision=23141
2010-08-12 11:23:54 +00:00