1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
Commit graph

215 commits

Author SHA1 Message Date
Eelco Dolstra 2efe6dc281 * Tsk.
svn path=/nixpkgs/trunk/; revision=6865
2006-10-26 22:30:48 +00:00
Eelco Dolstra 0b7e256162 * Hook variables in the generic builder are now executed using eval.
This has a major advantage: you can write hooks directly in Nix
  expressions.  For instance, rather than write a builder like this:

    source $stdenv/setup

    postInstall=postInstall
    postInstall() {
        ln -sf gzip $out/bin/gunzip
        ln -sf gzip $out/bin/zcat
    }

    genericBuild

  (the gzip builder), you can just add this attribute to the
  derivation:

    postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat";

  and so a separate build script becomes unnecessary.  This should
  allow us to get rid of most builders in Nixpkgs.

* Allow configure and make arguments to contain whitespace.
  Previously, you could say, for instance

    configureFlags="CFLAGS=-O0"

  but not

    configureFlags="CFLAGS=-O0 -g"

  since the `-g' would be interpreted as a separate argument to
  configure.  Now you can say

    configureFlagsArray=("CFLAGS=-O0 -g")

  or similarly

    configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar")

  which does the right thing.  Idem for makeFlags, installFlags,
  checkFlags and distFlags.

  Unfortunately you can't pass arrays to Bash through the environment,
  so you can't put the array above in a Nix expression, e.g.,

    configureFlagsArray = ["CFLAGS=-O0 -g"];

  since it would just be flattened to a since string.  However, you
  can use the inline hooks described above:

    preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";


svn path=/nixpkgs/trunk/; revision=6863
2006-10-26 22:20:25 +00:00
Eelco Dolstra 45bf677dcc * Doh.
svn path=/nixpkgs/trunk/; revision=6859
2006-10-26 19:00:46 +00:00
Eelco Dolstra 29f9225a9d * Symlink gunzip, zcat.
svn path=/nixpkgs/trunk/; revision=6857
2006-10-26 14:35:57 +00:00
Eelco Dolstra 7d5de08c1c * More simplification.
svn path=/nixpkgs/trunk/; revision=6838
2006-10-24 23:07:37 +00:00
Eelco Dolstra 66fb5088c5 * Doh.
svn path=/nixpkgs/trunk/; revision=6837
2006-10-24 23:05:53 +00:00
Eelco Dolstra 4d3059721d * bash 2.0, findutils 4.2.28.
* Some Nix expression simplifications.  Sense and simplicity!

svn path=/nixpkgs/trunk/; revision=6836
2006-10-24 23:05:12 +00:00
Eelco Dolstra f86c11815f * Use coreutils 6.4; the dietlibc patch has been merged.
svn path=/nixpkgs/trunk/; revision=6835
2006-10-24 22:49:08 +00:00
Eelco Dolstra de70885cfc * No longer needed.
svn path=/nixpkgs/trunk/; revision=6834
2006-10-24 22:41:38 +00:00
Eelco Dolstra 97a65f81b2 * Unify the bzip2 builders.
svn path=/nixpkgs/trunk/; revision=6833
2006-10-24 22:40:33 +00:00
Eelco Dolstra 5f4f8766cf * GNU tar 1.16.
svn path=/nixpkgs/trunk/; revision=6822
2006-10-24 17:24:46 +00:00
Eelco Dolstra 3d2e573eff * GNU sed 4.1.5 compiled with dietlibc gives "Memory exhausted" errors
on trivial patterns, so use an older sed instead (4.1.2).  See
  http://linuxfromscratch.org/pipermail/hlfs-dev/2005-September/002447.html.

svn path=/nixpkgs/trunk/; revision=6792
2006-10-20 20:05:26 +00:00
Eelco Dolstra 65bbb45ab7 * Add findutils to the bootstrap tools.
svn path=/nixpkgs/trunk/; revision=6791
2006-10-20 16:01:38 +00:00
Eelco Dolstra 884e8571c3 * Add grep.
svn path=/nixpkgs/trunk/; revision=6783
2006-10-19 22:47:51 +00:00
Eelco Dolstra 1acd2157cc * Add patch, sed.
svn path=/nixpkgs/trunk/; revision=6782
2006-10-19 22:31:08 +00:00
Eelco Dolstra c6ecc900cf * Add more stuff to the bootstrap builder.
* Remove some redundant *Diet values in all-packages.nix.

svn path=/nixpkgs/trunk/; revision=6780
2006-10-19 21:36:51 +00:00
Eelco Dolstra ce22859f8a * Bash on dietlibc.
* Pass -D_BSD_SOURCE=1 by default in the dietlibc stdenv.

svn path=/nixpkgs/trunk/; revision=6768
2006-10-18 16:16:07 +00:00
Eelco Dolstra f3619824a9 * bzip2 with dietlibc.
svn path=/nixpkgs/trunk/; revision=6767
2006-10-18 15:49:47 +00:00
Eelco Dolstra efc2b12da5 * A better patch.
svn path=/nixpkgs/trunk/; revision=6766
2006-10-18 15:26:48 +00:00
Eelco Dolstra 6ff020ad3a * Build coreutils on dietlibc.
svn path=/nixpkgs/trunk/; revision=6765
2006-10-18 15:16:53 +00:00
Eelco Dolstra 501ceef268 * A function `useDietLibC' that returns a modified stdenv that uses
dietlibc to produce small, statically linked binaries.  This stdenv
  also passes `-Os' to GCC automatically to optimise for size.  It
  also tries to prevent builders from linking against dynamic
  libraries (which dietlibc doesn't support).

* A function `addAttrsToDerivation' that returns a modified stdenv
  that always adds the specified attributes to the derivations that it
  produces.  Example (from curl):

    curlDiet =  import ../tools/networking/curl {
      inherit fetchurl zlib;
      stdenv = addAttrsToDerivation {
        CFLAGS = "-DHAVE_INET_NTOA_R_2_ARGS=1";
      } (useDietLibC stdenv);
    };

  (This is needed to get curl to build with dietlibc.  Also note the
  stacking of stdenv-modifying functions.)

