BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
21551 commits 1 branch 0 tags 3.8 GiB
Commit graph

765 commits

Author SHA1 Message Date
Michael Raskin
451040c299 Adding globulation 
svn path=/nixpkgs/trunk/; revision=26892
 2011-04-19 16:02:29 +00:00
Michael Raskin
964d56e060 Workaround SCons paranoia 
svn path=/nixpkgs/trunk/; revision=26873
 2011-04-18 07:41:54 +00:00
Rob Vermaas
d7ac5cd014 nix-prefetch-hg: if url is local file, do not make clone, but run hg archive on it 
svn path=/nixpkgs/trunk/; revision=26779
 2011-04-11 12:24:57 +00:00
Rob Vermaas
3756e6021a use same name as nix-prefetch-hg for derivation 
svn path=/nixpkgs/trunk/; revision=26778
 2011-04-11 12:20:59 +00:00
Michael Raskin
1886fad9f1 Fix cmake flags overriding 
svn path=/nixpkgs/trunk/; revision=26765
 2011-04-09 15:50:33 +00:00
Eelco Dolstra
f99c0dd302 * Sync with the trunk. 
svn path=/nixpkgs/branches/modular-python/; revision=26678
 2011-04-04 13:36:05 +00:00
Lluís Batlle i Rossell
9adeabc793 Making builder-defs doCMake build well the shared libraries and binaries (rpath related). 
I simply made it do what the cmake setup-hook already said to do.

svn path=/nixpkgs/trunk/; revision=26617
 2011-03-30 22:08:29 +00:00
Eelco Dolstra
353d450867 * wrapPythonPrograms: don't hard-code the Python library prefix. 
svn path=/nixpkgs/branches/modular-python/; revision=26594
 2011-03-29 15:19:59 +00:00
Eelco Dolstra
47adaa80e3 * Move the wrapPythonPrograms function into a separate setup hook 
(wrapPython).

svn path=/nixpkgs/branches/modular-python/; revision=26580
 2011-03-28 16:33:33 +00:00
Ludovic Courtès
3369508fa9 nix-prefetch-git: Add rudimentary TopGit support. 
svn path=/nixpkgs/trunk/; revision=26305
 2011-03-14 22:00:20 +00:00
Eelco Dolstra
4b50191fd4 * Remove a not very useful message that didn't get printed anyway 
because the test condition was wrong.

svn path=/nixpkgs/trunk/; revision=26147
 2011-03-03 14:59:58 +00:00
Eelco Dolstra
377b97a37b * Drop the unnecessary boot=on flag. 
svn path=/nixpkgs/trunk/; revision=26104
 2011-02-24 21:48:32 +00:00
