Commit graph

294 commits

Author SHA1 Message Date
Eelco Dolstra 37b9b420cb * Sync with trunk. Back to gtkLibs214.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13960
2009-02-02 15:44:04 +00:00
Eelco Dolstra 472a0d2057 * Pass -rpath flags in the same order as -L flags.
* Put the Glibc linker flags in front of the GCC linker flags.  Needed
  for the stdenv-linux bootstrap.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13940
2009-02-01 21:26:28 +00:00
Eelco Dolstra 3cc0c9b44e svn path=/nixpkgs/trunk/; revision=13917 2009-01-30 14:00:18 +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 76efe57d1b * GCC mirrors.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13878
2009-01-27 12:48:32 +00:00
Eelco Dolstra 72822ebbc0 * Put Glibc at the very end of the GCC header search path. This
should fix previous problems with GCC 4.3 in compiling C++ code
  where e.g. <cassert> has to appear before <assert.h> in the search
  path due to the former's use of #include_next.  The previous "fix"
  broke compilation of C code by placing the C++ include directory
  before the Glibc include directory (which would barf on
  e.g. <complex.h>, which appears in both).

svn path=/nixpkgs/branches/stdenv-updates/; revision=13806
2009-01-19 16:22:27 +00:00
Eelco Dolstra 60ac36f9c5 * Ignore symlinks.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13790
2009-01-16 17:13:14 +00:00
Eelco Dolstra c1579d2e78 * stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
2009-01-16 10:59:27 +00:00
Eelco Dolstra d25aa3c8a5 * checkinstall: build properly on x86_64.
* checkinstall: get rid of the RUNPATH in the LD_PRELOAD library so
  that it works with native Glibc (e.g. in VM builds).
* debBuild: use our own checkinstall.  In particular this allows us to
  build Debs on x86_64.

svn path=/nixpkgs/trunk/; revision=13608
2008-12-10 17:12:19 +00:00
Eelco Dolstra e4a8b61eba svn path=/nixpkgs/branches/stdenv-updates/; revision=13604 2008-12-10 10:58:07 +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
Eelco Dolstra 2b2bb11f32 * Always include "/nix/store/*" in lcovFilter.
svn path=/nixpkgs/trunk/; revision=13583
2008-12-04 15:32:30 +00:00
Eelco Dolstra e056ebd34e * Don't repeat the standard definition of $phases.
svn path=/nixpkgs/trunk/; revision=13493
2008-11-28 16:12:50 +00:00
Eelco Dolstra 82ab4c6105 * buildRPM: Set the %_topdir variable to a known location, otherwise
we run into trouble on Fedora 10 (RPM 4.6), where the default is no
  longer /usr/src/something but $HOME/something.

