philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

153 commits

Author SHA1 Message Date
Eelco Dolstra 1626db66f5 * Make the script to start Samba available to the VM stuff in NixOS. 
* Use socat's "exec" and "nofork" options to reduce the number of
  processes.  Also, if smbd exits abnormally, exit from the smbd
  restart loop.

svn path=/nixpkgs/trunk/; revision=22279
 2010-06-15 16:13:10 +00:00
Eelco Dolstra 22f7cf6976 svn path=/nixpkgs/trunk/; revision=22266 2010-06-14 18:42:52 +00:00
Eelco Dolstra 98dff00f52 * Clean up diskImages/diskImageFuns/diskImageExtraFuns. 
svn path=/nixpkgs/trunk/; revision=22265
 2010-06-14 18:42:18 +00:00
Eelco Dolstra ef674da49e * Cleanup the definition of `diskImages' using mapAttrs. 
svn path=/nixpkgs/trunk/; revision=22263
 2010-06-14 17:34:02 +00:00
Eelco Dolstra c0d2c74038 * Added Ubuntu 10.04 "Lucid". 
svn path=/nixpkgs/trunk/; revision=22261
 2010-06-14 17:05:26 +00:00
Eelco Dolstra 81fa7ae7b2 * Added Fedora 13. 
svn path=/nixpkgs/trunk/; revision=22259
 2010-06-14 16:48:36 +00:00
Eelco Dolstra b570419efa * Urgh, if $TMPDIR is very long we run into the 108 character limit on 
Unix domain socket paths.  So use ./samba instead of $TMPDIR/samba.

svn path=/nixpkgs/trunk/; revision=22256
 2010-06-14 11:18:57 +00:00
Eelco Dolstra cc27927f8a * Hack to prevent the socat process from hanging the builder. 
svn path=/nixpkgs/trunk/; revision=22251
 2010-06-14 07:39:13 +00:00
Eelco Dolstra 88a5d8915a * Support repeated mounting of the CIFS share. Necessary because the 
mount tends to timeout if the host is heavily loaded.

svn path=/nixpkgs/trunk/; revision=22250
 2010-06-14 00:18:54 +00:00
Eelco Dolstra 1f8e6d4814 * The -smb flag in QEMU/KVM is unreliable: it doesn't work without the 
-no-kvm-irqchip flag, and on the Hydra machines only works on the
  rather old KVM 76.  So as a workaround, don't use -smb, but use
  QEMU's "guestfwd" feature to forward 10.0.2.4:139 in the guest to a
  Unix domain socket on the host connected to Samba.
* Use "cache=writeback" to improve performance a lot.
* Use "werror=report" to make QEMU crash instead of hang if the host
  filesystem is full.

svn path=/nixpkgs/trunk/; revision=22249
 2010-06-13 23:49:16 +00:00
Eelco Dolstra 6dddd07402 * vmTools: don't use klibc anymore. Just use utillinux/bash/etc. 
svn path=/nixpkgs/trunk/; revision=22209
 2010-06-10 12:28:04 +00:00
Eelco Dolstra b8c2a1bebe svn path=/nixpkgs/trunk/; revision=22125 2010-06-03 14:29:12 +00:00
Eelco Dolstra 8e0860b5ca * Debian 4.0 updated to r9. 
svn path=/nixpkgs/trunk/; revision=22079
 2010-06-01 10:44:36 +00:00
Lluís Batlle i Rossell 9bcb6277f3 Changing linux kernel references from vmlinuz to bzImage. 
This way we get a simpler kernel build script.

svn path=/nixpkgs/trunk/; revision=20094
 2010-02-18 11:34:48 +00:00
Eelco Dolstra a617a7c239 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
 2010-02-03 14:23:43 +00:00
Eelco Dolstra 1c92df1384 * Debian 5.0.4. 
svn path=/nixpkgs/trunk/; revision=19748
 2010-02-01 15:17:34 +00:00
Lluís Batlle i Rossell bcba809460 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
 2010-01-25 18:52:07 +00:00
Eelco Dolstra b3625c242b * Add the ext3 module to the initrd. The Amazon image generator needs 
it.

svn path=/nixpkgs/trunk/; revision=19585
 2010-01-20 21:09:33 +00:00
Lluís Batlle i Rossell 3e10ba6bb9 Fixing an evaluation error: kernelPackages -> linuxPackages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19077
 2009-12-22 09:23:17 +00:00
Eelco Dolstra 798c6f3960 * Include the ext2 and unix modules in the initrd. 
* Don't assume that /dev/vda has major 253, since that's not always
  the case.
* Use Linux 2.6.32.

svn path=/nixpkgs/trunk/; revision=19031
 2009-12-18 12:10:35 +00:00
Eelco Dolstra b2c9e50203 * Added Fedora 12. This requires the latest RPM, because the RPMs are 
compressed with xz.

svn path=/nixpkgs/trunk/; revision=18868
 2009-12-09 22:35:46 +00:00
Eelco Dolstra 519e7870b6 * Move `modifyDerivation' from build-support/vm to lib and rename it 
to `overrideDerivation'.

svn path=/nixpkgs/trunk/; revision=18466
 2009-11-19 16:43:58 +00:00
Eelco Dolstra d843b24fbe * Added Ubuntu 9.10 ("Karmic Koala"). 
svn path=/nixpkgs/trunk/; revision=18142
 2009-11-05 14:49:17 +00:00
Rob Vermaas 3653e372b0 dash as default shell for debian/ubuntu systems 
svn path=/nixpkgs/trunk/; revision=17590
 2009-10-02 09:34:37 +00:00
Rob Vermaas c2fe94783d svn path=/nixpkgs/trunk/; revision=17588 2009-10-02 09:11:42 +00:00
Rob Vermaas a00a2ffdba add functions for adding extra virtual packges to images, leave old one for backw.compatibility for now 
svn path=/nixpkgs/trunk/; revision=17561
 2009-10-01 07:49:55 +00:00
Rob Vermaas 4d5141bd2c extra deb/rpm changes 
svn path=/nixpkgs/trunk/; revision=17560
 2009-10-01 07:25:50 +00:00
Eelco Dolstra 23c0f1c25e * Added openSUSE 11.1. 
svn path=/nixpkgs/trunk/; revision=17397
 2009-09-24 07:40:30 +00:00
Eelco Dolstra 36df4d3bc2 svn path=/nixpkgs/trunk/; revision=17387 2009-09-23 20:46:22 +00:00
Eelco Dolstra f467c6d131 * Retry CIFS mounts a few times. Hopefully this fixes problems such 
as in http://hydra.nixos.org/build/79029 (i.e. "CIFS VFS: No
  response for cmd 114 mid 1", "CIFS VFS: cifs_mount failed w/return
  code = -112").

svn path=/nixpkgs/trunk/; revision=17365
 2009-09-23 15:17:47 +00:00
Eelco Dolstra 251c7207cf * Revert to KVM 76 in the VM build functions. The latest qemu-kvm has 
weird performance and data corruption regressions in the build farm.

svn path=/nixpkgs/trunk/; revision=17364
 2009-09-23 14:24:37 +00:00
Eelco Dolstra 15c8ec03a0 svn path=/nixpkgs/trunk/; revision=17248 2009-09-18 14:07:52 +00:00
Eelco Dolstra 04c225a4c7 * Debian 5.0.3. 
svn path=/nixpkgs/trunk/; revision=17247
 2009-09-18 14:05:45 +00:00
Eelco Dolstra 0b063ec39f * Use qemu-kvm. 
svn path=/nixpkgs/trunk/; revision=17243
 2009-09-18 10:42:50 +00:00
Rob Vermaas 0806854b24 changed mem size for rpm/deb build vms, added version specific packages for fedora9++ 
svn path=/nixpkgs/trunk/; revision=16136
 2009-07-02 12:53:25 +00:00
Eelco Dolstra 674211ac9d * Revive klibc 1.5 for now since vmtools still uses its insmod. 
svn path=/nixpkgs/trunk/; revision=16040
 2009-06-25 08:22:51 +00:00
Eelco Dolstra cee3ca1228 svn path=/nixpkgs/trunk/; revision=15909 2009-06-09 14:32:31 +00:00
Eelco Dolstra 813909d153 * Fedora 11 uses SHA-256 hashes instead of SHA-1 in primary.xml. 
svn path=/nixpkgs/trunk/; revision=15908
 2009-06-09 14:25:45 +00:00
Eelco Dolstra d8cc981d90 * Fedora 11. Completely untested. 
svn path=/nixpkgs/trunk/; revision=15907
 2009-06-09 14:10:16 +00:00
Rob Vermaas a46e339352 typo 
svn path=/nixpkgs/trunk/; revision=15846
 2009-06-03 19:20:13 +00:00
Rob Vermaas 59ae0e5bae svn path=/nixpkgs/trunk/; revision=15845 2009-06-03 19:19:24 +00:00
Eelco Dolstra cf54a62384 svn path=/nixpkgs/trunk/; revision=15178 2009-04-20 12:52:24 +00:00
Eelco Dolstra ac24816344 * Move all the Perl packages out of all-packages.nix into a separate 
file, perl-packages.nix.

svn path=/nixpkgs/trunk/; revision=15171
 2009-04-20 12:08:09 +00:00
Eelco Dolstra c5197de22d * Bump the names as well. 
svn path=/nixpkgs/trunk/; revision=15031
 2009-04-14 13:36:16 +00:00
Rob Vermaas edca05ee30 build-support/vm/default.nix: updated debian hashes 
svn path=/nixpkgs/trunk/; revision=15020
 2009-04-14 08:05:10 +00:00
Rob Vermaas 518eab2313 pkgs/build-support/vm/default.nix typo 
svn path=/nixpkgs/trunk/; revision=14975
 2009-04-09 14:38:08 +00:00
Rob Vermaas 39ba8d06ec pkgs/build-support/vm/default.nix: added ubuntu 904 
svn path=/nixpkgs/trunk/; revision=14974
 2009-04-09 14:29:19 +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 84a0bd9c83 * Use qcow2. 
svn path=/nixpkgs/trunk/; revision=14296
 2009-03-02 14:31:33 +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 3cc0c9b44e svn path=/nixpkgs/trunk/; revision=13917 2009-01-30 14:00:18 +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 5dad580963 * Added Fedora 10. 
svn path=/nixpkgs/trunk/; revision=13428
 2008-11-26 11:14:39 +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 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
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
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
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 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 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 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
Eelco Dolstra f19b97924c svn path=/nixpkgs/trunk/; revision=11302 2008-03-27 13:39:23 +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