Eelco Dolstra
a74d449daf * nixSqlite expects another integer (denoting the size of the NAR) in 
`nix-store --load-db'.

svn path=/nixpkgs/trunk/; revision=25988
 2011-02-16 11:49:08 +00:00
Eelco Dolstra
167c520570 * Added Debian 6.0 and Ubuntu 10.10. 
svn path=/nixpkgs/trunk/; revision=25968
 2011-02-14 16:52:32 +00:00
Yury G. Kudryashov
f736995e07 Prefer upstream mirror system to our hand-written mirror list. 
svn path=/nixpkgs/trunk/; revision=25863
 2011-02-09 21:09:48 +00:00
Rob Vermaas
224ff6c1ee added nix-prefetch-bzr 
svn path=/nixpkgs/trunk/; revision=25806
 2011-02-08 13:09:17 +00:00
Rob Vermaas
81019cbdb9 vmTools: add some arguments with previous defaults 
svn path=/nixpkgs/trunk/; revision=25742
 2011-02-01 12:11:05 +00:00
Rob Vermaas
ebf9889a9e extractmtdfs: bigger size mtdram, extractfs: support cramfs 
svn path=/nixpkgs/trunk/; revision=25739
 2011-01-31 18:02:46 +00:00
Rob Vermaas
06be15cb76 add hfs/hfsplus/squashfs support to extractfs 
svn path=/nixpkgs/trunk/; revision=25737
 2011-01-31 15:26:03 +00:00
Eelco Dolstra
7f4a312e35 * Handle FreeBSD filesystems. 
svn path=/nixpkgs/trunk/; revision=25624
 2011-01-19 10:59:26 +00:00
Rob Vermaas
ba23376718 added vm function to extract some filesystem 
svn path=/nixpkgs/trunk/; revision=25622
 2011-01-19 09:06:12 +00:00
Rob Vermaas
adeb63e4c2 remove aterm242fixes 
svn path=/nixpkgs/trunk/; revision=25407
 2011-01-05 09:42:56 +00:00
Rob Vermaas
2bd4d50f0d nix-build.nix/source-tarball.nix: remove -v flag when copying build directory, to avoid polluting the log 
svn path=/nixpkgs/trunk/; revision=25404
 2011-01-05 09:06:53 +00:00
Rob Vermaas
f6426bad3b also add succeedOnFailure/keepBuildDirectory behaviour to source-tarball.nix 
svn path=/nixpkgs/trunk/; revision=25400
 2011-01-05 07:31:29 +00:00
Karn Kallio
871b59c636 Remove semicolon causing evaluation error. 
svn path=/nixpkgs/trunk/; revision=25354
 2011-01-02 23:52:39 +00:00
Evgeny Egorochkin
bbedfb4a5e Live builds support: initially for git and svn. taglib_live is packaged as an example. 
svn path=/nixpkgs/trunk/; revision=25351
 2011-01-02 23:23:59 +00:00
Michael Raskin
29cd3206f2 Adding ised 
svn path=/nixpkgs/trunk/; revision=25331
 2011-01-01 20:28:38 +00:00
Eelco Dolstra
aceef005c3 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25244
 2010-12-22 17:02:03 +00:00
Rob Vermaas
6016038097 nixBuild: add failurehook that saves build dir when succeedOnFailure = true and keepBuildDirectory = true 
svn path=/nixpkgs/trunk/; revision=25243
 2010-12-22 14:57:18 +00:00
Michael Raskin
22c42a26b6 Adding OGRE - object-oriented graphical engine 
svn path=/nixpkgs/trunk/; revision=25240
 2010-12-22 14:50:13 +00:00
Lluís Batlle i Rossell
e930a7385b Fix about the order of -rpath and -L in the ld-wrapper 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25128
 2010-12-14 15:22:25 +00:00
Lluís Batlle i Rossell
195a90d7ce Fixing a bug in the ld-wrapper, where the dynamic-linker path was taken as a 
path worth a "-rpath" entry.

This put a problem in the bootstrap, where we built 'zlib' and wanted to link programs with it, and while they got linked well, at runtime the boostrap-tools zlib came first on rpath becaue
the ld call was done with "-dynamic-linker ..." before "-lz".

I saw this trouble on the fuloong, where the zlib in boostrap-tools is not
runtime compatible with that binutils are linked to.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25107
 2010-12-13 22:46:21 +00:00
Lluís Batlle i Rossell
ee04ffcb55 Updating from trunk. I resolved simple conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
 2010-12-11 12:47:00 +00:00
Lluís Batlle i Rossell
43930b36d9 I had changed the gcc-wrapper shell attribute, for it to be a specific kind of 
derivation instead of a string, but this did not cover all use cases we had.
Instead of updating the use cases, I made the wrapper accept also a string.

We saw this problem trying to build gcc43_multi.


svn path=/nixpkgs/branches/stdenv-updates/; revision=25029
 2010-12-07 15:18:05 +00:00
Eelco Dolstra
04ec671c8a * Run smbd in its own session / process group (setsid) because smbd 
now kills its process group when it exits.  Without setsid, this
  ends up killing the parent (i.e., the builder).
* Use port 445 instead of 139 because the CIFS kernel module tries
  port 445 first.  If there is an actual Samba running on the host, it
  would end up connecting to that one instead of our own and fail.

svn path=/nixpkgs/trunk/; revision=25017
 2010-12-06 19:03:32 +00:00
Rob Vermaas
f26b267858 fix debian lenny hashes 
svn path=/nixpkgs/trunk/; revision=24986
 2010-12-06 08:03:11 +00:00
Lluís Batlle i Rossell
1b62c9c061 I made changes to achieve a working cross-built gcc wrapper. Now, 
"gcc45.hostDrv" works in the host system, together with libc, binutils, dynamic
linker, ...


svn path=/nixpkgs/branches/stdenv-updates/; revision=24971
 2010-12-04 21:45:37 +00:00
Michael Raskin
64ed7e705d Adding Satallax prover 
svn path=/nixpkgs/trunk/; revision=24963
 2010-12-03 11:26:34 +00:00
Michael Raskin
fb58f74d82 Updating from trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
 2010-11-17 17:03:09 +00:00
Michael Raskin
c5bb72d0da Add autogen.sh phase 
svn path=/nixpkgs/trunk/; revision=24706
 2010-11-16 07:38:33 +00:00
Lluís Batlle i Rossell
8746de3ae8 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
 2010-11-11 22:18:14 +00:00
Michael Raskin
07d9d421a7 Add progress reporting for generation of fonts 
svn path=/nixpkgs/trunk/; revision=24660
 2010-11-11 12:59:31 +00:00
Rob Vermaas
cf8da224c6 fixing wrappers in ant-build 
svn path=/nixpkgs/trunk/; revision=24637
 2010-11-10 12:55:25 +00:00
Eelco Dolstra
a2102af6df * buildEnv: use $SHELL (i.e. bash) rather than /bin/sh. This allows 
NixOS VM tests to be built on Ubuntu, where /bin/sh is dash rather
  than bash.

svn path=/nixpkgs/trunk/; revision=24592
 2010-11-03 22:37:00 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
 2010-10-23 14:52:21 +00:00
Rob Vermaas
0df15241ca fixes to ant-build 
svn path=/nixpkgs/trunk/; revision=24383
 2010-10-20 12:30:03 +00:00
Rob Vermaas
5a7fa1d061 antBuild: minor changes 
svn path=/nixpkgs/trunk/; revision=24376
 2010-10-20 08:23:52 +00:00
Rob Vermaas
b1332dca0f svn path=/nixpkgs/trunk/; revision=24366 2010-10-19 13:43:29 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
 2010-10-07 21:21:31 +00:00
Eelco Dolstra
17670a5412 * Add some openSUSE mirrors that still have 10.3 and 11.0. 
svn path=/nixpkgs/trunk/; revision=24053
 2010-10-04 14:30:34 +00:00
Lluís Batlle i Rossell
cd4b54748a Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
 2010-10-03 09:25:34 +00:00
Michael Raskin
5e32f98f5c Recursive sourceInfo is more convenient 
svn path=/nixpkgs/trunk/; revision=23868
 2010-09-20 07:48:17 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
 2010-09-17 19:10:21 +00:00
Ludovic Courtès
193799ec3d nixBuild: Add `buildOutOfSourceTree' option. 
svn path=/nixpkgs/trunk/; revision=23717
 2010-09-10 12:39:57 +00:00