svn path=/nixpkgs/trunk/; revision=13466
2008-11-27 18:58:37 +00:00
Eelco Dolstra 79072e871f * Preserve meta attributes from the caller.
svn path=/nixpkgs/trunk/; revision=13433
2008-11-26 14:34:29 +00:00
Eelco Dolstra 5dad580963 * Added Fedora 10.
svn path=/nixpkgs/trunk/; revision=13428
2008-11-26 11:14:39 +00:00
Eelco Dolstra dd61c77d4e * Use libtool.
svn path=/nixpkgs/trunk/; revision=13425
2008-11-26 01:00:23 +00:00
Eelco Dolstra 31d12fc641 * Don't suppress error messages.
svn path=/nixpkgs/trunk/; revision=13424
2008-11-25 18:34:46 +00:00
Eelco Dolstra a37251e2a5 * -pre' should be pre'.
svn path=/nixpkgs/trunk/; revision=13420
2008-11-25 18:08:49 +00:00
Eelco Dolstra fd6e8a0f26 * Figure out the release name.
svn path=/nixpkgs/trunk/; revision=13415
2008-11-25 16:12:36 +00:00
Eelco Dolstra 8cc8ee244a svn path=/nixpkgs/trunk/; revision=13414 2008-11-25 15:54:05 +00:00
Eelco Dolstra 2efa4abeae * Set VERSION_SUFFIX to -pre<revision> unless building an "official"
release.
* Use @-patterns and `...' instead of using a "with".

svn path=/nixpkgs/trunk/; revision=13413
2008-11-25 15:53:45 +00:00
Eelco Dolstra fc06d93252 svn path=/nixpkgs/trunk/; revision=13401 2008-11-25 02:26:54 +00:00
Eelco Dolstra c90bd0756c * Automatically build Debian packages using checkinstall, as suggested
by Pjotr Prins a while back.  This could also be used to generate
  RPMs for packages that don't have a spec-file.

* Added checkinstall to Nixpkgs.  However we don't use our own build
  yet because with it "make install" segfaults in a Debian VM, while
  the pre-built binary does work.

svn path=/nixpkgs/trunk/; revision=13400
2008-11-25 02:20:41 +00:00
Eelco Dolstra da8bcbd9a5 * Moved more stuff from the release tree.
svn path=/nixpkgs/trunk/; revision=13395
2008-11-25 00:20:51 +00:00
Eelco Dolstra 01acea6bbc * Start moving the Nix expressions that support the build farm
(e.g. making source tarballs, doing coverage analysis) to the
  Nixpkgs tree.  This makes it easier to run build farm jobs locally
  since you don't need to check out the "release" tree separately.
  Also it means one less input to declare for build farm jobs.

* Removed succeedOnFailure and separate logging of phases.  Hydra
  doesn't need that.

svn path=/nixpkgs/trunk/; revision=13388
2008-11-24 15:10:06 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Eelco Dolstra 957a8b876a svn path=/nixpkgs/trunk/; revision=13280 2008-11-13 12:45:08 +00:00
Eelco Dolstra d22734c3e7 svn path=/nixpkgs/trunk/; revision=13273 2008-11-12 17:19:12 +00:00
Eelco Dolstra 8a3757b7f1 * Added Ubuntu 8.10. It doesn't work yet though (the passwd package
fails to install).

svn path=/nixpkgs/trunk/; revision=13272
2008-11-12 17:15:09 +00:00
Eelco Dolstra 4f61f1a7bc * Debian 4.0r5.
svn path=/nixpkgs/trunk/; revision=13261
2008-11-12 12:07:35 +00:00
Michael Raskin c5363217ad meta.function -> passthru.function, not killing other contents of passthru
svn path=/nixpkgs/trunk/; revision=13190
2008-11-04 21:24:10 +00:00
Eelco Dolstra b5e0436e5c * Drop prdownloads.sourceforge.net down the list, it tends to have
connection problems.

svn path=/nixpkgs/trunk/; revision=13159
2008-10-30 12:54:28 +00:00
Eelco Dolstra 000ba65363 * fail() is long gone.
svn path=/nixpkgs/trunk/; revision=13155
2008-10-29 17:19:49 +00:00
Eelco Dolstra bcf24b6683 * KVM 76.
svn path=/nixpkgs/trunk/; revision=13023
2008-10-09 13:33:29 +00:00
Ludovic Courtès d96a0e14d7 fetchurl: Add Debian mirrors.
svn path=/nixpkgs/trunk/; revision=13010
2008-10-08 18:42:44 +00:00
Eelco Dolstra 69b538fde3 * gcc-wrapper-new -> gcc-wrapper, setup-new -> setup.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12991
2008-10-07 17:33:20 +00:00
Eelco Dolstra 76e8254689 svn path=/nixpkgs/branches/stdenv-updates/; revision=12990 2008-10-07 17:03:52 +00:00
Eelco Dolstra 9fdecb1296 * mirror://apache/.
svn path=/nixpkgs/trunk/; revision=12968
2008-10-06 12:58:21 +00:00
Eelco Dolstra 4138945727 * X.org mirrors.
svn path=/nixpkgs/trunk/; revision=12967
2008-10-06 12:38:45 +00:00
Michael Raskin ccf99b2ddf A helper to get the source some package is built from.
svn path=/nixpkgs/trunk/; revision=12933
2008-10-01 15:57:22 +00:00
Ludovic Courtès 9383cd0a48 Add `fetchbzr', to retrieve remote Bazaar repositories.
svn path=/nixpkgs/trunk/; revision=12924
2008-09-26 08:57:51 +00:00
Eelco Dolstra 617a289fa7 * Provide some more disk space by default. Qcow makes it cheap anyway.
svn path=/nixpkgs/trunk/; revision=12880
2008-09-18 10:45:22 +00:00
Eelco Dolstra 93456721f5 * Ubuntu 8.04 Hardy (i386 and amd64).
svn path=/nixpkgs/trunk/; revision=12850
2008-09-12 13:34:41 +00:00
Eelco Dolstra 8745d2f85d * Added an x86_64 (amd64) image for Debian.
* Updated Debian 4.0 to r4a.  Dropped the revision ("r3", "r4a") from
  the attribute name since Debian doesn't seem to keep old revisions
  available anyway.

