Commit graph

2259 commits

Author SHA1 Message Date
Eelco Dolstra 23b840f5bd * Refactor a bit.
svn path=/nixpkgs/trunk/; revision=7030
2006-11-14 15:49:07 +00:00
Eelco Dolstra 1ace3742a3 * Fix bzip2 on cygwin.
svn path=/nixpkgs/trunk/; revision=7025
2006-11-13 23:01:35 +00:00
Eelco Dolstra 5474c6518f * Impurity in udev: don't call /usr/bin/install.
svn path=/nixpkgs/trunk/; revision=7013
2006-11-13 10:33:29 +00:00
Martin Bravenboer d7fcf2f810 Added /usr/local/bin to the initial search path to support Massala
svn path=/nixpkgs/trunk/; revision=7011
2006-11-13 10:09:56 +00:00
Eelco Dolstra 3dcb2e095e * Urgh, go back to 0.25 (0.26 fails on most platforms).
svn path=/nixpkgs/trunk/; revision=6984
2006-11-08 16:39:20 +00:00
Eelco Dolstra aca43b766b * Sheesh, Subversion is picky.
svn path=/nixpkgs/trunk/; revision=6981
2006-11-08 16:11:51 +00:00
Eelco Dolstra 73448634c4 * Subversion 1.4.2.
* Neon 0.26.2.

svn path=/nixpkgs/trunk/; revision=6980
2006-11-08 13:03:55 +00:00
Eelco Dolstra 36b1473e09 * Allow the result to be stored somewhere else than $out.
svn path=/nixpkgs/trunk/; revision=6978
2006-11-08 09:26:18 +00:00
Eelco Dolstra 986ec9c8a1 * Fix some paths.
svn path=/nixpkgs/trunk/; revision=6974
2006-11-07 21:13:57 +00:00
Eelco Dolstra dab13a2af0 * Latest udev, which builds against the latest kernel.
svn path=/nixpkgs/trunk/; revision=6973
2006-11-07 19:48:05 +00:00
Eelco Dolstra eac4138841 * Cygwin patch.
svn path=/nixpkgs/trunk/; revision=6972
2006-11-07 16:07:42 +00:00
Eelco Dolstra 347ef7f889 * Turn on some Cygwin packages.
svn path=/nixpkgs/trunk/; revision=6969
2006-11-07 15:14:06 +00:00
Eelco Dolstra 908b2bf027 * Latest cpio; fixes a problem with symlinks.
svn path=/nixpkgs/trunk/; revision=6965
2006-11-07 10:48:08 +00:00
Eelco Dolstra 023e2003df * Install into $out/sbin, not $out/usr/sbin.
svn path=/nixpkgs/trunk/; revision=6962
2006-11-06 22:16:10 +00:00
Eelco Dolstra 609607768f * Turn the nukeRefs() function into a separate program.
svn path=/nixpkgs/trunk/; revision=6941
2006-11-03 13:33:24 +00:00
Eelco Dolstra d0a18cf8fa * Also symlink the linux directory in kernel-headers.
svn path=/nixpkgs/trunk/; revision=6940
2006-11-03 13:32:58 +00:00
Eelco Dolstra e8261201d8 * Dietlibc: symlink to the asm directory from kernel-headers, because
some programs (such as module-init-tools) need it.
* Remove module-init-tools-static, it now builds out of the box with
  dietlibc.

svn path=/nixpkgs/trunk/; revision=6938
2006-11-03 11:09:06 +00:00
Eelco Dolstra 039b141471 * Generate a modules.dep containing correct paths.
svn path=/nixpkgs/trunk/; revision=6935
2006-11-03 08:32:23 +00:00
Eelco Dolstra b99122d759 * Set MODULE_DIR.
svn path=/nixpkgs/trunk/; revision=6933
2006-11-03 00:34:48 +00:00
Eelco Dolstra e23c7013be * Revert r6921 because now I do want a kernel without builtin IDE
support and so on (so that I can test kernel modules in initrd).