Rob Vermaas
03706558a9 maven-build: do full assembly without tests, add site to build products 
svn path=/nixpkgs/trunk/; revision=23694
 2010-09-09 10:47:54 +00:00
Rob Vermaas
62eb8741ce maven-build: only copy site dir if it exists 
svn path=/nixpkgs/trunk/; revision=23692
 2010-09-09 07:22:45 +00:00
Rob Vermaas
b601947bcb maven-build: copy whole site dir and adapted hydra-build-products 
svn path=/nixpkgs/trunk/; revision=23691
 2010-09-09 07:19:12 +00:00
Rob Vermaas
a074da499c vm/default.nix: updating debian lenny hashes 
svn path=/nixpkgs/trunk/; revision=23674
 2010-09-07 14:33:46 +00:00
Lluís Batlle i Rossell
641f956581 Setting any stdenv.system references for the loongson2f system to 'mips64-linux'. 
(my git-svn info:)
Merge branch 'mips64' into stdenv-updates

Conflicts:
	pkgs/applications/networking/browsers/firefox/3.6.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=23588
 2010-09-01 09:50:12 +00:00
Eelco Dolstra
3cdc3c4abe * Mark the VM builds as requiring KVM support. 
svn path=/nixpkgs/trunk/; revision=23526
 2010-08-29 21:27:06 +00:00
Lluís Batlle i Rossell
cca1cae042 Updating from trunk. I had to do some changes to make it fit. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
 2010-08-29 11:09:23 +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
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
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
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
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
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
Michael Raskin
4e0ed004b7 Fix some more wrong-on-bootstrap cases 
svn path=/nixpkgs/trunk/; revision=23214
 2010-08-17 17:00:20 +00:00
Michael Raskin
fc9f451cad Fix bootstrap calls 
svn path=/nixpkgs/trunk/; revision=23212
 2010-08-17 16:51:12 +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
d5097ad3d3 Breaking dependencies on the cross-built gcc through the gcc-cross-wrapper. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23073
 2010-08-09 21:37:31 +00:00
Lluís Batlle i Rossell
ff5d0fa448 Merging from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23072
 2010-08-09 21:21:30 +00:00
Eelco Dolstra
e875ec2524 * Make sure that if pathsToLink contains an element such as 
"/share/info" that it doesn't match "/share/information.nix".

svn path=/nixpkgs/trunk/; revision=23059
 2010-08-09 16:08:02 +00:00
Lluís Batlle i Rossell
ae3383e001 Making the cross-built packages not depend on the gcc cross compiler directly, 
but on a nix-store path only having the cross-built gcc libraries.
This trims down a lot the runtime dependency tree for cross-built packages.

I also remove the glibc dependency on the native bash.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23040
 2010-08-08 18:47:48 +00:00
Lluís Batlle i Rossell
46082f25f9 Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
 2010-08-07 20:14:04 +00:00
Eelco Dolstra
4ed96dfbc2 * Ignore non-existant directories. 
svn path=/nixpkgs/trunk/; revision=23026
 2010-08-07 18:41:43 +00:00
Lluís Batlle i Rossell
229883730e Removing some nongnu mirrors that don't work for me. 
Feel free to check them back in if they work for you.

svn path=/nixpkgs/branches/stdenv-updates/; revision=22978
 2010-08-05 22:02:13 +00:00