* curl-diet: no longer necessary.

svn path=/nixpkgs/trunk/; revision=6761
2006-10-18 12:50:04 +00:00
Eelco Dolstra 8e08738756 * More URLs.
svn path=/nixpkgs/trunk/; revision=6718
2006-10-12 15:58:51 +00:00
Eelco Dolstra ef9b025dbe * Remove a bunch of unused Nix expressions.
svn path=/nixpkgs/trunk/; revision=6716
2006-10-12 15:43:01 +00:00
Eelco Dolstra ad897a7c96 * Update more URLs.
svn path=/nixpkgs/trunk/; revision=6713
2006-10-12 14:53:45 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 6006d61835 * Added a bunch of descriptions.
svn path=/nixpkgs/trunk/; revision=6705
2006-10-11 16:45:55 +00:00
Eelco Dolstra 67c581cdcc * Updated Pango, Cairo, Zip.
svn path=/nixpkgs/trunk/; revision=6697
2006-10-11 13:19:36 +00:00
Armijn Hemel 0ec7b4988f add coreutils-6.3, not the default, wait until more stdenv packages need updating
svn path=/nixpkgs/trunk/; revision=6646
2006-10-02 21:43:27 +00:00
Armijn Hemel 193edaab22 7.15.4 -> 7.15.5
svn path=/nixpkgs/trunk/; revision=6243
2006-08-25 21:01:42 +00:00
Armijn Hemel 3402fe7c80 new curl
svn path=/nixpkgs/trunk/; revision=6241
2006-08-25 20:38:30 +00:00
Armijn Hemel 3580697f20 add ploticus, yet another graphics program
svn path=/nixpkgs/trunk/; revision=6214
2006-08-23 16:09:03 +00:00
Eelco Dolstra bb53e3df6d * gnupg: use readline.
svn path=/nixpkgs/trunk/; revision=6198
2006-08-21 10:38:02 +00:00
Eelco Dolstra 0412dcc14c * Latest GnuPG.
svn path=/nixpkgs/trunk/; revision=6177
2006-08-18 09:31:45 +00:00
Eelco Dolstra 3fd8841922 * GNU Netcat.
svn path=/nixpkgs/trunk/; revision=6120
2006-08-15 13:22:45 +00:00
Eelco Dolstra 38ee361757 * Backout accidental commit.
svn path=/nixpkgs/trunk/; revision=6088
2006-08-09 15:49:02 +00:00
Eelco Dolstra bf1e734f85 * Don't use the subpath operator (~) anymore, it's subsumed by normal
concatenation (+).

svn path=/nixpkgs/trunk/; revision=6080
2006-08-09 15:05:30 +00:00
Armijn Hemel 7154adfa34 new version of ISC dhcpd
svn path=/nixpkgs/trunk/; revision=6074
2006-08-08 17:50:16 +00:00
Armijn Hemel e0758ef36a grub needs coreutils (for df and uniq)
svn path=/nixpkgs/trunk/; revision=6062
2006-08-06 23:53:48 +00:00
Armijn Hemel 0d685d9ebe move NIX_GLIBC_FLAGS_SET=1 to the dietlibc-wrapper
svn path=/nixpkgs/trunk/; revision=5992
2006-07-30 17:07:15 +00:00
Armijn Hemel 0d620b8890 1.4.2.2 -> 1.4.4
svn path=/nixpkgs/trunk/; revision=5878
2006-07-22 22:31:45 +00:00
Martin Bravenboer 69da897d0b Oops
svn path=/nixpkgs/trunk/; revision=5753
2006-07-17 20:42:44 +00:00
Martin Bravenboer c79c39f61f Problems with darwinports host. Added patches here.
svn path=/nixpkgs/trunk/; revision=5752
2006-07-17 20:41:15 +00:00
Martin Bravenboer bb3cfbe2a3 Added transfig, opefully the ugliest package of this world
svn path=/nixpkgs/trunk/; revision=5751
2006-07-17 20:35:02 +00:00
Eelco Dolstra fbf526d408 * Use stdenv.isDarwin.
svn path=/nixpkgs/trunk/; revision=5728
2006-07-17 11:07:32 +00:00
Eelco Dolstra 2881391565 * Fix GNU patch on Darwin (and probably FreeBSD as well).
svn path=/nixpkgs/trunk/; revision=5705
2006-07-14 11:20:30 +00:00
Eelco Dolstra ea2da73c8d * Doh! Idem.
svn path=/nixpkgs/trunk/; revision=5704
2006-07-14 10:59:14 +00:00
Eelco Dolstra f9a32684d2 * Workaround for silly sed problem.
svn path=/nixpkgs/trunk/; revision=5703
2006-07-14 10:58:46 +00:00
Eelco Dolstra 05094496b4 * TightVNC.
svn path=/nixpkgs/trunk/; revision=5698
2006-07-13 14:54:24 +00:00
Armijn Hemel 53d9e09d0d update to 7.15.4
svn path=/nixpkgs/trunk/; revision=5674
2006-07-10 18:22:50 +00:00
Armijn Hemel 1477b909f9 upgrade from 4.13 -> 4.17
svn path=/nixpkgs/trunk/; revision=5622
2006-07-06 18:15:07 +00:00