svn path=/nixpkgs/trunk/; revision=6931
2006-11-02 23:40:16 +00:00
Eelco Dolstra 05c884b471 * Utility: the generic substituter. It substitutes all occurences of
`@var@' in the file `src', writing the result to $out, where `var'
  is any environment variable starting with a lowercase character.
  Example:

    genericSubstituter {
      src = ./file;
      foo = "bla";
      shell = bash + "/bin/sh";
    };

  will replace `@foo@' with `bla' and `@shell@' with
  `/nix/store/...-bash-.../bin/sh'.

svn path=/nixpkgs/trunk/; revision=6928
2006-11-02 22:44:32 +00:00
Eelco Dolstra 2f0d625a7a * Flash Player 9 Beta (enabled in the Firefox wrapper).
svn path=/nixpkgs/trunk/; revision=6925
2006-11-01 14:27:20 +00:00
Eelco Dolstra 641e72cf40 * iputils: use the same kernel headers as glibc.
svn path=/nixpkgs/trunk/; revision=6924
2006-11-01 13:58:46 +00:00
Eelco Dolstra ff0c1c7b99 * Add the kernel to the channel.
svn path=/nixpkgs/trunk/; revision=6922
2006-11-01 10:33:03 +00:00
Eelco Dolstra faeab47cf8 * Compile IDE support into the kernel rather than in modules. We need
this until we have some sort of initrd.

svn path=/nixpkgs/trunk/; revision=6921
2006-10-31 23:01:08 +00:00
Eelco Dolstra 32cb4c8a54 * Hack to get static util-linux builds to work.
svn path=/nixpkgs/trunk/; revision=6917
2006-10-31 16:21:24 +00:00
Eelco Dolstra 6225e46baf * Use a pure depmod.
svn path=/nixpkgs/trunk/; revision=6916
2006-10-31 16:03:19 +00:00
Eelco Dolstra 84ba6b71d2 * Disable ov511 for now.
svn path=/nixpkgs/trunk/; revision=6915
2006-10-31 13:21:31 +00:00
Eelco Dolstra 9a6683d6a2 * Linux kernel: updated to 2.6.18.1.
* Kernel: accept a list of kernel patches through the kernelPatches
  argument.  The names of the patches are added to the description
  attribute (e.g., "The Linux kernel (with patches:
  skas-2.6.18-v9-pre9)").
* Generic builder (forked in setup-new.sh): support patches that are
  compressed using gzip or bzip2.

svn path=/nixpkgs/trunk/; revision=6913
2006-10-31 11:40:35 +00:00
Eelco Dolstra 84983f974f * Strace fixes.
svn path=/nixpkgs/trunk/; revision=6911
2006-10-30 15:36:33 +00:00
Eelco Dolstra 39b95dd1f9 * util-linux 2.13pre7.
svn path=/nixpkgs/trunk/; revision=6909
2006-10-30 15:14:15 +00:00
Eelco Dolstra 769c44da98 * Get User Mode Linux to compile again:
- Hack to make it work with the latest host kernel headers
    (2.6.18.1).
  - Don't call depmod impurily, rather use oldskool modutils.
  - modutils: use the final version, and use GCC 3.4 to compile it
    (4.1 doesn't work).

svn path=/nixpkgs/trunk/; revision=6908
2006-10-30 13:45:48 +00:00
Eelco Dolstra 9050bc10fe * Latest bootstrap binaries for x86_64.
svn path=/nixpkgs/trunk/; revision=6907
2006-10-30 13:40:18 +00:00
Eelco Dolstra 37bbcde566 * Don't nuke unconditionally.
svn path=/nixpkgs/trunk/; revision=6905
2006-10-30 12:57:30 +00:00
Eelco Dolstra 711bb9b56a * Fix GCC 3.3.
svn path=/nixpkgs/trunk/; revision=6904
2006-10-30 11:58:24 +00:00
Eelco Dolstra 936e388171 * Doh.
svn path=/nixpkgs/trunk/; revision=6902
2006-10-29 00:41:29 +00:00
Eelco Dolstra 985f1f61af * Urgh, disable UML as well.
svn path=/nixpkgs/trunk/; revision=6901
2006-10-29 00:40:27 +00:00
Eelco Dolstra 203c8a1f3c * Disable transformers, strace; they don't build anymore.
svn path=/nixpkgs/trunk/; revision=6900
2006-10-29 00:36:17 +00:00
Eelco Dolstra f0a239989e * __currentSystem is evil.
svn path=/nixpkgs/trunk/; revision=6899
2006-10-29 00:05:17 +00:00
Eelco Dolstra 0b78c04601 * Fix gcc 3.3.
svn path=/nixpkgs/trunk/; revision=6898
2006-10-28 23:41:45 +00:00
Eelco Dolstra 000755f72e * Latest findutils doesn't build on Darwin, either.
svn path=/nixpkgs/trunk/; revision=6897
2006-10-28 23:17:39 +00:00
Eelco Dolstra ef4fe4f102 * Use a proper distribution.
svn path=/nixpkgs/trunk/; revision=6896
2006-10-28 22:31:46 +00:00
Eelco Dolstra c391e5855b * An example of supporting legacy applications using dosbox ;-)
svn path=/nixpkgs/trunk/; revision=6895
2006-10-28 22:28:35 +00:00
Eelco Dolstra f95a93197a * Don't use EPSV.
svn path=/nixpkgs/trunk/; revision=6894
2006-10-28 22:07:25 +00:00
Eelco Dolstra 0c0d30d248 * Fix the URLs / hashes.
svn path=/nixpkgs/trunk/; revision=6891
2006-10-28 13:51:49 +00:00
Eelco Dolstra bfa469d192 * New (smaller) bootstrap binaries for powerpc.
svn path=/nixpkgs/trunk/; revision=6889
2006-10-28 13:35:22 +00:00
Eelco Dolstra 64f8e95cf8 * Remove references from some GCC header file on powerpc.
svn path=/nixpkgs/trunk/; revision=6888
2006-10-28 13:32:49 +00:00
Eelco Dolstra 770517edbb * Doh, we're building in a different directory than the sources.
svn path=/nixpkgs/trunk/; revision=6887
2006-10-28 11:40:26 +00:00
Eelco Dolstra b8f17a1e59 * Workaround for the wrong <semaphore.h> getting installed. This
appears to be a regression:
  http://www.mail-archive.com/debian-glibc@lists.debian.org/msg31543.html 

svn path=/nixpkgs/trunk/; revision=6885
2006-10-28 10:17:08 +00:00
Eelco Dolstra 3a6754f6bb * gcc-4.1-temp -> gcc-4.1.
* Use real URLs.

svn path=/nixpkgs/trunk/; revision=6884
2006-10-27 23:14:41 +00:00
Eelco Dolstra b7a96d74e2 svn path=/nixpkgs/trunk/; revision=6883 2006-10-27 23:13:44 +00:00
Eelco Dolstra c37304db96 * Oops, the bootstrap tools contained an impure gzip/gunzip.
* To prevent this kind of thing, check that all tools are statically
  linked.
* Use findutils 4.2.27, 4.2.28 doesn't build with dietlibc.

svn path=/nixpkgs/trunk/; revision=6881
2006-10-27 22:50:58 +00:00
Eelco Dolstra de25bee83d * Of course, the latest GNU tar has the same gnulib header file shit
as coreutils.

svn path=/nixpkgs/trunk/; revision=6880
2006-10-27 20:14:19 +00:00
Eelco Dolstra 3ea7d9d272 * Fix static linking in gcc.
* Use the coreutils in dietlibc.
* Add objdump to the binutils static tarball.

svn path=/nixpkgs/trunk/; revision=6879
2006-10-27 20:08:53 +00:00
Eelco Dolstra 0f7883d12f * Revive the old coreutils, since coreutils 6 is broken beyond repair
with dietlibc (it does some incredibly nasty hackery with the system
  header files...).

svn path=/nixpkgs/trunk/; revision=6878
2006-10-27 19:53:23 +00:00
Eelco Dolstra d29fe5bfc1 * Remove dietgcc, use useDietLibC.
* glibc -> libc in some places.

svn path=/nixpkgs/trunk/; revision=6877
2006-10-27 13:52:37 +00:00
Eelco Dolstra 01fbf62a2c * nativeGlibc -> nativeLibc (gcc-cross-wrapper is probably broken
right now; should merge gcc-wrapper changes).

svn path=/nixpkgs/trunk/; revision=6876
2006-10-27 13:44:17 +00:00
Eelco Dolstra c43f885d2d * Disable the sole cygwin package.
svn path=/nixpkgs/trunk/; revision=6874
2006-10-27 12:56:24 +00:00
Eelco Dolstra b90781ec21 * Renamed orig-glibc -> orig-libc in some places, and in others, use
the new $NIX_GCC/nix-support/dynamic-linker file to locate the
  dynamic linker directly (don't hardcode ld-linux.so.2).

svn path=/nixpkgs/trunk/; revision=6873
2006-10-27 12:43:32 +00:00
Eelco Dolstra ee2b63c872 * Argggggghhhh.
svn path=/nixpkgs/trunk/; revision=6872
2006-10-27 12:07:03 +00:00
Eelco Dolstra 0e776c19d2 * Real URLs.
svn path=/nixpkgs/trunk/; revision=6869
2006-10-26 22:55:04 +00:00
Eelco Dolstra 609710f102 * Enable the pure stdenv-linux for powerpc.
svn path=/nixpkgs/trunk/; revision=6867
2006-10-26 22:41:46 +00:00
Eelco Dolstra 29961dbb85 * Doh.
svn path=/nixpkgs/trunk/; revision=6866
2006-10-26 22:40:44 +00:00
Eelco Dolstra 2efe6dc281 * Tsk.
svn path=/nixpkgs/trunk/; revision=6865
2006-10-26 22:30:48 +00:00
Eelco Dolstra cf693caa08 * Another example of an inline hook.
svn path=/nixpkgs/trunk/; revision=6864
2006-10-26 22:30:27 +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 c8cc992038 * Put a symlink to the assembler in the GCC wrapper. Otherwise, when
we use the GCC wrapper in a user environment, the wrong assembler
  will be called.  This is not usually a problem, but sometimes it is
  (e.g., when using G++ 4.1.1 with binutils 2.16 or so).

svn path=/nixpkgs/trunk/; revision=6862
2006-10-26 20:25:31 +00:00
Eelco Dolstra 2d3cfb2058 * Put back in the code to do a profiled GCC build, but turn in off
(build ICEs).

svn path=/nixpkgs/trunk/; revision=6861
2006-10-26 20:23:49 +00:00
Eelco Dolstra 43fb5626d6 * Bootstrap tools for the pure stdenv-linux on powerpc-linux.
svn path=/nixpkgs/trunk/; revision=6860
2006-10-26 20:07:49 +00:00
Eelco Dolstra 45bf677dcc * Doh.
svn path=/nixpkgs/trunk/; revision=6859
2006-10-26 19:00:46 +00:00
Eelco Dolstra 554ea561dd * coreutils won't build with dietlibc on ppc.
svn path=/nixpkgs/trunk/; revision=6858
2006-10-26 15:02:16 +00:00
Eelco Dolstra 29f9225a9d * Symlink gunzip, zcat.
svn path=/nixpkgs/trunk/; revision=6857
2006-10-26 14:35:57 +00:00
Eelco Dolstra dcebef7f8e * On powerpc-linux, use gcc-3.4 to compile dietlibc.
svn path=/nixpkgs/trunk/; revision=6856
2006-10-26 11:27:46 +00:00
Eelco Dolstra eb4584c0cb * Merge the gcc-4.1 changes into 3.4.
svn path=/nixpkgs/trunk/; revision=6855
2006-10-26 11:25:29 +00:00
Armijn Hemel 115a99e6f4 orig-glibc -> orig-libc
svn path=/nixpkgs/trunk/; revision=6854
2006-10-26 10:13:59 +00:00
Eelco Dolstra 47d7e73abb * Real URLs.
svn path=/nixpkgs/trunk/; revision=6853
2006-10-25 17:27:32 +00:00
Eelco Dolstra 4be38f2f31 * No longer needed.
svn path=/nixpkgs/trunk/; revision=6851
2006-10-25 16:32:33 +00:00
Eelco Dolstra fd2b826b17 * Add -B$gcc/lib64 when appropriate. This is so that configure
(calling gcc -print-search-dirs) builds a libtool that searches in
  lib64 for libstdc++.so.

svn path=/nixpkgs/trunk/; revision=6850
2006-10-25 16:32:13 +00:00
Eelco Dolstra b831b236ba * Use the pure stdenv on x86_64.
svn path=/nixpkgs/trunk/; revision=6849
2006-10-25 13:27:43 +00:00
Eelco Dolstra 4f03dec496 * Patch for a critical bug in bash.
svn path=/nixpkgs/trunk/; revision=6848
2006-10-25 12:38:57 +00:00
Eelco Dolstra 02254ec3d8 * Fix glibc build on powerpc. See http://sources.redhat.com/bugzilla/show_bug.cgi?id=2929.
svn path=/nixpkgs/trunk/; revision=6847
2006-10-25 11:17:30 +00:00
Eelco Dolstra 371d2ddbf2 * Back out r6830.
svn path=/nixpkgs/trunk/; revision=6846
2006-10-25 11:06:44 +00:00
Eelco Dolstra 3ba5d075a4 * New binaries.
svn path=/nixpkgs/trunk/; revision=6845
2006-10-25 10:56:26 +00:00
Eelco Dolstra 31f2316454 * "ppc" -> "powerpc", but do copy the "ppc" directory as well.
svn path=/nixpkgs/trunk/; revision=6844
2006-10-25 10:55:36 +00:00
Eelco Dolstra 26a11fbf54 * Fix a typo, and put the platform-specific header directory in the
Nix expression rather than the builder.

svn path=/nixpkgs/trunk/; revision=6843
2006-10-25 10:14:27 +00:00
Eelco Dolstra 9c611a19c6 * Glibc no longer containing profiling libraries.
* GCC no longer does a multilib build.

svn path=/nixpkgs/trunk/; revision=6842
2006-10-25 09:51:32 +00:00
Eelco Dolstra 7f9a2ecc16 * Fix building in an impure environment.
svn path=/nixpkgs/trunk/; revision=6841
2006-10-25 09:50:58 +00:00
Eelco Dolstra 1a7576f193 * Get the g++ tarball unconditionally, otherwise the patch won't apply.
svn path=/nixpkgs/trunk/; revision=6840
2006-10-25 09:23:20 +00:00
Eelco Dolstra c8b1035c4f * Doh.
svn path=/nixpkgs/trunk/; revision=6839
2006-10-25 07:48:59 +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 1080560215 * Remove old kernel headers, use 2.6.18.1.
svn path=/nixpkgs/trunk/; revision=6832
2006-10-24 22:26:09 +00:00
Eelco Dolstra 69ee353dc7 * glibc-2.5 is the default now.
* Remove gcc-static-3.4.

svn path=/nixpkgs/trunk/; revision=6831
2006-10-24 22:23:20 +00:00
Eelco Dolstra f6f207e054 * Simplify, simplify.
svn path=/nixpkgs/trunk/; revision=6830
2006-10-24 22:20:45 +00:00
Eelco Dolstra 821b647832 * Rename.
svn path=/nixpkgs/trunk/; revision=6829
2006-10-24 20:57:51 +00:00
Eelco Dolstra 18d730980c * Switching to the new stdenv-linux.
svn path=/nixpkgs/trunk/; revision=6828
2006-10-24 20:57:06 +00:00