Eelco Dolstra
aded38809b * Turn on `preferLocalBuild' for fetchurl. 
svn path=/nixpkgs/trunk/; revision=22948
 2010-08-04 12:37:03 +00:00
Lluís Batlle i Rossell
6d15eabdc1 Merging from trunk (the callPackage change) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22915
 2010-08-03 08:14:13 +00:00
Lluís Batlle i Rossell
de5e1de89b Fixing the dynamic linker in the gcc-cross-wrapper so it takes also the dynamic 
linker of glibc on mips (specifically ld.so.1, and not ld-*.so.? as we had before)

svn path=/nixpkgs/trunk/; revision=22912
 2010-08-02 22:44:41 +00:00
Lluís Batlle i Rossell
5417c720fd Merging from trunk. 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
 2010-08-02 15:48:19 +00:00
Lluís Batlle i Rossell
40405d03ac Trying to add the fuloong2f for bootstrap-files. It bootstraps fine 
(boostrap-files cross-built)

svn path=/nixpkgs/branches/stdenv-updates/; revision=22849
 2010-08-01 21:22:51 +00:00
Eelco Dolstra
749b8607ca * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22795
 2010-07-28 15:35:01 +00:00
Rob Vermaas
15cb365b1d make nix-prefetch-hg executable 
svn path=/nixpkgs/trunk/; revision=22755
 2010-07-27 16:32:51 +00:00
Eelco Dolstra
1df1f9faac * Debian 5.0.5. 
svn path=/nixpkgs/trunk/; revision=22654
 2010-07-19 07:55:18 +00:00
Eelco Dolstra
3d442ad185 * Apply a patch that is apparently required to make the kernel work 
properly on Amazon EC2.
* Always apply the CIFS timeout patch.  It's rather annoying to have
  to build a separate kernel for the VM tests.

svn path=/nixpkgs/trunk/; revision=22630
 2010-07-18 21:10:46 +00:00
Sander van der Burg
ffc82db4a9 slnFile can also be a list of strings now 
svn path=/nixpkgs/trunk/; revision=22557
 2010-07-12 11:18:11 +00:00
Eelco Dolstra
3c824666fd * Remove the call to update-mime-database, which doesn't belong here 
but in the postBuild hook.

svn path=/nixpkgs/trunk/; revision=22527
 2010-07-08 12:55:03 +00:00
Eelco Dolstra
a6fcf45726 * First figure out what symlinks need to be created, then create 
them.  This prevents unnecessary unlink operations to resolve
  collisions between directories.

svn path=/nixpkgs/trunk/; revision=22526
 2010-07-08 12:52:17 +00:00
Michael Raskin
ba1f6982fd Allow overrides for SF version extractor 
svn path=/nixpkgs/trunk/; revision=22394
 2010-06-23 10:05:57 +00:00
Michael Raskin
558251da4a Adding golly (a cellular automata program) 
svn path=/nixpkgs/trunk/; revision=22391
 2010-06-23 07:41:17 +00:00
Michael Raskin
44216c2ef8 Use an SF version extractor with better chances to yield correct result by default 
svn path=/nixpkgs/trunk/; revision=22390
 2010-06-23 04:58:07 +00:00
Michael Raskin
6308953547 Small fixes to auto-updater 
svn path=/nixpkgs/trunk/; revision=22389
 2010-06-23 04:50:03 +00:00
Michael Raskin
0fcb69e1da Add a Sourceforge-friendly fetch method to upstream-updater 
svn path=/nixpkgs/trunk/; revision=22388
 2010-06-23 04:39:21 +00:00
Eelco Dolstra
12ede4793f * Add ftp-archives.postgresql.org as a fallback for PostgreSQL 
downloads.
* PostgreSQL updated to 8.3.11, 8.4.4.  

svn path=/nixpkgs/trunk/; revision=22365
 2010-06-21 20:43:05 +00:00
Eelco Dolstra
3962afb3a7 * Add a fallback for Debian releases (in particular `etch'). 
svn path=/nixpkgs/trunk/; revision=22355
 2010-06-21 12:19:34 +00:00
Eelco Dolstra
b3bd6e9eee * Doh. 
svn path=/nixpkgs/trunk/; revision=22350
 2010-06-20 23:24:52 +00:00
Eelco Dolstra
cb5bcfa04a * In the VM tests, apply a patch to increase the 15s timeout on CIFS 
operations to 120s.  This is necessary if the host is heavily
  loaded.  For instance, in the Hydra build farm, if there are many
  concurrent jobs, VM builds often fail because they hit the timeout.

svn path=/nixpkgs/trunk/; revision=22347
 2010-06-20 20:52:08 +00:00
Eelco Dolstra
0f77615483 svn path=/nixpkgs/trunk/; revision=22333 2010-06-18 19:57:11 +00:00
Eelco Dolstra
7a1dde5d25 * Fix the download of discontinued openSUSE releases. 
svn path=/nixpkgs/trunk/; revision=22324
 2010-06-18 11:49:57 +00:00
Michael Raskin
1daa883f8c Support renamed downloads for autoupdatable packages 
svn path=/nixpkgs/trunk/; revision=22303
 2010-06-17 05:19:26 +00:00
Eelco Dolstra
124f4dc7dd * Doh. 
svn path=/nixpkgs/trunk/; revision=22289
 2010-06-16 06:56:12 +00:00
Eelco Dolstra
1626db66f5 * Make the script to start Samba available to the VM stuff in NixOS. 
* Use socat's "exec" and "nofork" options to reduce the number of
  processes.  Also, if smbd exits abnormally, exit from the smbd
  restart loop.

svn path=/nixpkgs/trunk/; revision=22279
 2010-06-15 16:13:10 +00:00
Sander van der Burg
2b7faad594 Renamed buildSolution => build-solution 
svn path=/nixpkgs/trunk/; revision=22277
 2010-06-15 12:23:28 +00:00
Sander van der Burg
cc6acb3e40 Added my very experimental Visual Studio build stuff. You should be even more brave to use this 
svn path=/nixpkgs/trunk/; revision=22273
 2010-06-15 11:32:19 +00:00
Sander van der Burg
970ce3a878 Commited my experimental Visual C# build function. Currently, it should only be used by brave people 
svn path=/nixpkgs/trunk/; revision=22272
 2010-06-15 11:16:35 +00:00
Eelco Dolstra
22f7cf6976 svn path=/nixpkgs/trunk/; revision=22266 2010-06-14 18:42:52 +00:00
Eelco Dolstra
98dff00f52 * Clean up diskImages/diskImageFuns/diskImageExtraFuns. 
svn path=/nixpkgs/trunk/; revision=22265
 2010-06-14 18:42:18 +00:00
