philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

11528 commits

Author SHA1 Message Date
Yury G. Kudryashov cbec86d7d1 Propagate gcc.libc in kdelibs-4.4 
svn path=/nixpkgs/trunk/; revision=23344
 2010-08-21 22:05:03 +00:00
Lluís Batlle i Rossell dc19818cc7 Propagating the 'platform' stdenv attribute properly on stdenvLinux, 
so it can be used in places like the linuxHeaders expression.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23343
 2010-08-21 21:08:57 +00:00
Lluís Batlle i Rossell 9a1e29ecdf Patch for glibc 2.12.1 to build with gnumake 3.82 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23342
 2010-08-21 21:08:05 +00:00
Yury G. Kudryashov 3adcb12100 Fix evaluation error 
svn path=/nixpkgs/trunk/; revision=23341
 2010-08-21 20:20:34 +00:00
Lluís Batlle i Rossell b8298c9cdd Adding a patch file I forgot for w3m, while the nix expression already refers to it. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23340
 2010-08-21 20:13:02 +00:00
Lluís Batlle i Rossell 96c53c8239 Fix on the file type on glibc ports 2.12.1. (gzip vs bzip2) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23339
 2010-08-21 20:11:07 +00:00
Lluís Batlle i Rossell 13a647ab4c Disabling the legacy IDE in the fuloong2f kernel (that may give sda devices instead of hga?) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23338
 2010-08-21 20:03:00 +00:00
Lluís Batlle i Rossell 23b47575c6 Adding a tarball I publish in my server for glibc ports 2.12.1 I made from the git repository. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23337
 2010-08-21 20:00:54 +00:00
Yury G. Kudryashov 3537d94672 Move yakuake to pkgs 
svn path=/nixpkgs/trunk/; revision=23331
 2010-08-21 19:30:15 +00:00
Yury G. Kudryashov 682e4ae09e Move konversation to pkgs 
svn path=/nixpkgs/trunk/; revision=23330
 2010-08-21 19:29:47 +00:00
Yury G. Kudryashov 608cde4f82 Explicit pkgs.prefix 
svn path=/nixpkgs/trunk/; revision=23329
 2010-08-21 19:27:31 +00:00
Yury G. Kudryashov c3948239d7 Remove broken assert in sqlite backend code 
svn path=/nixpkgs/trunk/; revision=23328
 2010-08-21 19:25:44 +00:00
Lluís Batlle i Rossell 0709b7df6d Making glibc not depend on glibc-ports for platforms not requiring glibc-ports. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23327
 2010-08-21 19:05:42 +00:00
Lluís Batlle i Rossell b9080de4fd Addindg isArm and enlarging isMips for stdenv. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23326
 2010-08-21 19:02:43 +00:00
Lluís Batlle i Rossell 191961aa76 Typo 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23324
 2010-08-21 17:18:35 +00:00
Lluís Batlle i Rossell 72707853f0 Adding in stdenv an 'isMips' attribute. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23323
 2010-08-21 17:14:03 +00:00
