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

660 commits

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