Eelco Dolstra
ef674da49e * Cleanup the definition of `diskImages' using mapAttrs. 
svn path=/nixpkgs/trunk/; revision=22263
 2010-06-14 17:34:02 +00:00
Eelco Dolstra
b49f21d5e8 * Add a fallback mirror for very old Ubuntu releases. 
svn path=/nixpkgs/trunk/; revision=22262
 2010-06-14 17:22:56 +00:00
Eelco Dolstra
c0d2c74038 * Added Ubuntu 10.04 "Lucid". 
svn path=/nixpkgs/trunk/; revision=22261
 2010-06-14 17:05:26 +00:00
Eelco Dolstra
81fa7ae7b2 * Added Fedora 13. 
svn path=/nixpkgs/trunk/; revision=22259
 2010-06-14 16:48:36 +00:00
Eelco Dolstra
b570419efa * Urgh, if $TMPDIR is very long we run into the 108 character limit on 
Unix domain socket paths.  So use ./samba instead of $TMPDIR/samba.

svn path=/nixpkgs/trunk/; revision=22256
 2010-06-14 11:18:57 +00:00
Lluís Batlle i Rossell
86345919c2 Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
 2010-06-14 09:28:10 +00:00
Eelco Dolstra
cc27927f8a * Hack to prevent the socat process from hanging the builder. 
svn path=/nixpkgs/trunk/; revision=22251
 2010-06-14 07:39:13 +00:00
Eelco Dolstra
88a5d8915a * Support repeated mounting of the CIFS share. Necessary because the 
mount tends to timeout if the host is heavily loaded.

svn path=/nixpkgs/trunk/; revision=22250
 2010-06-14 00:18:54 +00:00
Eelco Dolstra
1f8e6d4814 * The -smb flag in QEMU/KVM is unreliable: it doesn't work without the 
-no-kvm-irqchip flag, and on the Hydra machines only works on the
  rather old KVM 76.  So as a workaround, don't use -smb, but use
  QEMU's "guestfwd" feature to forward 10.0.2.4:139 in the guest to a
  Unix domain socket on the host connected to Samba.
* Use "cache=writeback" to improve performance a lot.
* Use "werror=report" to make QEMU crash instead of hang if the host
  filesystem is full.

svn path=/nixpkgs/trunk/; revision=22249
 2010-06-13 23:49:16 +00:00
Lluís Batlle i Rossell
0530f43655 Updating go, and making the go expression work in both i686-linux and x86_64-linux. 
svn path=/nixpkgs/trunk/; revision=22230
 2010-06-12 11:21:20 +00:00
Eelco Dolstra
6dddd07402 * vmTools: don't use klibc anymore. Just use utillinux/bash/etc. 
svn path=/nixpkgs/trunk/; revision=22209
 2010-06-10 12:28:04 +00:00
Rob Vermaas
7a4356b7e9 typo 
svn path=/nixpkgs/trunk/; revision=22170
 2010-06-07 14:24:57 +00:00
Rob Vermaas
94356324f5 antbuild: added 2 arguments, antbuildinputs (all jars are added to classpath) and buildfile (for different location of build.xml) 
svn path=/nixpkgs/trunk/; revision=22169
 2010-06-07 13:58:13 +00:00
Michael Raskin
5d10c4f9b9 Hint at usage if called without parameters 
svn path=/nixpkgs/trunk/; revision=22159
 2010-06-05 21:14:01 +00:00
Eelco Dolstra
b8c2a1bebe svn path=/nixpkgs/trunk/; revision=22125 2010-06-03 14:29:12 +00:00
Eelco Dolstra
8e0860b5ca * Debian 4.0 updated to r9. 
svn path=/nixpkgs/trunk/; revision=22079
 2010-06-01 10:44:36 +00:00
Yury G. Kudryashov
c74d23dbdf Fix typo, thanks to Rob Vermaas 
svn path=/nixpkgs/trunk/; revision=22031
 2010-05-28 06:49:32 +00:00
Yury G. Kudryashov
952bc80b4d Let fetchurl retry failed downloads. Add NIX_CURL_FLAGS impure var 
svn path=/nixpkgs/trunk/; revision=22006
 2010-05-27 18:59:19 +00:00
Lluís Batlle i Rossell
bd9c968158 Removing any rest of the trunk's stdenv2, that has a fix in ld-wrapper to make 
it properly put the rpath for directly passed .so files, and additionally it
works much faster than the old ld-wrapper.


svn path=/nixpkgs/branches/stdenv-updates/; revision=21978
 2010-05-25 20:51:01 +00:00
Lluís Batlle i Rossell
fa1a414aee Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that 
well


svn path=/nixpkgs/branches/stdenv-updates/; revision=21975
 2010-05-25 20:38:18 +00:00
Ludovic Courtès
9f50c154c3 Revert "releaseTools.sourceTarball: Make the bootstrap build inputs native." 
This reverts commit 84b521c23b57108fc63731de7723885d68a92b08.
Reverting "releaseTools.sourceTarball: Fix regression introduced in r21955."
Reverting "releaseTools.sourceTarball: Make the bootstrap build inputs native."

svn path=/nixpkgs/trunk/; revision=21962
 2010-05-25 08:24:50 +00:00
Ludovic Courtès
e436eb4915 releaseTools.sourceTarball: Fix regression introduced in r21955. 
svn path=/nixpkgs/trunk/; revision=21959
 2010-05-24 23:03:00 +00:00
Ludovic Courtès
0146e9b7ab releaseTools.sourceTarball: Make the bootstrap build inputs native. 
svn path=/nixpkgs/trunk/; revision=21955
 2010-05-24 21:28:36 +00:00
Ludovic Courtès
8ccb0fda33 fetchgit: Track all remote branches when `$rev' is non-empty. 
svn path=/nixpkgs/trunk/; revision=21892
 2010-05-19 21:27:01 +00:00
Lluís Batlle i Rossell
6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
 2010-05-19 15:26:00 +00:00