svn path=/nixpkgs/trunk/; revision=12849
2008-09-12 13:17:52 +00:00
Eelco Dolstra 119473aac6 * Add RPM builds for Fedora 9 (x86_64).
svn path=/nixpkgs/trunk/; revision=12847
2008-09-12 12:24:07 +00:00
Eelco Dolstra 6fdbb17f99 * Print the uname.
svn path=/nixpkgs/trunk/; revision=12846
2008-09-12 12:06:40 +00:00
Ludovic Courtès 8f0dab06ec Add GnuPG mirrors, use them.
svn path=/nixpkgs/trunk/; revision=12832
2008-09-09 09:06:01 +00:00
Eelco Dolstra 4632fa1449 * Mirrors for ancient SUSE releases.
svn path=/nixpkgs/trunk/; revision=12821
2008-09-08 07:44:43 +00:00
Eelco Dolstra e3ec3f4782 * -no-kvm-irqchip seems to prevent random KVM networking hangs on
2.6.25 kernels.

svn path=/nixpkgs/trunk/; revision=12807
2008-09-05 11:39:51 +00:00
Eelco Dolstra bb0f036205 * Fallback for old Fedora releases.
svn path=/nixpkgs/trunk/; revision=12797
2008-09-04 09:44:40 +00:00
Ludovic Courtès df4363229d Add tcpdump mirrors.
svn path=/nixpkgs/trunk/; revision=12779
2008-09-01 12:58:24 +00:00
Eelco Dolstra 74087918ff * KVM updated to version 74. This one finally has good performance
for userspace networking / Samba again.
* vmtools: use KVM 74 and Linux 2.6.26, and use virtio for networking
  / disk access.

svn path=/nixpkgs/trunk/; revision=12768
2008-08-29 14:08:54 +00:00
Eelco Dolstra 5b732a061f * QEMU_SMBD_COMMAND is gone.
svn path=/nixpkgs/trunk/; revision=12719
2008-08-26 11:39:10 +00:00
Eelco Dolstra 3d6376be35 * nix.cs.uu.nl -> nixos.org.
svn path=/nixpkgs/trunk/; revision=12709
2008-08-25 15:00:29 +00:00
Eelco Dolstra eebb241519 * Write the list of mirrors to a file that we can reuse between
fetchurl instantiations, instead of passing the mirrors to fetchurl
  instantiations via environment variables.  This makes the resulting
  store derivations (.drv files) much smaller, which in turn makes
  nix-env/nix-instantiate faster (4.8 -> 4.2 seconds on nix-env -qa
  --out-path).

svn path=/nixpkgs/trunk/; revision=12695
2008-08-22 15:53:21 +00:00
Michael Raskin 87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.
svn path=/nixpkgs/trunk/; revision=12655
2008-08-19 05:54:09 +00:00
Eelco Dolstra a7c209e474 * Interface to support mirror:// in nix-prefetch-url. The function
resolveMirrorURLs produces a file containing the URLs to which a
  mirror:// URL resolves.

svn path=/nixpkgs/trunk/; revision=12410
2008-07-23 16:04:10 +00:00
Sander van der Burg 76f9b0feef undo
svn path=/nixpkgs/trunk/; revision=12278
2008-07-06 15:46:10 +00:00
Sander van der Burg 6c582fbc89 Added disnix
svn path=/nixpkgs/trunk/; revision=12276
2008-07-06 15:44:46 +00:00
Eelco Dolstra 7d1ba0ace0 * gcc-wrapper: use the right dynamic linker when -m32 is used.
* An attribute `stdenv_32bit' that returns a stdenv capable of
  building 32-bit binaries.
* grub: build on x86_64-linux.

svn path=/nixpkgs/trunk/; revision=12211
2008-06-29 16:13:02 +00:00
Eelco Dolstra aaccd6f6e2 * Fix building the Fortran compiler.
svn path=/nixpkgs/trunk/; revision=12201
2008-06-27 14:43:25 +00:00
Eelco Dolstra eb8618ea41 * Support the case where gcc has been built without g++.
svn path=/nixpkgs/trunk/; revision=12196
2008-06-26 11:09:00 +00:00
Eelco Dolstra 1cdb7e4831 * Some hackery to make sure that the Glibc headers appear *after* the
libstdc++ headers in the header search path, otherwise libstdc++'s
  use of #include_next to include Glibc headers breaks.

svn path=/nixpkgs/trunk/; revision=12195
2008-06-26 11:07:46 +00:00
Eelco Dolstra 7bf0c5ba01 * Folded the Cygwin, powerpc-darwin and FreeBSD stdenv into the "native"
stdenv.

svn path=/nixpkgs/trunk/; revision=12147
2008-06-18 15:09:13 +00:00
Eelco Dolstra a3d259adf0 * Remove `~' from Debian package filenames (they're not allowed in the
Nix store at top-level for portability reasons).  (NIX-106)

