Commit Graph

770 Commits

Author SHA1 Message Date
Sander van der Burg
406d3aafc5 Added deploydir to tomcat service
svn path=/nixos/trunk/; revision=10407
2008-01-30 14:38:27 +00:00
Eelco Dolstra
92fffa1ee8 * Detect the networking.enableIntel2200BGFirmware option.
svn path=/nixos/trunk/; revision=10406
2008-01-30 14:32:02 +00:00
Eelco Dolstra
7363895f6d * Rewrote the hardware scanner in Perl.
svn path=/nixos/trunk/; revision=10405
2008-01-30 14:16:38 +00:00
Sander van der Burg
c1f619a087 Added tomcat service to NixOS
svn path=/nixos/trunk/; revision=10403
2008-01-30 11:00:59 +00:00
Sander van der Burg
b3ff0f8a59 Added tomcat service to NixOS
svn path=/nixos/trunk/; revision=10402
2008-01-30 11:00:00 +00:00
Michael Raskin
b8cc335fbb Reformatted rescue-cd-configurable.nix
svn path=/nixos/trunk/; revision=10401
2008-01-30 09:42:48 +00:00
Eelco Dolstra
9fd5d70968 * The CD is now a true live CD: you can run Nix operations in it
thanks to unionfs.  For instance, nix-env and nixos-rebuild work.
  The tricky part was to build a Nix database (in the tmpfs/unionfs)
  which is now necessary to prevent store paths on the CD from being
  deleted right away because they otherwise wouldn't be valid.
  
