Commit graph

4238 commits

Author SHA1 Message Date
Yury G. Kudryashov
3beeb6611a Use pkgs. in override, override qjson in kde-4.5
svn path=/nixpkgs/trunk/; revision=23287
2010-08-20 20:13:01 +00:00
Yury G. Kudryashov
10c5146a78 Add fbcondecor-2.6.35
svn path=/nixpkgs/trunk/; revision=23286
2010-08-20 20:12:03 +00:00
Yury G. Kudryashov
879baa7c58 MPlayer: various updates
1. Add pulseaudio and xsreensaver support
2. Use default arguments instead of custom args in all-packages.nix.
3. Remove ? null. callPackage passes all these args anyway.
4. Add binary codecs for non-i686 platforms. Have no video to test.
5. Use fetchsvn instead of gentoo-made snapshot.

svn path=/nixpkgs/trunk/; revision=23285
2010-08-20 20:09:22 +00:00
Eelco Dolstra
3be78e74fb * Added xmlstarlet.
svn path=/nixpkgs/trunk/; revision=23271
2010-08-20 10:07:35 +00:00
Eelco Dolstra
9d4feab5c5 * NixOS: use nixStable.
svn path=/nixpkgs/trunk/; revision=23267
2010-08-20 08:52:59 +00:00
Eelco Dolstra
e8f1c8a08a * Check eval-release.nix.
svn path=/nixpkgs/trunk/; revision=23250
2010-08-19 14:33:44 +00:00
Eelco Dolstra
1ac9dcd24d * Fix eval-release.nix by testing whether all attributes of a
derivation evaluate inside the tryEval.  This catches cases such as
  aufs2-util, which fails due to an assertion in its dependency aufs2.
* Explicitly blacklist "xbursttools" because it gives some
  evaluation error in cross-OpenSSL.  No idea why, probably due to
  some pass-through attribute.

svn path=/nixpkgs/trunk/; revision=23247
2010-08-19 12:37:10 +00:00
Eelco Dolstra
435ba71ac0 * Fix a "undefined variable `pyrex'" error that only happens on Nix
0.15, not 0.16.

svn path=/nixpkgs/trunk/; revision=23244
2010-08-19 09:55:50 +00:00
Yury G. Kudryashov
2957f9cc11 Now packageOverrides = p: { kde4 = kde45; qt4 = qt47; } should work
svn path=/nixpkgs/trunk/; revision=23241
2010-08-18 23:04:21 +00:00
Yury G. Kudryashov
9c1a9c2c4b Make qt47 more override-friendly
svn path=/nixpkgs/trunk/; revision=23240
2010-08-18 22:53:42 +00:00
Ludovic Courtès
4a909f0838 libcanberra: Remove useless ‘gthread’ argument.
svn path=/nixpkgs/trunk/; revision=23226
2010-08-18 14:27:04 +00:00
Ludovic Courtès
904c8cfa0a Castle-Combat: Start fixing; rewrite using `buildPythonPackage'.
svn path=/nixpkgs/trunk/; revision=23225
2010-08-18 14:25:07 +00:00
Marco Maggesi
4b4ab6551c Improve os-specific/linux/blcr. Fix a problem with shared objects
svn path=/nixpkgs/trunk/; revision=23213
2010-08-17 16:53:34 +00:00
Eelco Dolstra
f5f32a5b4b * Nix 0.16.
svn path=/nixpkgs/trunk/; revision=23208
2010-08-17 15:21:42 +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
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
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
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
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
83a87e9959 More meta.platforms
svn path=/nixpkgs/trunk/; revision=23168
2010-08-13 23:11:58 +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
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
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
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
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
Peter Simons
a1039a2744 pkgs/top-level/all-packages.nix: stripped trailing whitespace
svn path=/nixpkgs/trunk/; revision=23140
2010-08-12 11:22:06 +00:00
Lluís Batlle i Rossell
3a3867869a Adding tetgen
svn path=/nixpkgs/trunk/; revision=23138
2010-08-12 10:59:05 +00:00
Eelco Dolstra
e897a308a6 * Added MESS, the Multi Emulator Super System.
svn path=/nixpkgs/trunk/; revision=23126
2010-08-11 19:47:05 +00:00
Michael Raskin
670135ecb6 flup and ViewMTN seem to work just as well with default Python
svn path=/nixpkgs/trunk/; revision=23119
2010-08-11 16:28:53 +00:00
Peter Simons
ee70d8481d pkgs/top-level/all-packages.nix: strip trailing whitenspace
svn path=/nixpkgs/trunk/; revision=23118
2010-08-11 15:49:42 +00:00
Peter Simons
2b37d181a5 Added Python version 2.7.
svn path=/nixpkgs/trunk/; revision=23117
2010-08-11 15:49:03 +00:00
Eelco Dolstra
21587bf10b * Use callPackage_i686 for i686-only packages.
svn path=/nixpkgs/trunk/; revision=23113
2010-08-11 13:25:30 +00:00
Rob Vermaas
a60809353a updated nss and nspr, added variant of nss including tools
svn path=/nixpkgs/trunk/; revision=23105
2010-08-11 09:38:09 +00:00
Eelco Dolstra
f6baaeace8 * Add Xfce to the channel.
svn path=/nixpkgs/trunk/; revision=23081
2010-08-10 00:09:29 +00:00
Lluís Batlle i Rossell
a6aae3bc6d Adding the matchbox window manager
svn path=/nixpkgs/trunk/; revision=23076
2010-08-09 22:40:51 +00:00
Lluís Batlle i Rossell
9cba74c95a Adding 'yacas', a CAS implemented in C++.
svn path=/nixpkgs/trunk/; revision=23074
2010-08-09 21:58:21 +00:00
Lluís Batlle i Rossell
ac387916b8 Adding the calendar program 'pal'
svn path=/nixpkgs/trunk/; revision=23070
2010-08-09 21:13:36 +00:00
Lluís Batlle i Rossell
1b59ae0b83 Adding 'mupdf', a lightweight PDF 1.7 viewer
As a side effect, I add openjpeg and jbig2dec.

svn path=/nixpkgs/trunk/; revision=23069
2010-08-09 20:59:38 +00:00
Rob Vermaas
2670c1c67b update some perl packages
svn path=/nixpkgs/trunk/; revision=23066
2010-08-09 19:29:06 +00:00
Rob Vermaas
79fcd0a04c updated net::twitter, scope::upper, added uri::googlechart
svn path=/nixpkgs/trunk/; revision=23065
2010-08-09 18:45:44 +00:00
Eelco Dolstra
4ae72f5ab2 * Added pkgs/data/misc/hicolor-icon-theme, required by Xfce.
svn path=/nixpkgs/trunk/; revision=23060
2010-08-09 18:00:08 +00:00