Commit graph

228 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
Sander van der Burg b3ff0f8a59 Added tomcat service to NixOS
svn path=/nixos/trunk/; revision=10402
2008-01-30 11:00:00 +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
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 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
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
Eelco Dolstra 86484779c7 * Mount usbfs on /proc/bus/usb.
svn path=/nixos/trunk/; revision=10220
2008-01-18 15:18:32 +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
Eelco Dolstra d9ffa7f72e * Manual bug.
svn path=/nixos/trunk/; revision=10179
2008-01-16 15:33:09 +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
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 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
Eelco Dolstra fec916552c * Add $prefix/info, set $INFOPATH.
svn path=/nixos/trunk/; revision=10087
2008-01-07 11:46:17 +00:00
Eelco Dolstra a00f463ffa * Symlink /man in /var/run/current-system/sw so that for
example "man bash" works.  Ideally of course all packages
  should put their man pages under $out/share/man.

svn path=/nixos/trunk/; revision=10086
2008-01-07 11:24:02 +00:00
Michael Raskin 5a29acf6a0 Added module aggregation, also changed non-root shell prompt colour to green
svn path=/nixos/trunk/; revision=10084
2008-01-06 18:45:13 +00:00
Eelco Dolstra 9e00dfe107 * Add a bunch of common SATA modules to the default initrd.
svn path=/nixos/trunk/; revision=10083
2008-01-06 00:51:07 +00:00
Eelco Dolstra 56107c81b0 * Put some help text in /etc/issue on the CD.
svn path=/nixos/trunk/; revision=10076
2008-01-04 17:05:48 +00:00
Eelco Dolstra 3abf5072ce * Installation CD: start a web browser showing the NixOS manual on
tty7.
* Add w3m to the installation CD's path since it's needed for the
  manual anyway.

svn path=/nixos/trunk/; revision=10074
2008-01-04 16:11:12 +00:00
Eelco Dolstra f4399a1883 * Option to set the Grub background image. To
get the background image to work, you may need
  to set NIXOS_INSTALL_GRUB=1 when calling
  nixos-rebuild to force Grub to be reinstalled
  with splashimage support.

svn path=/nixos/trunk/; revision=10071
2008-01-04 15:02:31 +00:00
Eelco Dolstra 8f0e88d4e5 * Just pass all of Nixpkgs to xserver.nix.
svn path=/nixos/trunk/; revision=10068
2008-01-04 10:54:33 +00:00
Eelco Dolstra b73424833a * xserver.nix: remove some unnecessary function arguments.
* isClone: changed into a boolean rather than a string "on" or "off".

svn path=/nixos/trunk/; revision=10067
2008-01-04 10:36:14 +00:00
Marc Weber 598848d6af patches provided by Tobias Hammerschmidt
svn path=/nixos/trunk/; revision=10055
2008-01-02 21:16:58 +00:00
Eelco Dolstra 90a0d64bcd svn path=/nixos/trunk/; revision=10051 2008-01-02 15:31:04 +00:00
Eelco Dolstra 5ec82632f2 * Use Nix 0.11.
svn path=/nixos/trunk/; revision=10048
2008-01-02 13:05:24 +00:00
Eelco Dolstra 0cb6f3e5c3 * Missing description.
svn path=/nixos/trunk/; revision=10047
2008-01-02 12:50:46 +00:00
Michael Raskin 27d5e93920 Added choice of sound devices mode.
svn path=/nixos/trunk/; revision=10045
2008-01-02 10:07:52 +00:00
Michael Raskin ae6104ae59 Fixed a bit about child configurations, added an option to not run X job, but create it, and to export configuration files from it.
svn path=/nixos/trunk/; revision=9986
2007-12-31 08:52:59 +00:00
Michael Raskin b3fa4f1e4e Added some xfs and general font changes.
svn path=/nixos/trunk/; revision=9966
2007-12-25 12:16:38 +00:00
Michael Raskin f81bebe2d7 Added possibility of building multiple configurations by one nixos-rebuild.
svn path=/nixos/trunk/; revision=9959
2007-12-20 11:36:30 +00:00
Michael Raskin 6733486ec8 Corrected fontDir builder; beginning of changes to allow configuration having multiple variaions in GRUB menu/
svn path=/nixos/trunk/; revision=9957
2007-12-20 04:36:30 +00:00
Michael Raskin 189a608cf5 Now copyKernels allows both /nix/store and /boot be on separate partitions (you need to specify where /boot is for this).
svn path=/nixos/trunk/; revision=9949
2007-12-16 18:56:36 +00:00
Eelco Dolstra 4ef15fc095 * Statically check whether the generated httpd.conf is correct.
* Option `noUserDir' -> `enableUserDir', negatives are bad :-)

svn path=/nixos/trunk/; revision=9927
2007-12-12 15:30:17 +00:00
Eelco Dolstra 6f5da72337 * Start of a nicer Apache configuration than the old stuff in the
services tree.  This one does the generation of httpd.conf in
  the Nix expression language instead of in a builder.

svn path=/nixos/trunk/; revision=9926
2007-12-12 13:58:15 +00:00
Eelco Dolstra becb4b69c1 Allow the hostname to be empty (to obtain it using dhcp).
svn path=/nixos/trunk/; revision=9857
2007-12-04 15:02:48 +00:00
Eelco Dolstra d987b16112 * More declarative specification of the DHCPD config.
svn path=/nixos/trunk/; revision=9856
2007-12-04 14:53:37 +00:00
Michael Raskin aeced64d0e Added PostgreSQL job.
svn path=/nixos/trunk/; revision=9830
2007-12-03 04:48:31 +00:00