Commit Graph
195682 Commits
Author SHA1 Message Date
Eelco Dolstra 7b9d03d596 * strictAttrs: return the original attribute set.
svn path=/nixpkgs/trunk/; revision=23252
2010-08-19 15:13:09 +00:00
Eelco Dolstra 4c8fb8d4b2 * The "atd" job tends to fail randomly on startup for unknown
reasons.  Doing "atd -f" seems to work better.

svn path=/nixos/trunk/; revision=23251
2010-08-19 14:50:48 +00:00
Eelco Dolstra e8f1c8a08a * Check eval-release.nix.
svn path=/nixpkgs/trunk/; revision=23250
2010-08-19 14:33:44 +00:00
Rob Vermaas cf336d9c1d maven-build: use single target in stead of assembly to prevent test from being run twice
svn path=/nixpkgs/trunk/; revision=23249
2010-08-19 13:36:57 +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
Rob Vermaas 12bfda97b8 maven-build: if surefire was run, generate html and add to result
svn path=/nixpkgs/trunk/; revision=23246
2010-08-19 12:24:14 +00:00
Eelco Dolstra c55f496c52 * The ALSA job shouldn't be started until udevtrigger has finished.
Otherwise the sound card drivers may not have been loaded yet, and
  restoring the mixer settings will fail.  Also, since the ALSA job
  itself will fail, it won't save the mixer settings on shutdown.

svn path=/nixos/trunk/; revision=23245
2010-08-19 11:55:52 +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
Rob Vermaas e87a298c33 qemu virtualiztion: do not pass username on guest cifs mount, use sec=none in stead
svn path=/nixos/trunk/; revision=23243
2010-08-19 08:32:31 +00:00
Rob Vermaas 105d0e540b startSamba: reintroduce force user option set to current user
svn path=/nixpkgs/trunk/; revision=23242
2010-08-19 08:31:13 +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
Yury G. Kudryashov 59e4742a6a kdepim-4.4.5: don't build kleopatra
It doesn't compile with new boost. If someone cares, find a patch in KDE SVN history.

svn path=/nixpkgs/trunk/; revision=23239
2010-08-18 22:52:59 +00:00
Yury G. Kudryashov 0b8bd11ce3 Add kdeadmin-4.5.0
svn path=/nixpkgs/trunk/; revision=23238
2010-08-18 18:58:53 +00:00
Yury G. Kudryashov 96edbab084 kdewebdev-4.5.0
svn path=/nixpkgs/trunk/; revision=23237
2010-08-18 18:58:02 +00:00
Yury G. Kudryashov 6ba9dcb54c Add kdesdk-4.5.0
svn path=/nixpkgs/trunk/; revision=23236
2010-08-18 18:56:48 +00:00
Yury G. Kudryashov e9fd810997 antlr-2: compile library
svn path=/nixpkgs/trunk/; revision=23235
2010-08-18 18:56:03 +00:00
Michael Raskin ab8a599e8c Adding a script to use eval-release.nix for tests
svn path=/nixpkgs/trunk/; revision=23234
2010-08-18 16:37:46 +00:00
Yury G. Kudryashov 1e4d14863c make lensfun configure output debug info
svn path=/nixpkgs/trunk/; revision=23233
2010-08-18 15:56:40 +00:00
Yury G. Kudryashov ee6b753bfe kdeplasma-addons-4.5.0
svn path=/nixpkgs/trunk/; revision=23232
2010-08-18 15:55:12 +00:00
Yury G. Kudryashov fc3845c0cd kdeedu-4.5.0
svn path=/nixpkgs/trunk/; revision=23231
2010-08-18 15:54:27 +00:00
Yury G. Kudryashov 0be1e1af98 Add kdenetwork-4.5.0
svn path=/nixpkgs/trunk/; revision=23230
2010-08-18 15:54:10 +00:00
Yury G. Kudryashov f8a0e07815 sort, add kdegames-4.5.0
svn path=/nixpkgs/trunk/; revision=23229
2010-08-18 15:52:58 +00:00
Peter Simons 0b529ff4d7 pkgs/development/interpreters/python/2.7: added various meta attributes
svn path=/nixpkgs/trunk/; revision=23228
2010-08-18 15:03:34 +00:00
Ludovic Courtès be4bd94e35 ati-drivers: Comment out broken assertion.
svn path=/nixpkgs/trunk/; revision=23227
2010-08-18 14:45:13 +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
Rob Vermaas e7dd6dcc6a wrong location for surefire reports
svn path=/nixpkgs/trunk/; revision=23224
2010-08-18 11:48:35 +00:00
Rob Vermaas fa7ec152db revert earlier change
svn path=/nixpkgs/trunk/; revision=23222
2010-08-18 11:03:36 +00:00
Rob Vermaas b2c12ca3e9 added 'force user = root' to smb.conf to prevent permissions problems in vms caused by unknown uids
svn path=/nixpkgs/trunk/; revision=23220
2010-08-18 10:13:48 +00:00
Rob Vermaas 9e2074f199 remove mvncobertura phase
svn path=/nixpkgs/trunk/; revision=23219
2010-08-18 09:55:34 +00:00
Armijn Hemel f194a8aa93 update to 2.7.3
svn path=/nixpkgs/trunk/; revision=23215
2010-08-17 20:28:40 +00:00
Michael Raskin 4e0ed004b7 Fix some more wrong-on-bootstrap cases
svn path=/nixpkgs/trunk/; revision=23214
2010-08-17 17:00:20 +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
Michael Raskin fc9f451cad Fix bootstrap calls
svn path=/nixpkgs/trunk/; revision=23212
2010-08-17 16:51:12 +00:00
Michael Raskin 1946545852 Update WebKit
svn path=/nixpkgs/trunk/; revision=23211
2010-08-17 16:37:14 +00:00
Peter Simons 1b13b33e8d pkgs/development/libraries/boost: updated to boost 1.44.0
Support paralllel building (if enabled by the user via --build-cores).

svn path=/nixpkgs/trunk/; revision=23210
2010-08-17 15:46:06 +00:00
Eelco Dolstra f5f32a5b4b * Nix 0.16.
svn path=/nixpkgs/trunk/; revision=23208
2010-08-17 15:21:42 +00:00
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