Commit graph

382 commits

Author SHA1 Message Date
Sander van der Burg
fef5fcc47b Added empty line
svn path=/nixpkgs/trunk/; revision=17850
2009-10-16 10:21:27 +00:00
Sander van der Burg
1ca15d18f4 FreeBSD uses GNU sed now
svn path=/nixpkgs/trunk/; revision=17849
2009-10-16 10:18:55 +00:00
Sander van der Burg
18f8aa9a91 The BSD platforms now use GNU tar by default
svn path=/nixpkgs/trunk/; revision=17848
2009-10-16 10:09:33 +00:00
Sander van der Burg
4756054e17 Added some NetBSD support to the native stdenv component
svn path=/nixpkgs/trunk/; revision=17847
2009-10-16 10:03:27 +00:00
Sander van der Burg
068b2158f5 Added Solaris support to the stdenv
svn path=/nixpkgs/trunk/; revision=17559
2009-09-30 15:19:25 +00:00
Sander van der Burg
b08cf58c59 Added more aliases to GNU tools, since the BSD userspace is sometimes too poor (i.e. lacks certain options to commands) to deal with our scripts
svn path=/nixpkgs/trunk/; revision=17363
2009-09-23 13:54:45 +00:00
Sander van der Burg
4fafee1555 Added initial OpenBSD support to the stdenv
svn path=/nixpkgs/trunk/; revision=17362
2009-09-23 13:30:04 +00:00
Eelco Dolstra
f782f14e58 * Factor out an adapter to clean up the build tree.
svn path=/nixpkgs/trunk/; revision=16920
2009-09-02 06:31:13 +00:00
Eelco Dolstra
58e6161768 * addCoverageInstrumentation: factor out the code that keeps the build
tree under $out into a separate stdenv adapter named keepBuildTree.
* makeModulesClosure: support building an initrd for a kernel that has
  been compiled with coverage instrumentation.

svn path=/nixpkgs/trunk/; revision=16916
2009-09-01 21:56:46 +00:00
Eelco Dolstra
0fd5ed507e * A stdenv adapter to build a package with coverage instrumentation.
svn path=/nixpkgs/trunk/; revision=16890
2009-08-28 16:45:56 +00:00
Lluís Batlle i Rossell
d4aedd92cc I revert my changes to get nixpkgs working on armv5tel-linux.
I thought I didn't change stdenv, but I did. This will go soon into the stdenv
branch then.
Reverse-merging r16467 through r16465.


svn path=/nixpkgs/trunk/; revision=16468
2009-07-26 22:47:33 +00:00
Lluís Batlle i Rossell
532fc4a05d Adding armv5tel to the 'if' checks in stdenv, gcc-wrapper and kernel headers
svn path=/nixpkgs/trunk/; revision=16466
2009-07-26 21:48:10 +00:00
Lluís Batlle i Rossell
dcf0a95a72 Updating to allow ld-linux.so.? interpreters, instead of always .so.2
svn path=/nixpkgs/trunk/; revision=16465
2009-07-26 21:48:00 +00:00
Eelco Dolstra
ae03990f6a * setup-new -> setup.
svn path=/nixpkgs/branches/stdenv-updates/; revision=16133
2009-07-02 09:01:37 +00:00
Eelco Dolstra
cdf4cf5c23 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=16094
2009-06-30 11:42:15 +00:00
Eelco Dolstra
a830968c53 * New bootstrap binaries (from r16022 in the trunk). Don't set
LD_LIBRARY_PATH since it breaks /bin/sh on non-NixOS platforms (and
  reverted the previous "fix" in r15470).

svn path=/nixpkgs/branches/stdenv-updates/; revision=16029
2009-06-22 19:49:42 +00:00
Eelco Dolstra
ef83c754f6 * Updated the function that builds the bootstrap binaries.
* Use patchelf 0.5 and use the --force-rpath flag.  This removes the
  need for setting LD_LIBRARY_PATH and so should fix bootstrapping
  Nixpkgs on non-NixOS platforms.