svn path=/nixpkgs/trunk/; revision=12133
2008-06-17 07:53:09 +00:00
Eelco Dolstra 7219a09001 * ioquake: updated to 1.34rc3.
* rss-glx: fixed the build.
* Removed the OpenGL wrapper stuff, it's no longer needed (thanks to
  the RUNPATH you just need to put the appropriate libGL.so in the
  LD_LIBRARY_PATH). 

svn path=/nixpkgs/trunk/; revision=12093
2008-06-14 20:55:48 +00:00
Eelco Dolstra 91258d9884 * makeWrapper: --add-flags to add extra flags to the command being
wrapped.

svn path=/nixpkgs/trunk/; revision=12091
2008-06-14 20:45:58 +00:00
Eelco Dolstra fc5eebdf8b * Merged the stdenv branch
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
Eelco Dolstra 402eaefd76 * Doh!
svn path=/nixpkgs/trunk/; revision=11922
2008-05-28 15:21:06 +00:00
Eelco Dolstra 7345e814aa * Use kernelPackages.
svn path=/nixpkgs/trunk/; revision=11897
2008-05-26 13:30:17 +00:00
Eelco Dolstra 9037d9287a * Added a Fedora 9 image.
svn path=/nixpkgs/trunk/; revision=11865
2008-05-21 09:35:15 +00:00
Eelco Dolstra 03f51200c2 * A function `runInGenericVM' that performs a build in an arbitrary VM
image (i.e., it can contain any OS that obeys the interface
  documented in the comment).  See `testFreeBSD' for an example that
  performs a build of the ATerm library on FreeBSD 7.0.  This will be
  used in the build farm to perform builds for platforms for which we
  cannot synthesize VM images automatically.

svn path=/nixpkgs/trunk/; revision=11753
2008-04-29 12:32:17 +00:00
Martin Bravenboer 2086656c45 getopt is in util-linux on opensuse
svn path=/nixpkgs/trunk/; revision=11620
2008-04-13 21:04:21 +00:00
Martin Bravenboer 4dfe3d704f suse doesn't have getopt ...
svn path=/nixpkgs/trunk/; revision=11619
2008-04-13 20:55:21 +00:00
Martin Bravenboer a99990c5f6 Added getopt to the opensuse package list.
svn path=/nixpkgs/trunk/; revision=11617
2008-04-13 20:31:07 +00:00
Martin Bravenboer d3411fd235 svn path=/nixpkgs/trunk/; revision=11605 2008-04-12 05:19:37 +00:00
Martin Bravenboer ec52a66db4 Install all RPMs at the same time
svn path=/nixpkgs/trunk/; revision=11603
2008-04-12 05:03:36 +00:00
Eelco Dolstra 2f52d09204 * Use another Red Hat mirror.
svn path=/nixpkgs/trunk/; revision=11577
2008-04-11 16:20:09 +00:00
Eelco Dolstra 631586df47 * Don't run the RPM post-install scripts for Fedora 2/3. It seems to
hang.