Ludovic Courtès
7a491b54fa releaseTools.coverageAnalysis: Add `lcovExtraTraceFiles' parameter. 
svn path=/nixpkgs/trunk/; revision=21743
 2010-05-12 12:22:44 +00:00
Lluís Batlle i Rossell
4b44717b1d Making the ld-wrapper2.sh much faster, when having lots of '-L' parameters, 
breaking a double loop we had.

svn path=/nixpkgs/trunk/; revision=21583
 2010-05-03 19:59:51 +00:00
Yury G. Kudryashov
796ffd9f71 Move "fetchurl restricted" code to requireFile. 
This reverts r21474 and r21467.
Also migrate wtk (r21472) to new API.

svn path=/nixpkgs/trunk/; revision=21575
 2010-05-03 09:13:17 +00:00
Yury G. Kudryashov
3e1e56e10c fetchurl restricted: list nix-prefetch-url as well 
svn path=/nixpkgs/trunk/; revision=21474
 2010-05-01 07:07:36 +00:00
Yury G. Kudryashov
404c314412 Add support for restricted downloads 
svn path=/nixpkgs/trunk/; revision=21467
 2010-04-30 20:40:42 +00:00
Lluís Batlle i Rossell
6f2fac6466 Merging from trunk. 
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
 2010-04-22 21:44:33 +00:00
Rob Vermaas
fbc33c5485 maven-build.nix: added extraMvnFlags argurment 
svn path=/nixpkgs/trunk/; revision=21181
 2010-04-20 14:32:07 +00:00
Lluís Batlle i Rossell
71f2fc2324 Fix the upstream-update snippets.sh for sourceforge URLs (sourceforge changed the url pattern) 
svn path=/nixpkgs/trunk/; revision=21133
 2010-04-16 17:34:01 +00:00
Yury G. Kudryashov
99e825a42c Build MIME database from all available packages 
svn path=/nixpkgs/trunk/; revision=21076
 2010-04-14 19:26:50 +00:00
Yury G. Kudryashov
295af6ab17 Ignore fake collisions 
svn path=/nixpkgs/trunk/; revision=21075
 2010-04-14 19:26:31 +00:00
Yury G. Kudryashov
31d047a83f Remove tabs 
svn path=/nixpkgs/trunk/; revision=21004
 2010-04-10 20:27:09 +00:00
Rob Vermaas
8929e647c6 generatewrapper fix 
svn path=/nixpkgs/trunk/; revision=20796
 2010-03-23 20:54:59 +00:00
Lluís Batlle i Rossell
dd4ad6741e Fixing once again the ld-wrapper.sh script. I put it in a gcc-wrapper apart, to be removed 
on the next stdenv-updates.
This would fix the build for many cmake packages, although that requires updating the stdenv
in those for its gcc to use this 2nd wrapper.

I updated paraview and avidemux. I can't recall now more packages with problems, but I was
quite sure there were.

If anyone sees a cmake-built package with the result binaries lacking some rpaths, then try
this wrapper.


svn path=/nixpkgs/trunk/; revision=20669
 2010-03-16 20:49:26 +00:00
Rob Vermaas
addc98c02f initial version for maven builder 
svn path=/nixpkgs/trunk/; revision=20558
 2010-03-11 14:44:17 +00:00
Lluís Batlle i Rossell
8c2af71a0f Fixing the gcc-cross-wrapper (wanting to make it work with uclibc, I had 
broken it for glibc).
Now I tested that it works for both.

svn path=/nixpkgs/trunk/; revision=20519
 2010-03-10 09:15:20 +00:00
Lluís Batlle i Rossell
fb6adb13ac Updating busybox. I left only a single busybox in its directory. The others, coming from the old 
cross-building nixpkgs implementation, were not referenced anywhere.

This new busybox builds natively, and also cross-builds with uclibc.

I updated the uclibc config with a busybox defconfig requirement (something about RPC).

I made the gcc-cross-wrapper properly set the dynamic loader to programs.

After this, 'qemu-arm' can run the dynamically linked busybox cross built for armv5tel--linux-gnueabi.



svn path=/nixpkgs/trunk/; revision=20514
 2010-03-09 22:17:38 +00:00
Lluís Batlle i Rossell
f36f99e368 Making gcc cross-buildable, at least for glibc. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=20454
 2010-03-06 21:41:01 +00:00
Rob Vermaas
e55f37246a use hydrantlogger if in environment 
svn path=/nixpkgs/trunk/; revision=20399
 2010-03-05 10:35:11 +00:00
Rob Vermaas
edb6a80ac3 ant builder 
svn path=/nixpkgs/trunk/; revision=20395
 2010-03-05 10:09:22 +00:00
Lluís Batlle i Rossell
3b747e92e5 Fixing the correct handling of uboot in the initrd and the kernel derivations. 
(nixos on sheevaplug)


svn path=/nixpkgs/trunk/; revision=20275
 2010-02-27 18:51:06 +00:00
Lluís Batlle i Rossell
11aa65c28a Simplified much more the expressions for cross building and multiplatform. 
I introduce the new nixpkgs parameter "platform", defaulting to "pc",
which was before defined as an attribute of nixpkgs.

I made the crossSystem nixpkgs attribute set parameter contain its own 'platform'.

This allows cross-building a kernel for a given crossSystem.platform in a non-PC
platform.

The actual native platform can be taken from stdenv.platform, and this way we also
avoid the constant passing of 'platform' to packages for platform-dependant builds
(kernel, initrd, ...).

I will update nixos accordingly to these changes, for non-PC platforms to work.

I think we are gaining on flexibility and clearness. I could cross build succesfully
an ultrasparc kernel and a mipsel kernel on PC. But since this change, I should be able
to do this also in non-PC.

Before this change, there was no possibility of distinguishing the "target platform" or
the "native build platform" when cross building, being the single "platform" attribute
always interpreted as target platform.

The platform is a quite relevant attribute set, as it determines the linuxHeaders used
(in the case, by now the only one supported, of linux targets).

The platform attributes are quite linux centric still. Let's hope for more generality to come.

svn path=/nixpkgs/trunk/; revision=20273
 2010-02-27 17:35:47 +00:00
Lluís Batlle i Rossell
9bcb6277f3 Changing linux kernel references from vmlinuz to bzImage. 
This way we get a simpler kernel build script.

svn path=/nixpkgs/trunk/; revision=20094
 2010-02-18 11:34:48 +00:00
Michael Raskin
89d1b7881f Update SGT puzzles and improve builderDefs processing of propagated(Native)BuildInputs after stdenv merge 
svn path=/nixpkgs/trunk/; revision=20093
 2010-02-18 10:29:40 +00:00
Eelco Dolstra
d8c6bb130c * Sync with the trunk one last time. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
 2010-02-05 23:06:36 +00:00
Eelco Dolstra
aee659e1e2 * Fix various broken URLs / mirrors. 
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
 2010-02-05 22:00:51 +00:00
Eelco Dolstra
a617a7c239 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
 2010-02-03 14:23:43 +00:00
Eelco Dolstra
1c92df1384 * Debian 5.0.4. 
svn path=/nixpkgs/trunk/; revision=19748
 2010-02-01 15:17:34 +00:00
Lluís Batlle i Rossell
64f0d74319 Fixing the gcc/gcc-wrapper so 'ghdl' gets the proper wrapper (langVhdl = true, 
from gcc).


svn path=/nixpkgs/branches/stdenv-updates/; revision=19714
 2010-01-27 16:29:11 +00:00
Rob Vermaas
13417770a3 applying patches provided by griswold 
svn path=/nixpkgs/trunk/; revision=19707
 2010-01-27 12:12:35 +00:00
Eelco Dolstra
116443e839 * Don't call grep from ld-wrapper (especially not O(n^2) times) 
because it makes linking very slow.  Use bash's =~ operator instead
  (and only once for each argument).  We depend on bash already anyway
  because of arrays so it's not a problem.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19699
 2010-01-26 22:42:43 +00:00
Eelco Dolstra
64f1191313 * Fix Perl on FreeBSD. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19685
 2010-01-26 18:10:59 +00:00
Lluís Batlle i Rossell
bcba809460 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
 2010-01-25 18:52:07 +00:00
Ludovic Courtès
45aa4e2d7f nix-prefetch-git: Add support for $NIX_PREFETCH_GIT_DEEP_CLONE. 
svn path=/nixpkgs/trunk/; revision=19648
 2010-01-25 13:23:08 +00:00
Eelco Dolstra
b3625c242b * Add the ext3 module to the initrd. The Amazon image generator needs 
it.

svn path=/nixpkgs/trunk/; revision=19585
 2010-01-20 21:09:33 +00:00
Lluís Batlle i Rossell
61a72ef961 Removing the gnat and the ghdl wrappers, which I already integrated into 
gcc-wrapper.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19534
 2010-01-19 10:58:03 +00:00
Eelco Dolstra
dfd81bebb1 * gcc-wrapper2: obsolete. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19533
 2010-01-19 10:32:41 +00:00
Nicolas Pierron
ba79b38503 nix-prefetch-git: 
* Optimized download size in case of references.
* Add support for submodules.

svn path=/nixpkgs/trunk/; revision=19513
 2010-01-18 08:28:38 +00:00
Lluís Batlle i Rossell
3189e7a393 Adding two files I forgot to the gcc-wrapper, comming from the old 
gnat-wrapper.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19494
 2010-01-16 23:09:27 +00:00
Lluís Batlle i Rossell
08eb3243c9 Merging the ghdl-wrapper and gcc-wrapper into one. 
I will remove the ghdl-wrapper files later, if all this works.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19493
 2010-01-16 21:41:27 +00:00
Lluís Batlle i Rossell
e72908036f Merging the gnat-wrapper and gcc-wrapper into a single gcc-wrapper. 
(I will remove the gnat-wrapper files if this works, later)


svn path=/nixpkgs/branches/stdenv-updates/; revision=19492
 2010-01-16 21:32:44 +00:00
Lluís Batlle i Rossell
20e75e0cf0 Fixing the gcc-wrapper, so it does not link when gcc is called with '-x 
something'.
It should not link at least for '-x c-header' and '-x c++-header', and maybe
link for '-x c' or '-x c++', but we expect noone will be linking using these
later strings.

Adding opencv, which required '-x c-header' working, and that's why I have
updated gcc wrapper.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19491
 2010-01-16 21:26:10 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk. 
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
 2010-01-14 14:49:31 +00:00
Eelco Dolstra
4df0f01c0f * Revert r19331 - Linux 2.6.27 doesn't support bzip2. 
svn path=/nixpkgs/trunk/; revision=19335
 2010-01-10 19:03:39 +00:00
Eelco Dolstra
ea21783487 * Compress the initrd with bzip2. 
svn path=/nixpkgs/trunk/; revision=19331
 2010-01-10 16:51:54 +00:00
Rob Vermaas
41698cf72c obviously just c/p'ing without testing should result in taking away commit rights... 
svn path=/nixpkgs/trunk/; revision=19208
 2010-01-04 13:37:49 +00:00
Rob Vermaas
db6f4ee89c * nix-build.nix: omit phases and define postPhases, suggested by eelco 
svn path=/nixpkgs/trunk/; revision=19203
 2010-01-04 12:44:34 +00:00
Rob Vermaas
67d7f430e2 * removed wrong order of phases from nixbuild, for now make check after install for strategoxt packages 
svn path=/nixpkgs/trunk/; revision=19202
 2010-01-04 12:07:05 +00:00
Nicolas Pierron
9d62d5a35c * Add a wrapper to find any set-uid version of a program in the environment. 
svn path=/nixpkgs/trunk/; revision=19181
 2010-01-03 11:08:45 +00:00
Lluís Batlle i Rossell
d864771e26 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
 2009-12-28 11:40:34 +00:00
Eelco Dolstra
4877e003b2 * Fix nix-env evaluation. 
svn path=/nixpkgs/trunk/; revision=19122
 2009-12-25 19:20:38 +00:00
Lluís Batlle i Rossell
3e10ba6bb9 Fixing an evaluation error: kernelPackages -> linuxPackages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19077
 2009-12-22 09:23:17 +00:00
Lluís Batlle i Rossell
7ee537f955 Getting a new gcc-wrapper on the way. After gnat-wrapper, I introduce 
ghdl-wrapper.
I made the gcc-4.3.4 expression allow the 'vhdl' language through ghdl.
The ghdl developer recommends this gcc version; maybe it would work with
gcc-4.4. If not this ghdl version, maybe next versions.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19071
 2009-12-21 23:02:06 +00:00
Lluís Batlle i Rossell
8a0a76f5e6 In a recent commit I made references to path out of the svn tree, which 
broke the evaluation of nixpkgs.
I also tried to make the gnat wrapper friendly to any gnat installation, not
only gnatboot.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19062
 2009-12-21 08:03:30 +00:00
Lluís Batlle i Rossell
fb82bac2fc Adding first built version of the gnat compiler for gcc 4.4. 
Some things don't work:
- The ghdl expression (it still needs the gcc 4.3.4 src, ...)
- The gnat wrappers need to be more generic - now they work only for the
  given gnatboot (taken from gentoo) and gnats installed to their $out
  store path.
- Using the cloogppl and ppl. We will need our own gnatboot built with c++
  libraries for that.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19060
 2009-12-21 07:49:31 +00:00
Lluís Batlle i Rossell
5bae851b1e Merging from trunk. I had to give away some structure to build the native 
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
 2009-12-19 11:14:16 +00:00
Eelco Dolstra
798c6f3960 * Include the ext2 and unix modules in the initrd. 
* Don't assume that /dev/vda has major 253, since that's not always
  the case.
* Use Linux 2.6.32.

svn path=/nixpkgs/trunk/; revision=19031
 2009-12-18 12:10:35 +00:00
Lluís Batlle i Rossell
193f70d887 Updating the ld-wrapper about linking of direct .so files. The previous 
regexp looking for such ld arguments did not work well with "--soname=xxx.so".
Now I added the condition that the argument should not start with a hyphen, for
it to be possibly considered a .so file to link with.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18919
 2009-12-13 16:18:53 +00:00
Lluís Batlle i Rossell
6bacb66dd3 Updating the gcc-wrapper with the changes done in trunk's gcc-wrapper2. 
Removing any reference to the gcc-wrapper2, as now the gcc-wrapper already conveys
the changes, I created gcc-wrapper2 in trunk for.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18913
 2009-12-12 18:48:07 +00:00
Lluís Batlle i Rossell
dae3eb2383 Merging from trunk. 
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
 2009-12-12 18:39:09 +00:00
Marc Weber
5319704f80 removing old bleeding edge cruft replacing it by a niftier version using 
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
 2009-12-11 13:58:23 +00:00
Lluís Batlle i Rossell
f3c23487a2 Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild 
stdenv.

In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared
objects through direct pass as ld command arguments of the absolute path to shared
objects, instead of using the -L/-l combinations.

cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly
passing the absolute path to the shared object to the linker, and as our wrapper did
not add any -rpath for those, writting the nix expressions for some cmake packages
resulted in a lot of tricks, compared to using this gcc-wrapper2.

This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a
stdenv update.

I also updated some cmake expressions to use this gcc-wrapper2, and reduced its
tricks.

I also updated the cmake setup-hook for it to make cmake not touch any rpath decided
at build time, when running the 'make install' of makefiles created by cmake.

svn path=/nixpkgs/trunk/; revision=18885
 2009-12-10 22:19:52 +00:00
Lluís Batlle i Rossell
89fe676bb3 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
 2009-12-10 14:48:45 +00:00
Eelco Dolstra
b2c9e50203 * Added Fedora 12. This requires the latest RPM, because the RPMs are 
compressed with xz.

svn path=/nixpkgs/trunk/; revision=18868
 2009-12-09 22:35:46 +00:00
Michael Raskin
13b91e2ca8 Update CouchDB; add Apache-related snippets to update-upstream-data. 
svn path=/nixpkgs/trunk/; revision=18851
 2009-12-09 12:59:23 +00:00