3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

476 commits

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