Commit graph

1430 commits

Author SHA1 Message Date
Sander van der Burg
7ac9e76eb6 Some fixes to the Apache Tomcat connector
svn path=/nixos/trunk/; revision=13879
2009-01-27 13:02:56 +00:00
Nicolas Pierron
c3f848e2d6 Remove name arguments from obsolete options.
svn path=/nixos/trunk/; revision=13864
2009-01-25 20:47:30 +00:00
Nicolas Pierron
1c1c1e0b15 Add a section to help user to extend NixOS.
svn path=/nixos/branches/fix-style/; revision=13861
2009-01-25 15:49:27 +00:00
Nicolas Pierron
ecc761543c Remove name argument of merge functions.
svn path=/nixos/branches/fix-style/; revision=13860
2009-01-25 15:49:23 +00:00
Nicolas Pierron
dcc981840e Use the mergeOneOption function instead of duplicated code.
svn path=/nixos/branches/fix-style/; revision=13859
2009-01-25 15:49:18 +00:00
Nicolas Pierron
639be32a8a Remove obsolete notation. (backwardPkgsFun*)
svn path=/nixos/branches/fix-style/; revision=13858
2009-01-25 15:49:12 +00:00
Nicolas Pierron
b2b6f92d6b Split xserver upstart job into:
- xserver configuration & job
- display manager (slim)
- window manager (compiz, kwm, metacity, twm, wmii, xmonad)
- desktop manager (kde, gnome, xterm)

Added features:
- Add WM choice in slim (with F1)

svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
Nicolas Pierron
fa3437cb35 Remove enableIntel* and enableGo7007 options.
Update nixos-hardware-scan.pl to generate files without these options.

svn path=/nixos/branches/fix-style/; revision=13856
2009-01-25 15:48:59 +00:00
Nicolas Pierron
6086aee542 * The Linux kernel >= 2.6.27 provides firmware, so add it to the
firmware search path.

(Patch from Eelco Dolstra)

svn path=/nixos/branches/fix-style/; revision=13855
2009-01-25 15:48:53 +00:00
Nicolas Pierron
9cdfe5a711 Extract kernel configuration from options.nix.
svn path=/nixos/branches/fix-style/; revision=13854
2009-01-25 15:48:48 +00:00
Nicolas Pierron
9fa758c657 Update the function used to merge option sets.
svn path=/nixos/branches/fix-style/; revision=13853
2009-01-25 15:48:43 +00:00
Nicolas Pierron
67edd3720f Update argument syntax of configuration files.
svn path=/nixos/branches/fix-style/; revision=13852
2009-01-25 15:48:39 +00:00
Nicolas Pierron
bb56774a54 Fix hostname (inverse test).
svn path=/nixos/branches/fix-style/; revision=13851
2009-01-25 15:48:35 +00:00
Nicolas Pierron
08280c415f Add support for wmii.
svn path=/nixos/branches/fix-style/; revision=13850
2009-01-25 15:48:30 +00:00
Nicolas Pierron
b92036e803 Fetch the windows manager pid.
svn path=/nixos/branches/fix-style/; revision=13849
2009-01-25 15:48:25 +00:00
Nicolas Pierron
348afe7dc6 Replace old argument syntax.
svn path=/nixos/trunk/; revision=13848
2009-01-25 15:26:46 +00:00
Nicolas Pierron
61aa32f174 Update argument syntax of configuration files.
svn path=/nixos/trunk/; revision=13847
2009-01-25 15:22:17 +00:00
Eelco Dolstra
788275e47c * Remove a stale lock file that may prevent the
X server from starting.

