Commit graph

613 commits

Author SHA1 Message Date
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