* nixos-install: use the /etc/nixos/configuration.nix from the target
  file system (don't copy it anymore).  Since the user is supposed to
  mount the target file system on /mnt anyway, we may as well require
  that configuration.nix is placed in /mnt/etc/nixos.  This also makes
  upgrading / reinstalling much easier, since it will automatically
  use the right configuration.nix.

svn path=/nixos/trunk/; revision=10399
2008-01-30 01:28:56 +00:00
Eelco Dolstra
34e63da53b * Make nixUnstable the default again.
svn path=/nixos/trunk/; revision=10398
2008-01-30 01:14:03 +00:00
Michael Raskin
76a6498196 Catching up with rescue-cd.nix
svn path=/nixos/trunk/; revision=10391
2008-01-29 22:37:24 +00:00
Eelco Dolstra
2da50038e4 * Use aufs instead of unionfs, it seems to be more stable.
svn path=/nixos/trunk/; revision=10390
2008-01-29 18:53:15 +00:00
Michael Raskin
6f0772d9f0 JBoss job fix
svn path=/nixos/trunk/; revision=10367
2008-01-28 20:04:48 +00:00
Sander van der Burg
6e96e0a87d Fixed syntax error
svn path=/nixos/trunk/; revision=10311
2008-01-28 15:44:59 +00:00
Sander van der Burg
1727c4bd3b Added mod_jk module to apache httpd
svn path=/nixos/trunk/; revision=10310
2008-01-28 15:40:29 +00:00
Sander van der Burg
8d5884e01f Added JBoss service
svn path=/nixos/trunk/; revision=10309
2008-01-28 15:16:14 +00:00
Sander van der Burg
4341ef80d8 Fixed MySQL option
svn path=/nixos/trunk/; revision=10307
2008-01-28 14:55:12 +00:00
Sander van der Burg
f38ed802a6 Added MySQL to NixOS
svn path=/nixos/trunk/; revision=10306
2008-01-28 14:34:29 +00:00
Sander van der Burg
a73c26875a Added MySQL service to NixOS
svn path=/nixos/trunk/; revision=10305
2008-01-28 14:30:18 +00:00
Michael Raskin
e5025996ca fontDir compatible with both trunk and (hopefully) stdenv-updates
svn path=/nixos/trunk/; revision=10293
2008-01-25 13:31:59 +00:00
Yury G. Kudryashov
e914d28638 Using default stdenv in fontdir.nix
svn path=/nixos/trunk/; revision=10289
2008-01-25 12:54:32 +00:00
Yury G. Kudryashov
3166d9f687 Made iwlwifi optional, with false default
svn path=/nixos/trunk/; revision=10288
2008-01-25 12:54:27 +00:00
Michael Raskin
01004362f2 Now xfs job fails without enableFontDir.
svn path=/nixos/trunk/; revision=10279
2008-01-24 21:35:24 +00:00
Yury G. Kudryashov
8f503d7302 typo in upstart-jobs/xfs.nix fixed
svn path=/nixos/trunk/; revision=10278
2008-01-24 20:37:27 +00:00
Eelco Dolstra
49e8829053 * Use unionfs to provide a real Live CD, i.e., the files on the CD
appear writable (though all writes go to a tmpfs).  This allows you
  to run Nix operations on the Live CD.  However, we're not quite
  there yet since the CD doesn't have a valid Nix database.  So for
  instance a garbage collect will cause everything to be deleted,
  hanging the system.

svn path=/nixos/trunk/; revision=10276
2008-01-24 16:56:09 +00:00
Michael Raskin
7fa31be440 Tried to do offline install CD, not DVD. Failure, but some parts could be useful.
svn path=/nixos/trunk/; revision=10248
2008-01-22 17:55:57 +00:00
Wouter den Breejen
ca2b1e3b77 Added boot.kernelModules argument to rescue-cd
svn path=/nixos/trunk/; revision=10227
2008-01-19 13:47:49 +00:00
Eelco Dolstra
fcef0545be * A program for generating the hardware-specific bits of
configuration.nix.  Right now it finds out the following:

  - How many CPUs the machine has (for nix.maxJobs).
  - Whether to load KVM support (either kvm-intel or kvm-amd).
  - The modules necessary for the initrd by scanning the PCI and USB
    busses.  Only mass-storage and HID related modules are added.

svn path=/nixos/trunk/; revision=10221
2008-01-18 16:17:48 +00:00
Eelco Dolstra
86484779c7 * Mount usbfs on /proc/bus/usb.
svn path=/nixos/trunk/; revision=10220
2008-01-18 15:18:32 +00:00
Michael Raskin
7749d93524 Added extraInitrdKernelModules option to CD
svn path=/nixos/trunk/; revision=10182
2008-01-16 21:56:31 +00:00
Andres Löh
563a6240a3 * updated docs to reflect new xmonad choice
svn path=/nixos/trunk/; revision=10181
2008-01-16 16:53:32 +00:00
Andres Löh
e893328176 * added xmonad to possible windowManager choices in xserver.nix
svn path=/nixos/trunk/; revision=10180
2008-01-16 16:49:22 +00:00
Eelco Dolstra
d9ffa7f72e * Manual bug.
svn path=/nixos/trunk/; revision=10179
2008-01-16 15:33:09 +00:00
Eelco Dolstra
622734b58b * Generate /etc/ssh/ssh_config, set ForwardX11 and XAuthLocation.
svn path=/nixos/trunk/; revision=10177
2008-01-16 13:59:03 +00:00
Michael Raskin
d69cc82771 Moved configuration check option into configuration.nix (environment.checkConfigurationOptions)
svn path=/nixos/trunk/; revision=10157
2008-01-15 16:05:51 +00:00
Michael Raskin
ec727d660a Corrections to make-iso9660-image.sh for bigger path lists.
svn path=/nixos/trunk/; revision=10156
2008-01-15 15:39:34 +00:00
Michael Raskin
e8ddb6fd2d Samba service; httpd/xfs dependencies changed to know about gw6c.autorun option.
svn path=/nixos/trunk/; revision=10140
2008-01-14 11:24:36 +00:00
Wouter den Breejen
18ed3e20d1 Added NVIDIA option to Live-dvd-X
svn path=/nixos/trunk/; revision=10137
2008-01-13 17:29:06 +00:00
Eelco Dolstra
26e0f711a9 * Use the aggregator to combine the kernel modules tree with
externally-built modules so that (e.g.) "modprobe nvidia" Just
  Works.

svn path=/nixos/trunk/; revision=10129
2008-01-12 23:37:17 +00:00
Eelco Dolstra
cfed953b5f * Option to enable the Intel 3945 firmware. (It's enabled by
default since it doesn't seem to have the legal issues of
  the Intel 2200 firmware.)
* Firmware loader: don't write in /tmp.  Also a hack to quickly
  test new firmwares.
* Revert r10105 since the build fails if configuration.nix 
  is a symlink.  Anyway copying configuration.nix does not
  necessarily make sense since it can import other expressions,
  which would also have to be copied.  Perhaps a better 
  approach would be to write a serialisation of the config
  to a file (maybe with builtins.toXML).

svn path=/nixos/trunk/; revision=10127
2008-01-12 22:53:13 +00:00
Michael Raskin
4475a74fb8 LiveDVD with X and sources made.
svn path=/nixos/trunk/; revision=10119
2008-01-11 16:59:39 +00:00
Michael Raskin
a11779f912 Gw6c now can be configured not to start automatically
svn path=/nixos/trunk/; revision=10116
2008-01-11 06:36:15 +00:00
Michael Raskin
8eeb6a0a91 'As GRUB limit on x86 is probably 191 entries, make sure we don't get more than 190 (one for safety)'
svn path=/nixos/trunk/; revision=10110
2008-01-10 12:28:01 +00:00
Michael Raskin
ad2ecc2cb5 Changed GRUB failure backups a bit after testing
svn path=/nixos/trunk/; revision=10108
2008-01-10 05:50:58 +00:00
Michael Raskin
99a2f550c0 Modifications to grub-menu-builder: copy default kernel and initrd to /boot/nixos-.. , limit menu size
svn path=/nixos/trunk/; revision=10106
2008-01-10 04:43:19 +00:00
Michael Raskin
f667e94752 Now configuration.nix is copied into shared.
svn path=/nixos/trunk/; revision=10105
2008-01-09 16:08:15 +00:00
Michael Raskin
fb92b4666d Fixed some bugs in rescue-cd-configurable, fixed live-dvd. Tested: QEmu + kQemu + no networking installs OK
svn path=/nixos/trunk/; revision=10104
2008-01-09 14:33:41 +00:00
Michael Raskin
df0879e105 Made small bootable (qemu-tested) CD with rescue-cd-configurable.nix ; strangely enough it includes stdenv though.
svn path=/nixos/trunk/; revision=10102
2008-01-09 08:51:25 +00:00
Michael Raskin
020f035a5d Made grub-menu-builder write (hd0,0) instead of hd0,0
svn path=/nixos/trunk/; revision=10101
2008-01-09 05:36:40 +00:00
Michael Raskin
a4ff40b158 Added kqemu 0666 permissions
svn path=/nixos/trunk/; revision=10097
2008-01-08 00:16:49 +00:00
Eelco Dolstra
a2c1282ebc * Get rid of some unnecessary xorg.conf statements.
svn path=/nixos/trunk/; revision=10096
2008-01-07 23:12:02 +00:00
Eelco Dolstra
c71e8dc314 * Load the NVIDIA kernel module automatically and some more cleanups.
svn path=/nixos/trunk/; revision=10095
2008-01-07 22:56:16 +00:00