Lluís Batlle i Rossell 237884a8bf Disabling the nfs-utils test on mips (one test fails, I don't know why) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23322
 2010-08-21 17:13:28 +00:00
Lluís Batlle i Rossell 5da066984f Updating kbd, so it builds in mips 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23321
 2010-08-21 17:12:54 +00:00
Lluís Batlle i Rossell affd2abf24 Limitting the 'hal' usage of libsmbios to i686/x86_64 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23320
 2010-08-21 17:11:07 +00:00
Lluís Batlle i Rossell 64eadafc2b Using a new boehm-gc (alpha, not stable) on the mips, 
because the stable does not support mips at all

svn path=/nixpkgs/branches/stdenv-updates/; revision=23319
 2010-08-21 17:09:02 +00:00
Lluís Batlle i Rossell 7d3e0c542c Making w3m build with a newer boehm-gc 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23318
 2010-08-21 17:07:03 +00:00
Lluís Batlle i Rossell bc0fab5793 Setting sysvinit to be downloaded from a savannah mirror, instead of the url of a single mirror it had (a mirror not working anymore) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23317
 2010-08-21 16:58:18 +00:00
Lluís Batlle i Rossell 508fc749f4 Making texinfo look nicer related to cross-build (we had some cleaning up to do for the time when we rebuild stdenv. It looks like a good time for that) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23316
 2010-08-21 16:57:24 +00:00
Lluís Batlle i Rossell 5cdc569477 Allowing alsa utils to cross-build, and libao to output to alsa (not only to 
pulseAudio)

svn path=/nixpkgs/branches/stdenv-updates/; revision=23315
 2010-08-21 16:55:47 +00:00
Lluís Batlle i Rossell 49893ec540 Allowing cross-build of groff 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23314
 2010-08-21 16:54:24 +00:00
Lluís Batlle i Rossell e0b377fd81 Adding mpg123 (it even cross-builds fine for the nanonote) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23313
 2010-08-21 16:54:02 +00:00
Lluís Batlle i Rossell c68d102286 Patching libmad for mips (Ben Nanonote) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23312
 2010-08-21 16:53:25 +00:00
Lluís Batlle i Rossell 79653715d6 Fixing the build of busybox without extraConfig 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23311
 2010-08-21 16:52:45 +00:00
Lluís Batlle i Rossell 745528b4e4 Updating the configuration system of uclibc to something more flexible than it was. 
I copied what I had done in busybox.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23310
 2010-08-21 16:46:23 +00:00
Michael Raskin 56fa59e819 Step WebKit further back 
svn path=/nixpkgs/trunk/; revision=23309
 2010-08-21 16:22:57 +00:00
Lluís Batlle i Rossell 75a9a710fd Fixing the gnumake log.patch so it applies to the new gnumake 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23308
 2010-08-21 15:54:48 +00:00
Lluís Batlle i Rossell 02bd68fa15 Removing a gzip patch we had, as it looks like being in the new upstream release. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23307
 2010-08-21 15:36:48 +00:00
Lluís Batlle i Rossell ff0b54e26e Patching the latest gnum4 so it builds with glibc 2.12.1 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23306
 2010-08-21 13:03:36 +00:00
Lluís Batlle i Rossell 221317ae7b Setting new bootstrap-tools for x86_64. 
Allowing 'curl' build without some dependencies, if it is told not to build
with them.

Updating the make-bootstrap-tools for the latest gcc/glibc, removing the
dependency on klibc, and updating unpack-boostrap-tools for the latest
boostrap-tools to work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=23305
 2010-08-21 12:50:49 +00:00
Lluís Batlle i Rossell 9cbc109b9a Fixes on the glibc-2.12 expression. 
I removed a patch (mod_nano) already in the release.
I fixed the nix-locale-archive so the programs don't try to modify the /usr
locale-archive (for non-nixos), although the libc may use that archive to show
strings.
I remove the glibc-2.11 void directory.


svn path=/nixpkgs/branches/stdenv-updates/; revision=23302
 2010-08-21 11:51:21 +00:00
Yury G. Kudryashov 8d7045e1ff Disable fbcondecor patch - doesn't work with 2.6.35.2 
svn path=/nixpkgs/trunk/; revision=23301
 2010-08-21 09:56:01 +00:00
Michael Raskin 7dd07e5476 Call cleaner from the installation directory 
svn path=/nixpkgs/trunk/; revision=23300
 2010-08-21 07:28:47 +00:00
Michael Raskin 6bb40f5d08 Step back WebKit - latest nightly fails 
svn path=/nixpkgs/trunk/; revision=23299
 2010-08-21 07:13:18 +00:00
Michael Raskin 7b721c10ad Update WebKit 
svn path=/nixpkgs/trunk/; revision=23298
 2010-08-21 06:13:02 +00:00
Michael Raskin 3039709cd6 Update the currently used autocallable template to make it usable with probable future autoupdater.. 
svn path=/nixpkgs/trunk/; revision=23297
 2010-08-20 21:55:36 +00:00
Michael Raskin b147842dce Add nilfs-utils 
svn path=/nixpkgs/trunk/; revision=23296
 2010-08-20 21:53:43 +00:00
Michael Raskin 202cd08724 Looks like 2.6.35.2 commits a fix that breaks AUFS2 
svn path=/nixpkgs/trunk/; revision=23295
 2010-08-20 21:39:22 +00:00
Yury G. Kudryashov 44b5540bfd More TODOs 
svn path=/nixpkgs/trunk/; revision=23294
 2010-08-20 21:37:56 +00:00
Yury G. Kudryashov b97b22220f kdebase-workspace: more dependencies, list TODO 
svn path=/nixpkgs/trunk/; revision=23293
 2010-08-20 21:36:56 +00:00
Yury G. Kudryashov 62ddc0e6df Use tarball snapshot 
svn:externals cause problems with fetchsvn.

svn path=/nixpkgs/trunk/; revision=23292
 2010-08-20 21:36:11 +00:00
Michael Raskin be17d69549 Fix   problem in aufs2-35.patch 
svn path=/nixpkgs/trunk/; revision=23291
 2010-08-20 21:35:11 +00:00
Ludovic Courtès 92e4866910 Fix path to glibc. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23290
 2010-08-20 21:23:05 +00:00
Michael Raskin 2497cff295 Use AUFS2 patch for Linux 2_6_35 
svn path=/nixpkgs/trunk/; revision=23289
 2010-08-20 20:49:33 +00:00
Michael Raskin d3d44dc6d3 Add AUFS patch for 2.6.35 
svn path=/nixpkgs/trunk/; revision=23288
 2010-08-20 20:46:12 +00:00
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
Ludovic Courtès 0ca823ff87 GNU Nettle 2.1. 
svn path=/nixpkgs/trunk/; revision=23284
 2010-08-20 18:40:35 +00:00
Ludovic Courtès 9b9df7a444 glibc: Make the native store path independent on whether `gccCross' is null. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23283
 2010-08-20 15:26:56 +00:00
Ludovic Courtès 87a62c6369 glibc 2.12.1. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23282
 2010-08-20 15:26:50 +00:00
Ludovic Courtès 58b1dfe0fe GNU Make 3.82. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23281
 2010-08-20 15:26:41 +00:00
Ludovic Courtès 14e86a9812 GNU gawk 3.1.8. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23280
 2010-08-20 15:26:36 +00:00
Ludovic Courtès 96da0397a9 GNU Coreutils 8.5. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23279
 2010-08-20 15:26:31 +00:00
Ludovic Courtès e0fa7776d3 GNU gzip 1.4. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23278
 2010-08-20 15:26:26 +00:00
Ludovic Courtès 42db762862 GNU Libtool 2.2.10. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23277
 2010-08-20 15:26:21 +00:00
Lluís Batlle i Rossell f16353b6f2 Updated from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
 2010-08-20 13:41:12 +00:00
Lluís Batlle i Rossell f7d0fcdaac Making the kernel builder accept the 'vmlinux' kerneltarget. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23274
 2010-08-20 13:30:59 +00:00
Lluís Batlle i Rossell f8f53855d5 Setting a snapshot of unreleased binutils for the fuloong2f 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23273
 2010-08-20 13:29:57 +00:00
Eelco Dolstra 7dea1a0f4f * Revert to 2.6.32.18 for now, because we get a lot of "BUG: 
scheduling while atomic" errors
  (e.g. http://hydra.nixos.org/build/568323/log/raw).  This might be
  fixed by this patch: http://lkml.org/lkml/2010/8/6/672

svn path=/nixpkgs/trunk/; revision=23272
 2010-08-20 13:13:26 +00:00
Eelco Dolstra 3be78e74fb * Added xmlstarlet. 
svn path=/nixpkgs/trunk/; revision=23271
 2010-08-20 10:07:35 +00:00
Eelco Dolstra 2e230288bf * Latest kernels. 
svn path=/nixpkgs/trunk/; revision=23270
 2010-08-20 09:29:10 +00:00
Eelco Dolstra 7120017365 * Add meta info to xpf. 
svn path=/nixpkgs/trunk/; revision=23269
 2010-08-20 09:18:53 +00:00
Rob Vermaas 544cb2a0c9 updated calibre to 0.7.14 
svn path=/nixpkgs/trunk/; revision=23268
 2010-08-20 09:07:35 +00:00
Eelco Dolstra 9d4feab5c5 * NixOS: use nixStable. 
svn path=/nixpkgs/trunk/; revision=23267
 2010-08-20 08:52:59 +00:00
Yury G. Kudryashov 6345fa2d1d kdepim-runtime-4.4.92 
svn path=/nixpkgs/trunk/; revision=23265
 2010-08-19 22:57:09 +00:00
Yury G. Kudryashov b16167a028 Add kdepim{,-runtime}-4.4.92 to manifest 
svn path=/nixpkgs/trunk/; revision=23264
 2010-08-19 22:56:06 +00:00
Yury G. Kudryashov c7c210735d Fix symlink. TODO: upstream fix 
svn path=/nixpkgs/trunk/; revision=23263
 2010-08-19 22:54:38 +00:00
Yury G. Kudryashov 9e4202d273 make makeOverridable noop for functions like a: b: c(a, b) 
svn path=/nixpkgs/trunk/; revision=23262
 2010-08-19 22:52:53 +00:00
Yury G. Kudryashov e16427a899 Fix broken datadir in 4.5.0 as well 
svn path=/nixpkgs/trunk/; revision=23261
 2010-08-19 22:52:00 +00:00
Ludovic Courtès c8b7ed425b GNU Autoconf 2.67. 
svn path=/nixpkgs/trunk/; revision=23260
 2010-08-19 16:58:08 +00:00
Ludovic Courtès 1b56623a8a GnuPG 2.0.16. 
svn path=/nixpkgs/trunk/; revision=23259
 2010-08-19 16:57:09 +00:00
Ludovic Courtès 82968aa583 GNU Parallel 20100722. 
svn path=/nixpkgs/trunk/; revision=23258
 2010-08-19 16:56:41 +00:00
Ludovic Courtès d9e30eb4a4 GNU Rush 1.7. 
svn path=/nixpkgs/trunk/; revision=23257
 2010-08-19 16:55:51 +00:00
Ludovic Courtès 1f2cf89914 GNU Bison 2.4.3. 
svn path=/nixpkgs/trunk/; revision=23256
 2010-08-19 16:55:00 +00:00
Ludovic Courtès b4cea12d6a GnuTLS 2.10.1. 
svn path=/nixpkgs/trunk/; revision=23255
 2010-08-19 16:54:39 +00:00
Ludovic Courtès b4f887b7fb GNU Zile 2.3.19. 
svn path=/nixpkgs/trunk/; revision=23254
 2010-08-19 16:53:28 +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 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 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
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
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
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 018a0f2fe7 Making qhull not only install the libraries, but also its programs. 
svn path=/nixpkgs/trunk/; revision=23139
 2010-08-12 11:00:01 +00:00
Lluís Batlle i Rossell 3a3867869a Adding tetgen 
svn path=/nixpkgs/trunk/; revision=23138
 2010-08-12 10:59:05 +00:00
Yury G. Kudryashov 05da3db77f Copy qca from kde-4.5 to make qca2_ossl build 
svn path=/nixpkgs/trunk/; revision=23137
 2010-08-12 10:39:29 +00:00
David Guibert 829f6c2108 update chrome to available snapshots. 
svn path=/nixpkgs/trunk/; revision=23135
 2010-08-12 06:01:21 +00:00
David Guibert 284217c135 update ttf-mkfontdir 
svn path=/nixpkgs/trunk/; revision=23134
 2010-08-12 05:59:52 +00:00
David Guibert eab216c593 fetch terminus-fonts from debian, the origin url is broken 
svn path=/nixpkgs/trunk/; revision=23133
 2010-08-12 05:59:01 +00:00
Lluís Batlle i Rossell b368b4b199 Making more packages build on the Fuloong2f. 
I still can't build the kernel because it requires binutils yet to be released.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23132
 2010-08-11 20:16:09 +00:00
Lluís Batlle i Rossell 51f6aec764 Fixing the gcc-cross-wrapper; it failed after some changes related to breaking 
dependencies with it. (I should never link ld.so with a NIX_LDFLAGS -rpath
forced)

I made vim, scummvm cross-build. I added prboom (that cross-builds).
Mplayer and elinks don't cross-build fine still, but are on the way.
The mplayer fails to build in a weird way; nix does not show either a gcc
error message or even the 'make' error message.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23131
 2010-08-11 20:14:25 +00:00
Lluís Batlle i Rossell 039b660b5b Making lynx, yacas and alsa-lib crossbuild 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23130
 2010-08-11 20:11:12 +00:00
Lluís Batlle i Rossell 3ece765eed glib: step towards cross-building it, set perl as native input. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23129
 2010-08-11 20:09:17 +00:00
Lluís Batlle i Rossell 3f05ed581f Making fossil cross-build (it works for the nanonote). 
Removing some perl scripts from the openssl cross-built derivation, to avoid depending on it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23128
 2010-08-11 20:08:29 +00:00
Lluís Batlle i Rossell e97ad11560 Making cscope cross build (avoiding emacs in it) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23127
 2010-08-11 20:07:22 +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
Rob Vermaas c441b771f4 libvirt: add python to deps so python bindings are built 
svn path=/nixpkgs/trunk/; revision=23125
 2010-08-11 18:10:03 +00:00
Rob Vermaas 53d79f6f9c updated libvirt to 0.8.3 
svn path=/nixpkgs/trunk/; revision=23124
 2010-08-11 17:55:31 +00:00
Yury G. Kudryashov 2050c3da77 Add kdebase-workspace-4.5.0 
svn path=/nixpkgs/trunk/; revision=23123
 2010-08-11 17:33:57 +00:00
Yury G. Kudryashov 2449006cb6 Add manifest.nix 
svn path=/nixpkgs/trunk/; revision=23122
 2010-08-11 17:31:49 +00:00
Peter Simons 3658a8b040 pkgs/development/interpreters/python/2.7/setup-hook.sh: fixed incorrect version number 
svn path=/nixpkgs/trunk/; revision=23121
 2010-08-11 17:05:44 +00:00
Yury G. Kudryashov de3531c2d5 Let kdePackage use manifest.nix 
svn path=/nixpkgs/trunk/; revision=23120
 2010-08-11 16:49:31 +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 e1926e3764 * Add UNetbootin to the channel. 
svn path=/nixpkgs/trunk/; revision=23114
 2010-08-11 13:55:56 +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
Yury G. Kudryashov 58ab0bf5bb Add meta.platforms 
svn path=/nixpkgs/trunk/; revision=23111
 2010-08-11 12:24:12 +00:00
Eelco Dolstra 415cf4cd1c * Omit the "Defined by:" elements in the configuration.nix section of 
the manual.  While it's a useful feature, it has the unfortunate
  side-effect of causing the manual to be rebuilt every time the user
  adds an option definition to any module (including
  configuration.nix), and rebuilding the manual is rather slow.

svn path=/nixpkgs/trunk/; revision=23110
 2010-08-11 11:46:09 +00:00
Eelco Dolstra e4686546ec * Enable parallel building for the Linux kernel, an obvious candidate. 
svn path=/nixpkgs/trunk/; revision=23109
 2010-08-11 10:43:09 +00:00
Michael Raskin cf1d2fb754 Update pdf2djvu 
svn path=/nixpkgs/trunk/; revision=23108
 2010-08-11 10:34:15 +00:00
Peter Simons b62f65d24e pkgs/tools/networking/nbd: removed hard-coded flags for static linking 
A statically linked binary should rather be generated using the
appropriate stdenv adapter.

svn path=/nixpkgs/trunk/; revision=23107
 2010-08-11 09:54:46 +00:00
Peter Simons e33f4863fc pkgs/tools/networking/nbd: updated to version 2.9.18 
svn path=/nixpkgs/trunk/; revision=23106
 2010-08-11 09:53:31 +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 5c8b4ec35a * Linux 2.6.32.18. 
svn path=/nixpkgs/trunk/; revision=23104
 2010-08-11 09:25:35 +00:00
Yury G. Kudryashov a4829861ec Fix evaluation error 
svn path=/nixpkgs/trunk/; revision=23103
 2010-08-11 08:20:23 +00:00
Yury G. Kudryashov 7cecdce413 qt-4.7: add symlink for kde-4.5 
svn path=/nixpkgs/trunk/; revision=23100
 2010-08-10 20:18:51 +00:00
Yury G. Kudryashov 78565c5b5f Add qimageblitz and kdebase-apps-4.5.0 
svn path=/nixpkgs/trunk/; revision=23099
 2010-08-10 19:57:53 +00:00