Commit graph

323 commits

Author SHA1 Message Date
Eelco Dolstra
2eb05cf933 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
2009-04-09 12:19:57 +00:00
Eelco Dolstra
4962864417 * Fixed the mount-cifs source URL (copied from the stdenv-branch).
svn path=/nixpkgs/trunk/; revision=14958
2009-04-09 08:12:16 +00:00
Eelco Dolstra
e01be47e53 * aclocal wrapper: skip directories in ACLOCAL_PATH that don't exist,
otherwise aclocal barfs.  Updated the builder to use makeWrapper
* Made Automake 1.10 the default.
* Fixed `make check' in Automake by turning off indented logging in
  Make (there is a flag for that now).
* Disabled the `make check' in Automake by default because it takes a
  REALLY long time (e.g. more than 2 hours on Cygwin, 50 minutes on
  Darwin, 25 minutes on Linux) which is a lot for a package that
  otherwise takes 10 seconds to build.  We can add a Hydra job with
  doCheck enabled to do regression testing.
* make-wrapper: allow --run commands to add additional flags to the
  invocation of the wrapped program.  An example is the aclocal
  wrapper: it adds additional -I ... flags.
* make-wrapper: call the wrapped program .foo-wrapped instead of
  .wrapped-foo to make it easier to tell programs apart in `ps'
  output.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14885
2009-04-05 18:13:59 +00:00
Eelco Dolstra
21c3b6264b * Add the CPAN master site as a fallback.
svn path=/nixpkgs/trunk/; revision=14863
2009-04-03 15:51:39 +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
37a216ee19 * Backported the GCC mirrors from the stdenv branch.
svn path=/nixpkgs/trunk/; revision=14784
2009-03-30 14:41:50 +00:00
Eelco Dolstra
7505920605 * Bump the default Hydra priority of tarball builds.
svn path=/nixpkgs/trunk/; revision=14777
2009-03-30 13:21:00 +00:00
Eelco Dolstra
ba86b027c5 * Revert r14418 - not including the directory in arvg[0] broke
Firefox.

svn path=/nixpkgs/trunk/; revision=14774
2009-03-30 10:59:45 +00:00
Eelco Dolstra
5d27947703 * Don't try to auto-include documentation in Debian packages.
svn path=/nixpkgs/trunk/; revision=14737
2009-03-27 14:13:49 +00:00
Eelco Dolstra
5a8a90cd56 * Test whether we can successfully install and uninstall the Debian
package we just built.

svn path=/nixpkgs/trunk/; revision=14730
2009-03-26 15:45:37 +00:00
Eelco Dolstra
f30fe65b3e * makeSourceTarball -> sourceTarball.
* Added a function binaryTarball to do a DESTDIR build into
  /usr/local.  Useful for making statically linked binaries.  However,
  it may be better to do this in a VM (since if you do it in a Nix
  build environment, you can still end up with a lot of Nix
  dependencies in your binaries, even if you do static linking).

svn path=/nixpkgs/trunk/; revision=14726
2009-03-26 14:11:59 +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
d8e436c742 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
2009-03-20 16:49:02 +00:00
Eelco Dolstra
b460175a7e * Backwards compatibility hack for Stratego/XT packages.
svn path=/nixpkgs/trunk/; revision=14608
2009-03-19 13:59:31 +00:00
Eelco Dolstra
468ffe8466 * Turn on nullglob globally so that distPhase works when we copy
"*.tar.bz2 *.tar.gz" and there are no *.tar.gz files.  Maybe we
  should turn this on in stdenv (nullglob just seems like the right
  thing to do in general).

svn path=/nixpkgs/trunk/; revision=14606
2009-03-19 13:39:07 +00:00
Eelco Dolstra
3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Eelco Dolstra
199155087e * A Gentoo mirror disappeared.
svn path=/nixpkgs/trunk/; revision=14499
2009-03-10 21:00:07 +00:00
Eelco Dolstra
d0691bf1d7 * We don't need all that src.outPath / src.path hackery anymore.
svn path=/nixpkgs/trunk/; revision=14419
2009-03-06 16:53:44 +00:00
Eelco Dolstra
bd5aed6fd6 * Set argv[0] to a nicer value.
svn path=/nixpkgs/trunk/; revision=14418
2009-03-06 16:53:02 +00:00
Eelco Dolstra
6bb95494e7 * Use the version attribute if available.
svn path=/nixpkgs/trunk/; revision=14297
2009-03-02 14:33:33 +00:00
Eelco Dolstra
84a0bd9c83 * Use qcow2.
svn path=/nixpkgs/trunk/; revision=14296
2009-03-02 14:31:33 +00:00
Eelco Dolstra
45081f330d * Append the version to the "name" attribute to make the store paths
of Hydra builds more distinct (e.g. "patchelf-build-0.5pre1234"
  instead of just "patchelf-build").  If the version isn't known,
  append at least the revision.

* Propagate the release name of the source tarball to Nix builds.
  Useful to provide sensible package names in channels.

svn path=/nixpkgs/trunk/; revision=14294
2009-03-02 13:45:48 +00:00
Eelco Dolstra
f19aea6d5a * Added openSUSE 11.0.
* Create some device nodes in the RPM/Deb disk images, since modern
  distributions may not provide any device nodes (they're all
  generated by udev).

svn path=/nixpkgs/trunk/; revision=14293
2009-03-02 13:22:31 +00:00
Eelco Dolstra
a8b75358b3 svn path=/nixpkgs/trunk/; revision=14219 2009-02-24 12:14:48 +00:00
Eelco Dolstra
7782a3189e * Added Debian 5.0 (Lenny). Added the "login" package to the base
image, otherwise the post-installs script of the "passwd" package
  will fail because /etc/login.defs is missing.  This also fixes the
  Ubuntu 8.10 image generation, woohoo!

svn path=/nixpkgs/trunk/; revision=14217
2009-02-24 10:56:42 +00:00
Eelco Dolstra
dab3b03a14 * Debian 4.0r7.
svn path=/nixpkgs/trunk/; revision=14202
2009-02-23 10:58:48 +00:00
Eelco Dolstra
2d89fb4fee * Support a post-install hook.
svn path=/nixpkgs/trunk/; revision=14142
2009-02-20 15:40:11 +00:00
Eelco Dolstra
eb28d380c3 * Removed broken mirror.
svn path=/nixpkgs/trunk/; revision=14141
2009-02-20 15:39:13 +00:00
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