svn path=/nixos/trunk/; revision=13812
2009-01-20 08:44:41 +00:00
Eelco Dolstra
d532df65dd * Quick hack to make the `info' command work properly by generating
a "dir" file on the fly in a wrapper script.

svn path=/nixos/trunk/; revision=13805
2009-01-19 12:34:14 +00:00
Eelco Dolstra
93c19c4ae9 * CUPS daemon: modprobe usblp so that CUPS can find USB printers.
* CUPS daemon: use Ghostscript to support printing on non-Postscript
  printers.

svn path=/nixos/trunk/; revision=13794
2009-01-17 13:10:06 +00:00
Sander van der Burg
e50e022fc6 Added Apache Tomcat proxy to new Apache upstart service
svn path=/nixos/trunk/; revision=13786
2009-01-16 14:07:54 +00:00
Eelco Dolstra
1603d28819 * Include tune2fs in the initrd. This is useful for
(say) converting from ext3 to ext4.

svn path=/nixos/trunk/; revision=13772
2009-01-15 13:49:00 +00:00
Eelco Dolstra
fbe40a260e * The Linux kernel >= 2.6.27 provides firmware, so add it to the
firmware search path.

svn path=/nixos/trunk/; revision=13770
2009-01-15 10:35:00 +00:00
Michael Raskin
12f4fbfb4b Added guestUsers job for automatical adding guests
svn path=/nixos/trunk/; revision=13732
2009-01-09 00:23:07 +00:00
Michael Raskin
9a46e71e7b Added rogue job used by CD
svn path=/nixos/trunk/; revision=13730
2009-01-08 23:49:22 +00:00
Michael Raskin
0a1f41c742 An upstart job to display manual
svn path=/nixos/trunk/; revision=13728
2009-01-08 23:30:23 +00:00
Michael Raskin
aa393f816c Allowing direct package use in manual expression
svn path=/nixos/trunk/; revision=13724
2009-01-08 21:50:27 +00:00
Michael Raskin
32adf2c521 Option for proxy usage in Nix daemon
svn path=/nixos/trunk/; revision=13689
2009-01-03 09:07:52 +00:00
Nicolas Pierron
7aa27dfee2 Merge branches 'fix-style' and 'master' into fix-style
svn path=/nixos/branches/fix-style/; revision=13688
2009-01-02 19:41:39 +00:00
Nicolas Pierron
d745c21aab Merge system/fontdir.nix and system/fonts.nix into a new configuration file.
svn path=/nixos/branches/fix-style/; revision=13686
2009-01-02 16:07:39 +00:00
Nicolas Pierron
e4b0134a43 Add a grub configuration file.
svn path=/nixos/branches/fix-style/; revision=13685
2009-01-02 16:07:34 +00:00
Nicolas Pierron
b67e2a12aa Convert "boot/boot-stage-2.nix" to a configuration file.
svn path=/nixos/branches/fix-style/; revision=13684
2009-01-02 16:07:30 +00:00
Nicolas Pierron
7cdb7d38ef Replace the activation script by one which is completely generated.
svn path=/nixos/branches/fix-style/; revision=13683
2009-01-02 16:07:24 +00:00
Nicolas Pierron
1b32260084 Convert "upstart-jobs/xserver.nix" to a configuration file.
svn path=/nixos/branches/fix-style/; revision=13682
2009-01-02 16:07:21 +00:00
Nicolas Pierron
44f1d9f0bf Extra sudo configuration file from:
- system/options.nix
- system/system.nix
- etc/default.nix

svn path=/nixos/branches/fix-style/; revision=13681
2009-01-02 16:07:15 +00:00
Nicolas Pierron
79bfab0e07 convert "upstart-jobs/atd.nix" to a configuration file. Remove extra occurrences of "atd" from other files.
svn path=/nixos/branches/fix-style/; revision=13680
2009-01-02 16:07:10 +00:00
Nicolas Pierron
86ad3e36d5 Move Nix setup from system/active-configuration.sh to system/system-options.nix.
svn path=/nixos/branches/fix-style/; revision=13679
2009-01-02 16:07:05 +00:00
Nicolas Pierron
145345c307 system/users-groups.nix is now a configuration file.
Remove user & group references from system/system.nix.

svn path=/nixos/branches/fix-style/; revision=13678
2009-01-02 16:07:01 +00:00
Nicolas Pierron
8d5553a4d5 move some command to activate the configuration from activate-configuration.sh to system-options.nix.
svn path=/nixos/branches/fix-style/; revision=13677
2009-01-02 16:06:56 +00:00
Nicolas Pierron
1533dec09d * etc/default.nix is now a configuration file.
* the script used to build the etc directory in stored in config.system.build.etc.
* The activation script is defined inside etc/Default.nix instead of system/activate-configuration.sh

svn path=/nixos/branches/fix-style/; revision=13676
2009-01-02 16:06:52 +00:00
Nicolas Pierron
e7e45dbd2c Start moving the "activate configuration" script to be extensible.
svn path=/nixos/branches/fix-style/; revision=13675
2009-01-02 16:06:46 +00:00
Nicolas Pierron
c787cb1a0a Replace job tags by a library of function to build upstart jobs.
svn path=/nixos/branches/fix-style/; revision=13674
2009-01-02 16:06:41 +00:00
Michael Raskin
d8c1734b99 Synaptics two-finger scrolling option
svn path=/nixos/trunk/; revision=13663
2008-12-20 14:29:52 +00:00
Eelco Dolstra
67451c470b * Make sure that build-chroot-dirs only contains directories.
svn path=/nixos/trunk/; revision=13657
2008-12-19 10:22:45 +00:00
Eelco Dolstra
8a5bcfb934 svn path=/nixos/trunk/; revision=13653 2008-12-17 14:43:14 +00:00
Eelco Dolstra
9c0953b439 svn path=/nixos/trunk/; revision=13652 2008-12-17 14:30:43 +00:00
Eelco Dolstra
2897911915 * Hydra release expression for building NixOS.
svn path=/nixos/trunk/; revision=13651
2008-12-17 13:25:23 +00:00
Eelco Dolstra
43dc3f6baa * Fix grammar/spelling for some descriptions, and make them produce
well-formed XML in the manual again.

svn path=/nixos/trunk/; revision=13650
2008-12-17 13:06:48 +00:00
Eelco Dolstra
2f4b7d3e09 * Doh.
svn path=/nixos/trunk/; revision=13642
2008-12-16 00:16:35 +00:00
Eelco Dolstra
c155a3f46e * When doing chroot builds, the `build-chroot-dirs' option should
include the closure of /bin/sh.  Otherwise all builders that call
  /bin/sh will fail when using the new chroot implementation, which
  only bind-mounts the inputs of a build rather than the whole Nix
  store.

svn path=/nixos/trunk/; revision=13640
2008-12-15 23:54:10 +00:00