svn path=/nixpkgs/trunk/; revision=11575
2008-04-11 15:36:03 +00:00
Eelco Dolstra 75222355db * Image generation for openSUSE 10.3.
svn path=/nixpkgs/trunk/; revision=11570
2008-04-11 11:52:40 +00:00
Eelco Dolstra 9c8f2009f8 * Generate the Fedora 5 RPM closure automatically.
svn path=/nixpkgs/trunk/; revision=11514
2008-04-09 12:51:54 +00:00
Eelco Dolstra d000918941 * Moved the Debian and RPM closure generators to vm/default.nix.
* In addition to the `diskImages' set, there now is a `diskImageFuns'
  set that holds functions to build a disk image for a specific
  distribution, given a list of names of top-level packages that
  should be included in the image.  This makes it easier to customise
  an image (e.g. if you want to build an RPM in an image with some
  very specific dependencies that aren't in the default image).

* Added Fedora 6.

svn path=/nixpkgs/trunk/; revision=11513
2008-04-09 12:02:15 +00:00
Eelco Dolstra 17bc8a1b90 * Use the `import <derivation>' feature to generate and import the Nix
expression for a Debian closure automatically (so that we don't have
  to remember to regenerate those files ourselves).  The `import
  <derivation>' feature generally shouldn't be used in Nixpkgs, but
  since it's only used in the buildfarm it should be fine.

svn path=/nixpkgs/trunk/; revision=11512
2008-04-09 11:19:17 +00:00
Eelco Dolstra 19bcfb8231 * A tool for generating the closure of a set of top-level RPM packages
from the "primary.xml.gz" file of Fedora and OpenSUSE distributions.
  Analogous to the Deb closure generator.
  
* Image for Fedora 8.

svn path=/nixpkgs/trunk/; revision=11510
2008-04-09 10:06:16 +00:00
Eelco Dolstra cde64235b3 * mirror://fedora.
svn path=/nixpkgs/trunk/; revision=11504
2008-04-09 07:36:33 +00:00
Eelco Dolstra 6b852ab38f * Optionally install extra RPMs before doing the build.
svn path=/nixpkgs/trunk/; revision=11500
2008-04-09 06:37:59 +00:00
Sander van der Burg 99d512a41f Added hacky fetchsvn component which allows users to fetch code over svn+ssh
svn path=/nixpkgs/trunk/; revision=11455
2008-04-02 13:28:55 +00:00
Eelco Dolstra f19b97924c svn path=/nixpkgs/trunk/; revision=11302 2008-03-27 13:39:23 +00:00
Marc Weber c150dc2cf3 ignoring config option servicesProposal (is checked in upstart-jobs/default.nix)
svn path=/nixpkgs/trunk/; revision=11278
2008-03-24 23:47:40 +00:00
Michael Raskin 4eaf33cc7a Allow to skip non-existent modules. For custom kernels.
svn path=/nixpkgs/trunk/; revision=11273
2008-03-24 19:38:18 +00:00
Eelco Dolstra 3a05713cb7 svn path=/nixpkgs/trunk/; revision=11189 2008-03-18 21:14:02 +00:00
Eelco Dolstra 5fe1cb8a0c svn path=/nixpkgs/trunk/; revision=11185 2008-03-18 15:05:46 +00:00
Eelco Dolstra cc07ee1c77 * Install RPMs without the --notriggers and --nodeps options in order
to construct an image that better approximates the Linux
  distribution in question.

svn path=/nixpkgs/trunk/; revision=11184
2008-03-18 14:56:47 +00:00
Eelco Dolstra fd2a77eeb0 * Put all the RPM/Debian images in an attribute set `diskImage'.
svn path=/nixpkgs/trunk/; revision=11181
2008-03-18 12:54:21 +00:00
Eelco Dolstra 113fafd778 * buildRPM: print out the RPMs in the image.
svn path=/nixpkgs/trunk/; revision=11168
2008-03-17 17:29:07 +00:00
Eelco Dolstra 195c3788ed * Cleanup.
svn path=/nixpkgs/trunk/; revision=11166
2008-03-17 17:08:40 +00:00
Eelco Dolstra 0301a74bf0 * Use SCSI instead of IDE, much faster.
svn path=/nixpkgs/trunk/; revision=11165
2008-03-17 16:12:19 +00:00
Eelco Dolstra 3ee0b9bb74 * makeInitrd, makeModulesClosure: moved from NixOS.
* Use sh from klibc in the initrd.

svn path=/nixpkgs/trunk/; revision=11154
2008-03-17 10:40:47 +00:00
Eelco Dolstra 44fa8e3e0f * Also moved to Nixpkgs.
svn path=/nixpkgs/trunk/; revision=11127
2008-03-14 13:51:43 +00:00