svn path=/nixpkgs/trunk/; revision=16022
2009-06-22 14:28:07 +00:00
Eelco Dolstra
a40dbf619d * Fix duplication of the version in dietlibc's gcc wrapper.
svn path=/nixpkgs/trunk/; revision=16021
2009-06-22 14:26:14 +00:00
Eelco Dolstra
16fef1d9d6 * dontMakeSourcesWritable: should be a variable. Caught by Marc
Weber.

svn path=/nixpkgs/trunk/; revision=15961
2009-06-15 13:39:09 +00:00
Rob Vermaas
68d5a14183 * xargsFlag empty on darwin
svn path=/nixpkgs/trunk/; revision=15919
2009-06-10 11:08:53 +00:00
Eelco Dolstra
2d0b32453c * setup.sh: quote $NIX_BUILD_TOP. Otherwise a line like
export > $NIX_BUILD_TOP/env-vars

  will fail if the name attribute contains a metacharacter
  (e.g. "?"):

    building path(s) `/nix/store/yk93gk3lc5bslcn5hklnzs0bdkp2r0an-icu-3.8-setBreakType-public.diff?rev=1.1'
    /nix/store/gj8ac12mrwinbq7wzzhwfjjs3028a11x-stdenv-linux/setup: line 374: $NIX_BUILD_TOP/env-vars: ambiguous redirect

  I guess this only happens if you happen to have an old temporary
  build directory for the same derivation in /tmp.

  This affects fetchurl in particular.

svn path=/nixpkgs/trunk/; revision=15915
2009-06-10 09:34:42 +00:00
Eelco Dolstra
89b8ab2d78 * Work around /bin/sh being broken by an LD_LIBRARY_PATH that contains
another Glibc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15470
2009-05-06 13:49:12 +00:00
Eelco Dolstra
671d53dd35 * Allow the user to install stdenv (nix-env -i stdenv) and get all the
packages in the stdenv as propagated user environment packages.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15300
2009-04-25 14:08:29 +00:00
Eelco Dolstra
2a699fe5fb * Pass --disable-static to configure by default it it's supported.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15234
2009-04-21 22:40:12 +00:00
Eelco Dolstra
6b9ccbaf78 * setup.sh: turn on nullglob globally.
* setup.sh: removed some obsolete features, specifically some that
  were only used by the old build farm.
* addToSearchPath: removed some parameters that weren't used
  anywhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
2009-04-18 22:22:51 +00:00
Eelco Dolstra
f5ef461217 svn path=/nixpkgs/branches/stdenv-updates/; revision=14979 2009-04-09 15:25:29 +00:00
Eelco Dolstra
d27514cb28 * Sync with the trunk once more.
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
2009-03-31 15:30:47 +00:00
Eelco Dolstra
2405d87230 * Move some functions for manipulating meta and name attributes out of
all-packages.nix and into lib.

svn path=/nixpkgs/trunk/; revision=14778
2009-03-30 13:22:19 +00:00
Eelco Dolstra
e032d40614 * Some meta.description attributes.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14712
2009-03-25 18:34:27 +00:00
Eelco Dolstra
d9213df2c1 * gcc-wrapper: put "gcc-wrapper" in the name, e.g. "gcc-wrapper-4.3.3"
instead of "gcc-4.3.3".  This fixed the long-standing annoyance that
  you can't distinguish the two in (say) nix-store -qR.
* On x86_64-linux, put $out/lib64 in the RPATH in addition to
  $out/lib, because some packages (in particular GCC) put libraries in
  $out/lib64 and ended up linking against the wrong library.
* Strip $out/lib64.
* Removed g77_42 because it's exactly the same as gfortran.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14708
2009-03-25 17:34:38 +00:00
Eelco Dolstra
390695e73f * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
2009-02-12 21:16:55 +00:00
Eelco Dolstra
0cf9849afd * More refactoring: move all the stdenv adapter functions (like
useDietlibc) to a separate file.  all-packages.nix should really
  only contain package composition stuff.

svn path=/nixpkgs/trunk/; revision=14022
2009-02-10 15:48:30 +00:00
Eelco Dolstra
871e2e1b7f * stdenvLinux on powerpc-linux is currently broken.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13968
2009-02-03 09:59:03 +00:00
Eelco Dolstra
1dee2d3de0 * Fix stdenvNative/stdenvNix.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13957
2009-02-02 15:03:38 +00:00
Eelco Dolstra
779b4b2448 * Use GCC 4.3 by default.
* Updated stdenv-linux:

  - The bootstrap tools are no longer statically linked (except for
    binaries in the Nixpkgs tree used to download and unpack the
    bootstrap tools).

  - x86_64 uses the same static binaries as i686.  This makes the
    Nixpkgs tree a bit smaller.

  - Use the Linux 2.6.28 headers.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13946
2009-02-01 21:44:56 +00:00
Eelco Dolstra
52122b0e4d * Don't require a stdenv to build stdenv. This obviates the need for
a stdenvInitial in the bootstrap.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13942
2009-02-01 21:28:55 +00:00
Eelco Dolstra
12038d5586 * Allow hooks like preBuild to be set both through shell functions and
variables.  This is so you don't have to write things like

    preBuild=preBuild
    preBuild() {
      bla
    }

svn path=/nixpkgs/branches/stdenv-updates/; revision=13941
2009-02-01 21:28:02 +00:00
Eelco Dolstra
0e1483cf87 svn path=/nixpkgs/branches/stdenv-updates/; revision=13915 2009-01-30 13:21:17 +00:00
Eelco Dolstra
5f66ddd3c3 svn path=/nixpkgs/branches/stdenv-updates/; revision=13914 2009-01-30 09:27:15 +00:00
Eelco Dolstra
1c623126c7 * Use the sh from klibc in the bootstrap. It's a lot smaller than
bash.  Also, use the cpio from klibc instead of tar.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13905
2009-01-29 17:48:45 +00:00
Eelco Dolstra
c584bb878a * Sync with trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
2009-01-29 16:33:02 +00:00
Eelco Dolstra
c91168a600 * Bootstrap tools: build on x86_64-linux.
* Removed Perl from the bootstrap tools.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13827
2009-01-23 15:09:56 +00:00
Eelco Dolstra
fce6b5a233 * Use GCC 4.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13811
2009-01-19 20:35:03 +00:00
Eelco Dolstra
63246c648f * Turn on Make indentation.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13810
2009-01-19 20:31:02 +00:00
Eelco Dolstra
808bf6d34a * Make the nested output patch in GNU Make runtime configurable (by
setting the NIX_INDENT_MAKE variable; disabled by default) so we
  don't need a separate gnumakeNix package.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13807
2009-01-19 18:49:58 +00:00
Eelco Dolstra
2f88c471d4 svn path=/nixpkgs/branches/stdenv-updates/; revision=13789 2009-01-16 17:12:55 +00:00
Eelco Dolstra
1134464c49 * Start of the new, simplified stdenv-linux bootstrap binaries.
Instead of using a mishmash of statically linked and dietlibc
  programs (which often have problems on various platforms), we just
  use normal, dynamically linked binaries, and use some patchelf magic
  to rewrite them so that they can find Glibc.  Also include G++ and
  Perl, since there are some builds in the bootstrap that need them.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13788
2009-01-16 17:10:29 +00:00
Eelco Dolstra
0adab29d1e svn path=/nixpkgs/branches/stdenv-updates/; revision=13603 2008-12-10 10:21:05 +00:00
Eelco Dolstra
cdc74e1677 svn path=/nixpkgs/branches/stdenv-updates/; revision=13602 2008-12-10 10:12:32 +00:00
Eelco Dolstra
e31341510d * Merged from the trunk. Let's see how well this works with
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
2008-12-10 09:59:21 +00:00