MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1391 commits 244 branches 124 tags 6.1 GiB
Commit graph

507 commits

Author SHA1 Message Date
Michael Raskin
e89cdc0de7 Found it useful to have a place to export assorted things from system configuration.. 
svn path=/nixos/trunk/; revision=12932
 2008-10-01 15:56:01 +00:00
Marc Weber
ca031ce720 httpd.extraModules: now accpets string items loading modules beeing distributed by apache 
removed pkgs : arg

svn path=/nixos/trunk/; revision=12861
 2008-09-14 01:30:45 +00:00
Eelco Dolstra
212d5ceff5 * Don't generate a manifest for the CD anymore, just use the 
copy-from-other-stores substituter to copy paths directly from the
  Nix store on the CD.

svn path=/nixos/trunk/; revision=12826
 2008-09-08 12:40:05 +00:00
Ludovic Courtès
e15ffa9e3c Add `gnunetd' Upstart job. 
svn path=/nixos/trunk/; revision=12802
 2008-09-04 20:28:02 +00:00
Nicolas Pierron
6e6f867a0a Add pcmcia job. 
Test the new option style.

svn path=/nixos/trunk/; revision=12742
 2008-08-27 14:01:17 +00:00
Eelco Dolstra
618b726542 * Don't put the Adobe bitmap fonts in the fontconfig search path 
because then Helvetica looks horrible.

svn path=/nixos/trunk/; revision=12736
 2008-08-27 10:00:49 +00:00
Marc Weber
4eceb15830 fix typos, moved nixos-checkout code into its own file 
following some other suggestions made by niksnut
added further PATH hint in repos description of options.nix

svn path=/nixos/trunk/; revision=12730
 2008-08-26 19:45:06 +00:00
Eelco Dolstra
15e77dfb1c * Add some ugly fonts (like adobe-helvetica) required by some 
primitive applications.

svn path=/nixos/trunk/; revision=12700
 2008-08-25 09:07:42 +00:00
Michael Raskin
fe28b75fdd Updated fontdir to match builderDefs changes. 
svn path=/nixos/trunk/; revision=12656
 2008-08-19 05:55:00 +00:00
Sander van der Burg
545406b2e2 Added support for ejabberd virtualhosts 
svn path=/nixos/trunk/; revision=12648
 2008-08-18 14:48:55 +00:00
Marc Weber
67b1b9af80 rewritten nixos-checkout code. 
You can now define multiple repositories. See options.nix

svn path=/nixos/trunk/; revision=12645
 2008-08-17 01:11:57 +00:00
Marc Weber
f1be382d71 add setuidOwners programs automatically to setuid list 
It should be enough to specify them once

svn path=/nixos/trunk/; revision=12640
 2008-08-16 00:59:23 +00:00
Sander van der Burg
c5fea583e2 Added disnix hook options 
svn path=/nixos/trunk/; revision=12596
 2008-08-12 13:16:12 +00:00
Sander van der Burg
4c3627f16e Added CATALINA_OPTS parameter 
svn path=/nixos/trunk/; revision=12588
 2008-08-11 21:35:45 +00:00
Marc Weber
44134d90cb added example for extraJobs 
svn path=/nixos/trunk/; revision=12572
 2008-08-10 13:48:21 +00:00
Michael Raskin
acda0c6b27 Typo fix 
svn path=/nixos/trunk/; revision=12569
 2008-08-10 05:44:25 +00:00
Marc Weber
23144fee75 added "from system path" hint to description of setuid options 
svn path=/nixos/trunk/; revision=12568
 2008-08-09 23:26:37 +00:00
Eelco Dolstra
ffe45949e8 * Use the right mount command in the filesystems job so that 
NTFS-3G works properly.

svn path=/nixos/trunk/; revision=12565
 2008-08-09 12:03:08 +00:00
Eelco Dolstra
a83becdee8 * When booting from the installation CD, just mount 
/dev/disk/by-label/<label>.  This makes the whole
  autoDetectRootDevice/rootLabel machinery unnecessary.

svn path=/nixos/trunk/; revision=12561
 2008-08-08 23:01:30 +00:00
Eelco Dolstra
1c2d81d93d * Remove "obsolete" notation. 
svn path=/nixos/trunk/; revision=12557
 2008-08-08 19:40:19 +00:00
Eelco Dolstra
a33d2f3adc * Use a klibc-based udev. Hopefully this fixes the problems 
encountered on x86-64 when udev is compiled against dietlibc.

svn path=/nixos/trunk/; revision=12555
 2008-08-08 19:07:07 +00:00
Nicolas Pierron
2e9dc1ea47 Rename option: services.xserver.packageFun -> .package 
svn path=/nixos/trunk/; revision=12553
 2008-08-08 18:57:11 +00:00
Nicolas Pierron
3fd58f8a03 Declare obsolete: hardware option; options with arguments. 
svn path=/nixos/trunk/; revision=12552
 2008-08-08 18:57:09 +00:00
Nicolas Pierron
51210b1904 Remove pkgs argument of: 
- boot.kernelPackages
- boot.extraModulePackages
- services.xserver.packageFun (should be renamed)
- fonts.extraFonts
- environment.extraPackages
- environment.nix

These options still accept the previous style.

svn path=/nixos/trunk/; revision=12551
 2008-08-08 18:57:07 +00:00
Nicolas Pierron
9fc41fc64f Prepare the removal of pkgs arguments. 
If user options are using pkgs arguments, these would be replaced by the pkgs argument given to the whole option component expression instead of the pkgs argument given to the option.

svn path=/nixos/trunk/; revision=12550
 2008-08-08 18:57:04 +00:00
Nicolas Pierron
d63bfe3c31 Use the new configuration scheme for system's options. 
svn path=/nixos/trunk/; revision=12549
 2008-08-08 18:56:58 +00:00
Eelco Dolstra
63e316ecac * Refactoring: move all the initrd-generation related stuff to 
boot-stage-1.nix in order to unclutter system.nix.

svn path=/nixos/trunk/; revision=12547
 2008-08-08 17:34:30 +00:00
Eelco Dolstra
abbe260a80 * Don't use modprobe but insmod in the initrd. This means we don't 
need module-init-tools in the initrd, since insmod is in klibc.
* Give the installation CD a label.

svn path=/nixos/trunk/; revision=12545
 2008-08-08 17:07:04 +00:00
Eelco Dolstra
4d6548e94c * Use the tools from klibc in the initrd instead of the static-tools. 
This makes the initrd a few megabytes smaller.
* Use run-init from klibc to delete everything in the initrd ramfs
  prior to switching to the real root FS.
* Removed the stage2Init argument.

svn path=/nixos/trunk/; revision=12544
 2008-08-08 15:49:57 +00:00
Michael Raskin
2bcb5a8efe Removed tabs in nix-expressions introduced by me in nixos/ tree. 
svn path=/nixos/trunk/; revision=12532
 2008-08-07 10:23:20 +00:00
Michael Raskin
014b33637c Added an option to easily allow everyone to use "at". 
svn path=/nixos/trunk/; revision=12531
 2008-08-07 10:09:17 +00:00
Nicolas Pierron
791d8bbc66 Add udev extra option (addUdevPkgs). 
Add some merge functions.

svn path=/nixos/trunk/; revision=12523
 2008-08-06 19:26:47 +00:00
Nicolas Pierron
53bdeb43e3 Rewrite the optionDeclarations to collect all options definitions. 
svn path=/nixos/trunk/; revision=12521
 2008-08-06 18:43:53 +00:00
Nicolas Pierron
92560a1dc0 Use the new scheme of configuration evaluation. 
svn path=/nixos/trunk/; revision=12519
 2008-08-06 17:39:05 +00:00
Eelco Dolstra
f5e61dfa0c * Provide a mount command that knows how to mount ntfs-3g and cifs 
file systems.  The main advantage is that this allows mounting of
  such file systems from the `filesystems' configuration option at
  boot time, e.g.

    fileSystems = [
      ...
      { mountPoint = "/windows";
        device = "/dev/disk/by-uuid/9EA4B22EA4B208B3";
        fsType = "ntfs-3g";
      }
    ];

  The list of file system helpers should of course be made
  configurable.

svn path=/nixos/trunk/; revision=12516
 2008-08-06 15:48:12 +00:00
Sander van der Burg
f652a0836a Added support for custom context.xml 
svn path=/nixos/trunk/; revision=12513
 2008-08-06 15:07:29 +00:00
Sander van der Burg
afdfff7ed8 Added common lib support for tomcat 
svn path=/nixos/trunk/; revision=12511
 2008-08-06 13:41:08 +00:00
Michael Raskin
cb8067cdb5 More configuratbility for vsFTPd upstart job. 
svn path=/nixos/trunk/; revision=12472
 2008-08-04 09:36:11 +00:00
Eelco Dolstra
274c67a363 * Don't create a setuid wrapper for programs that don't exist. 
svn path=/nixos/trunk/; revision=12429
 2008-07-25 13:34:00 +00:00
Eelco Dolstra
339839a134 * Some more programs to make setuid by default. 
svn path=/nixos/trunk/; revision=12427
 2008-07-25 13:33:10 +00:00
Eelco Dolstra
3e8be34fcc * Set $NIX_OTHER_STORES to /var/run/nix/remote-stores to make 
automatic copying of build results from remote Nix stores work
  more-or-less automatically.  All you have to do is mount the remote
  FS on a subdirectory of /var/run/nix/remote-stores, e.g.

    $ sshfs remote_machine:/ /var/run/nix/remote-stores/foo

* Set $NIXPKGS_ALL.

svn path=/nixos/trunk/; revision=12411
 2008-07-23 16:06:03 +00:00
Eelco Dolstra
5ec1fa2060 * Tabs considered harmful. 
svn path=/nixos/trunk/; revision=12407
 2008-07-23 14:13:27 +00:00
Eelco Dolstra
cc902c638c svn path=/nixos/trunk/; revision=12406 2008-07-23 13:47:32 +00:00
Michael Raskin
0ac32cbb99 Added comments about seccureKeys for configuration files encryption 
svn path=/nixos/trunk/; revision=12342
 2008-07-11 08:01:09 +00:00
Sander van der Burg
6a2600c0a2 Added some more features to the tomcat service 
svn path=/nixos/trunk/; revision=12284
 2008-07-06 19:55:34 +00:00
Sander van der Burg
6df19e0cbb Added disnix 
svn path=/nixos/trunk/; revision=12282
 2008-07-06 18:34:03 +00:00
Sander van der Burg
045ae06092 Updated ejabberd service to make it work 
svn path=/nixos/trunk/; revision=12270
 2008-07-06 10:30:53 +00:00
Sander van der Burg
7813be5e54 Updated tomcat service with a more sophisticated model 
svn path=/nixos/trunk/; revision=12268
 2008-07-05 22:27:36 +00:00
Wouter den Breejen
ab41596a7f Added option boot.extraGrubEntriesBeforeNixos=true/false to boot by default into nixos-default or into your extraGrubEntries 
svn path=/nixos/trunk/; revision=12263
 2008-07-05 00:16:39 +00:00
Eelco Dolstra
1c0aa0fb75 * Create some groups ("disk", "kmem", "tty", ...) that the default 
udev rules expect.

svn path=/nixos/trunk/; revision=12244
 2008-07-02 18:03:43 +00:00
Michael Raskin
7699aaad79 Added BIND 
svn path=/nixos/trunk/; revision=12233
 2008-07-01 12:15:56 +00:00
Eelco Dolstra
eaf6b8eb18 * udevtrigger / udevsettle -> udevadm. 
svn path=/nixos/trunk/; revision=12229
 2008-07-01 08:28:56 +00:00
Michael Raskin
2025d58c2a At least dovecot and postfix work together and with Thunderbird 
svn path=/nixos/trunk/; revision=12223
 2008-06-30 21:12:02 +00:00
Michael Raskin
eb79938997 Added Postfix; handles at least local delivery with maildir/ 
svn path=/nixos/trunk/; revision=12221
 2008-06-30 15:13:02 +00:00
Eelco Dolstra
90acbf9509 * mysql: merged the mysql expression in the services tree. 
* mysql: run under a separate user ("mysql"), not under "nobody".
* mysql: put the PID under /var/run.

svn path=/nixos/trunk/; revision=12189
 2008-06-25 21:58:51 +00:00
Eelco Dolstra
314ab9774f * Put gorecord in PATH. 
svn path=/nixos/trunk/; revision=12173
 2008-06-20 18:17:51 +00:00
Eelco Dolstra
91e2083d32 * Load the wis-go7007 firmware automatically. 
svn path=/nixos/trunk/; revision=12170
 2008-06-20 16:10:20 +00:00
Eelco Dolstra
8c7859f7fb * Make kdesktop_lock work by providing a PAM configuration for KDE 
and making kcheckpass setuid root.

svn path=/nixos/trunk/; revision=12166
 2008-06-20 13:32:39 +00:00
Marc Weber
216e3b73f4 added support for unixODBC in configuration.nix writing /etc/odbcinst.ini 
svn path=/nixos/trunk/; revision=12045
 2008-06-11 23:06:53 +00:00
Eelco Dolstra
a20f4aff60 * Updated the splash screen support for Linux >= 2.6.25. 
svn path=/nixos/trunk/; revision=12030
 2008-06-10 16:10:23 +00:00
Eelco Dolstra
deaf99ca92 * Added a subservices for the Zabbix PHP frontend. 
* Apache subservices: missing declarations are filled in with defaults.

svn path=/nixos/trunk/; revision=12022
 2008-06-09 15:52:02 +00:00
Eelco Dolstra
6d380a8ce8 * Option to set the Zabbix server IP. 
svn path=/nixos/trunk/; revision=12012
 2008-06-08 22:21:56 +00:00
Eelco Dolstra
96a8dbfd58 * Upstart jobs for the Zabbix agent and server daemons. 
svn path=/nixos/trunk/; revision=11998
 2008-06-06 09:13:16 +00:00
Eelco Dolstra
ebb43a3f67 * Make the location of Nixpkgs a function argument (defaulting 
to ../../nixpkgs).  This makes the "pkgs" symlink under the 
  nixos checkout unnecessary.

svn path=/nixos/trunk/; revision=11989
 2008-06-05 15:33:17 +00:00
Michael Raskin
eff945115b Added gpm service 
svn path=/nixos/trunk/; revision=11952
 2008-06-03 07:06:35 +00:00
Michael Raskin
ecef3b1f61 Passing packages list to extraModulePackages 
svn path=/nixos/trunk/; revision=11884
 2008-05-22 19:30:00 +00:00
Eelco Dolstra
bb1ee3f190 * boot.kernel renamed to boot.kernelPackages (see the help for a 
description) to allow all kernel-related packages to be overriden
  easily.  For instance, you can now say in configuration.nix

    boot = {
      kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
    };

  to use Linux 2.6.25.x.  Externel kernel module packages (like
  the NVIDIA drivers) appropriate for this kernel will then be used
  automatically.

svn path=/nixos/trunk/; revision=11880
 2008-05-22 11:59:46 +00:00
Michael Raskin
27fced519e Forgot description is mandatory for all options. Added description to synaptics fine-tune settings. 
svn path=/nixos/trunk/; revision=11857
 2008-05-20 14:59:27 +00:00
Eelco Dolstra
3ed80192c0 * Every option needs a description, otherwise the manual can't be 
built...

svn path=/nixos/trunk/; revision=11856
 2008-05-20 14:53:55 +00:00
Michael Raskin
b5451023a2 Applied patch sent by justbeingglad long ago.. 
svn path=/nixos/trunk/; revision=11833
 2008-05-16 07:32:00 +00:00
Eelco Dolstra
cc7f3c7aaa * URL updates. 
svn path=/nixos/trunk/; revision=11801
 2008-05-09 15:08:43 +00:00
Eelco Dolstra
3e087c0f73 * Include "dm_mod" in the initrd by default for LVM users. 
svn path=/nixos/trunk/; revision=11795
 2008-05-09 10:46:10 +00:00
Eelco Dolstra
8583c52c2c * Enable lvm by default. 
svn path=/nixos/trunk/; revision=11794
 2008-05-09 10:08:21 +00:00
Eelco Dolstra
6d2c1eb838 * module_aggregation -> aggregateModules (naming convention). 
svn path=/nixos/trunk/; revision=11785
 2008-05-08 15:36:56 +00:00
Marc Weber
7a7582ec01 * added extraModules apache configuration option 
Eelco, can your review this patch ?
I hope it fits your design - if not revert it
This way we can drop the mod_php option (See example)

svn path=/nixos/trunk/; revision=11734
 2008-04-27 23:56:51 +00:00
Eelco Dolstra
5dbe45bfea * Modified the SSL configuration a bit. Instead of having a httpPort 
and a httpsPort, there are now options "port" and "enableSSL".  So
  to get https you should typically set up a vhost like this:

    virtualHosts = [
      { hostName = "foo.example.org";
        enableSSL = true;
        sslServerCert = "...";
        sslServerKey = "...";
      }
    ];

* sslServerCert and sslServerKey can be set per vhost.  This is
  currently only useful when doing IP-based vhosting.

* enableUserDir is now a per-vhost setting, as it should be.

* Convenience option globalRedirect to redirect the entire host to
  some URL.

svn path=/nixos/trunk/; revision=11704
 2008-04-24 11:56:38 +00:00
Nicolas Pierron
38874d8025 Add options to hide the cursor and define the default user. 
svn path=/nixos/trunk/; revision=11664
 2008-04-21 13:05:35 +00:00
Michael Raskin
5e1ee10f3c HTTPS support in httpd upstart job fixed. 
svn path=/nixos/trunk/; revision=11613
 2008-04-12 20:08:35 +00:00
Michael Raskin
bfa0e51ee5 Added possibility to modify Xorg passed to upstart-job and xlaunch 
svn path=/nixos/trunk/; revision=11555
 2008-04-11 09:20:39 +00:00
Eelco Dolstra
99480990f6 * Added ncurses to the system path (mostly for the "clear" and "reset" commands). 
svn path=/nixos/trunk/; revision=11528
 2008-04-10 07:43:49 +00:00
Michael Raskin
8c4ebbd24a Some tweaks for Gateway6 job 
svn path=/nixos/trunk/; revision=11496
 2008-04-08 21:41:01 +00:00
Ludovic Courtès
a0fc21eda3 Add `atd' Upstart job. 
svn path=/nixos/trunk/; revision=11435
 2008-04-01 10:16:35 +00:00
Ludovic Courtès
3957962cf9 BitlBee: Run as bitlbee' instead of root'. 
svn path=/nixos/trunk/; revision=11292
 2008-03-26 16:42:57 +00:00
Ludovic Courtès
1a75f0a5a8 Add nssModules' to systemPathsList', add /lib' to systemPath', and 
add `/var/run/current-system/sw/lib' to `LD_LIBRARY_PATH'.  This should allow
NSS modules to be added and taken into account by applications without
the need to reboot.

svn path=/nixos/trunk/; revision=11290
 2008-03-26 16:23:52 +00:00
Michael Raskin
dc27e80fad Changes to support swsusp and custom kernels. 
svn path=/nixos/trunk/; revision=11272
 2008-03-24 19:37:32 +00:00
Michael Raskin
9ab654a6c4 Fix regexp to determine xserver and dbus correctly 
svn path=/nixos/trunk/; revision=11265
 2008-03-22 18:53:55 +00:00
Eelco Dolstra
d6e1828c13 * Speed up activating the configuration: don't do a find 
on all of /etc, skip /etc/nixos.  (Actually, the NixOS/Nixpkgs
  sources probably shouldn't be stored in /etc...)

svn path=/nixos/trunk/; revision=11261
 2008-03-22 16:04:38 +00:00
Eelco Dolstra
047241dd5d * When restarting a job, *really* wait until the job has 
stopped before starting it again.

svn path=/nixos/trunk/; revision=11232
 2008-03-20 14:44:36 +00:00
Ludovic Courtès
79ffaeb2e7 activate-configuration: Look for setuid executables in the default profile. 
svn path=/nixos/trunk/; revision=11202
 2008-03-19 12:34:39 +00:00
Ludovic Courtès
d1f29d328d Add support for `nss-mdns'. 
Currently, the solution is a bit hackish since running applications
will not work after a `nixos-rebuild' because `libnss_mdns' is not
in their `LD_LIBRARY_PATH'.

svn path=/nixos/trunk/; revision=11162
 2008-03-17 13:58:57 +00:00
Eelco Dolstra
52aed402db * Moved to Nixpkgs. 
svn path=/nixos/trunk/; revision=11155
 2008-03-17 10:51:09 +00:00
Ludovic Courtès
6354623143 Add known setuid programs to the path' variable passed to activate-configuration'. 
This is really a hack since programs not known to `system.nix' will not be in the path
of `activate-configuration', which consequently creates empty `.real' files under
`/var/setuid-wrappers'.  I don't know what the best way to address this is: let admins
write `.real' files by hand?  Add a `setuidPackages' attribute, listing the names of
packages that contain the binaries listed in `setuidPrograms'?

svn path=/nixos/trunk/; revision=11153
 2008-03-17 10:31:40 +00:00
Ludovic Courtès
5568ef6e8d activate-configuration: Report it if a setuid program was not found. 
svn path=/nixos/trunk/; revision=11152
 2008-03-17 10:11:48 +00:00
Marc Weber
40d9d62879 added mkOption extraConfig for httpd apache service 
( added \n in config concatenation as well )
added serviceProposal, examples see upstart-jobs/newProposal/*.nix
  enhancement: everything belonging to one job is within the same file 
  (was: upstart-jobs/default.nix, options.nix and the job file)
  drawback: options won't be included within the manual 
            (can be fixed see comments in options.nix)
  comment: looking at the funtion newProposalJobs maybe it's overkill? 
           Hope it pays off if we start having dozens of small different services..


svn path=/nixos/trunk/; revision=11141
 2008-03-16 01:05:40 +00:00
Ludovic Courtès
cf16b3acfe Add `portmap' job. 
svn path=/nixos/trunk/; revision=11140
 2008-03-15 23:40:44 +00:00
Sander van der Burg
6c8bae53c1 Added PermitRootLogin option for sshd 
svn path=/nixos/trunk/; revision=11121
 2008-03-14 12:53:14 +00:00
Eelco Dolstra
8389cc378a * Hack: don't restart dbus automatically, it kills the X server. 
Apparantly the cause was not the upgrade to DBus 1.1.20 but
  something else.

svn path=/nixos/trunk/; revision=11095
 2008-03-13 10:15:12 +00:00
Nicolas Pierron
58240dc30d Add the option xkbModel in the xserver. 
svn path=/nixos/trunk/; revision=11041
 2008-03-10 17:33:13 +00:00
Ludovic Courtès
43a4353c67 Add support for the Avahi daemon. 
The daemon starts correctly but, for some reason, clients fail
to connect to it.

svn path=/nixos/trunk/; revision=10999
 2008-03-06 17:11:22 +00:00
Ludovic Courtès
3cde6bd187 Add support for lshd (SSH2 daemon of GNU lsh). 
svn path=/nixos/trunk/; revision=10969
 2008-03-05 16:03:09 +00:00
Michael Raskin
cf28e6d341 MS Core Fonts are now optional 
svn path=/nixos/trunk/; revision=10962
 2008-03-05 14:30:19 +00:00
Michael Raskin
cedc8aaf58 Now public key is copied to store (and its hash affects derivation hash) 
svn path=/nixos/trunk/; revision=10954
 2008-03-04 16:06:33 +00:00
Michael Raskin
6d07b2a545 Added seccureUser to default environment (it is the encryption tool I hope to use for configuration files), made checkConfigurationOptions on by default, added nixos-gen-seccure-keys to nixosTools 
svn path=/nixos/trunk/; revision=10935
 2008-03-03 23:30:49 +00:00
Michael Raskin
c0dd88a973 Added openfire upstart job. Note: after enabling it first time, go 127.0.0.1:9090 to configure it! 
svn path=/nixos/trunk/; revision=10930
 2008-03-03 19:28:10 +00:00
Michael Raskin
16a8462820 Changed FontDir to also handle TTF. 
svn path=/nixos/trunk/; revision=10912
 2008-03-02 18:46:57 +00:00
Ludovic Courtès
17d527a540 Fix typo related to BitlBee. 
svn path=/nixos/trunk/; revision=10791
 2008-02-20 22:46:53 +00:00
Eelco Dolstra
50800ad3b5 svn path=/nixos/trunk/; revision=10781 2008-02-20 13:29:08 +00:00
Ludovic Courtès
063fd9eeb6 Install BitlBee if enabled. 
svn path=/nixos/trunk/; revision=10780
 2008-02-20 13:18:41 +00:00
Tobias Hammerschmidt
672d293c2b Added support for the Zydas zd1211 firmware. 
svn path=/nixos/trunk/; revision=10763
 2008-02-20 09:01:26 +00:00
Ludovic Courtès
5122633592 Add support for Intel's 4965AGN firmware. 
svn path=/nixos/trunk/; revision=10735
 2008-02-18 16:50:08 +00:00
Eelco Dolstra
8a1d362447 * Postgres job: start postgres directly, don't use the old control 
script from the services tree.

svn path=/nixos/trunk/; revision=10722
 2008-02-18 11:56:43 +00:00
Ludovic Courtès
b98cb9a770 Add BitlBee Upstart job in deamon mode. 
svn path=/nixos/trunk/; revision=10720
 2008-02-18 09:15:10 +00:00
Eelco Dolstra
b9d01830d3 * In a vhost, merge in the robots.txt for the main server. 
svn path=/nixos/trunk/; revision=10688
 2008-02-14 14:14:39 +00:00
Eelco Dolstra
94937ba2aa * Support for declaring virtual hosts, like 
httpd = {
      ...
      virtualHosts = [
        { hostName = "foo";
          documentRoot = "/data/webroot-foo";
          ...
        }
        { hostName = "bar";
          documentRoot = "/data/webroot-bar";
          ...
        }
      ];
    };

  Each virtual host can specify almost any option also permitted in
  the top-level httpd configuration.

svn path=/nixos/trunk/; revision=10682
 2008-02-14 13:20:26 +00:00
Eelco Dolstra
f6fce91cb2 * Allow httpd subservices to declare options locally. 
* Allow multiple instantiations of a subservice (for instance,
  multiple Subversion subservices in the same Apache server).

svn path=/nixos/trunk/; revision=10675
 2008-02-14 09:54:25 +00:00
Eelco Dolstra
18123c08ca * Refactoring. 
svn path=/nixos/trunk/; revision=10671
 2008-02-14 07:42:52 +00:00
Eelco Dolstra
0efc29afa4 * Manual updates. 
svn path=/nixos/trunk/; revision=10560
 2008-02-08 22:43:59 +00:00
Eelco Dolstra
ce250ffb37 * Installation CD: include a lot of modules (SATA, PATA, Firewire, 
USB, some SCSI controllers) in the initrd for mounting the CD.
* Add nix-hardware-scan to the system.
* Upstart: don't use the -v flag.
* Include the NixOS version in the ISO image filename.
* Include testdisk and ms-sys in the CD.
* Some bugfixes in the installer.

svn path=/nixos/trunk/; revision=10556
 2008-02-08 15:59:15 +00:00
Eelco Dolstra
1f81bcae40 svn path=/nixos/trunk/; revision=10548 2008-02-07 14:39:32 +00:00
Eelco Dolstra
b510189674 svn path=/nixos/trunk/; revision=10545 2008-02-07 14:15:13 +00:00
Sander van der Burg
390d2adb91 Modified variable names to follow the standard convention 
svn path=/nixos/trunk/; revision=10544
 2008-02-07 14:02:38 +00:00
Sander van der Burg
7fad8dc1b9 Changed some variable names to follow the standard convention 
svn path=/nixos/trunk/; revision=10542
 2008-02-07 13:37:20 +00:00
Sander van der Burg
76897682c4 Added vsftpd upstart job 
svn path=/nixos/trunk/; revision=10540
 2008-02-07 12:41:18 +00:00
Eelco Dolstra
65c1f9882c * Less verbosity. 
svn path=/nixos/trunk/; revision=10506
 2008-02-05 14:33:21 +00:00
Sander van der Burg
90f34e204d Added ejabberd service 
svn path=/nixos/trunk/; revision=10495
 2008-02-04 13:40:01 +00:00
Eelco Dolstra
707e515f82 * Option to enable support for the WIS GO7007. 
svn path=/nixos/trunk/; revision=10491
 2008-02-04 10:52:58 +00:00
Eelco Dolstra
c30e7b0f13 * Determine networking.enableIntel3945ABGFirmware. 
svn path=/nixos/trunk/; revision=10490
 2008-02-04 10:39:06 +00:00
Eelco Dolstra
0d50031a0a * Periodically update the locate database from cron when 
config.services.locate.enable is set.

svn path=/nixos/trunk/; revision=10448
 2008-02-01 12:35:51 +00:00
Eelco Dolstra
9f62e1a6a5 * Declarative specification of the system cron jobs. Ideally 
this would abstract over the Crontab syntax though.

svn path=/nixos/trunk/; revision=10447
 2008-02-01 12:01:27 +00:00
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
Yury G. Kudryashov
5cd638aad8 new option: paths to link to /var/run/current-system/sw 
svn path=/nixos/trunk/; revision=9828
 2007-12-01 20:44:27 +00:00
Eelco Dolstra
9dd7891820 * Options for configuring the (mail) domain. 
svn path=/nixos/trunk/; revision=9785
 2007-11-23 17:12:37 +00:00
Eelco Dolstra
e7e685e4ce * Allow Upstart jobs to declare extra configuration for Apache. 
Did this for Nagios.  Soon we can rename upstart-jobs to 
  services/plugins/whatever (i.e. an Upstart job will just be 
  one kind of configuration item that a plugin can declare).

svn path=/nixos/trunk/; revision=9778
 2007-11-23 10:56:12 +00:00
Eelco Dolstra
1089c1f7fa * Fix the manual. 
svn path=/nixos/trunk/; revision=9769
 2007-11-21 14:39:52 +00:00
Eelco Dolstra
b880647870 * Options users.extraUsers and users.extraGroups to specify additional 
users and groups that the system should create automatically.

svn path=/nixos/trunk/; revision=9705
 2007-11-16 13:26:34 +00:00
Eelco Dolstra
f6fd10cbd8 * Support for system-wide distributed / multi-platform builds. 
Just set nix.distributedBuilds to true and nix.buildMachines 
  to a list of machines that can perform Nix builds via SSH,
  and local builds will be forwarded appropriately.  So now
  any user can say something like

    nix-build /etc/nixos/nixpkgs/ --arg system '"powerpc-linux"' -A libxml2

  and the build for powerpc-linux will be forwarded to a machine 
  of that type.

svn path=/nixos/trunk/; revision=9696
 2007-11-15 17:16:16 +00:00
Michael Raskin
de01f56b42 Corrected some SVN service glitches; added switchable Nix 
svn path=/nixos/trunk/; revision=9662
 2007-11-13 15:51:24 +00:00
Eelco Dolstra
8b85db0728 * Upstart job for Nagios (system/network monitoring daemon). 
svn path=/nixos/trunk/; revision=9658
 2007-11-12 16:43:35 +00:00
Eelco Dolstra
646c2e4dec * Put user "root" in the group "root". 
svn path=/nixos/trunk/; revision=9654
 2007-11-12 14:59:23 +00:00
Eelco Dolstra
a0f5a93229 * Create /var/tmp. 
svn path=/nixos/trunk/; revision=9653
 2007-11-12 14:45:26 +00:00
Michael Raskin
7d94e2ed4d Removed bad characters in descriptions, changed system.nix checker invokation 
svn path=/nixos/trunk/; revision=9620
 2007-11-10 13:35:15 +00:00
Eelco Dolstra
2fc94b76fe * Eliminate all calls to config.get. 
svn path=/nixos/trunk/; revision=9619
 2007-11-09 18:49:45 +00:00
Eelco Dolstra
62c1f0ddcc * Converted the option declarations in options.nix to nested attribute 
sets that match the hierarchical structure of the options.  So
  instead of

    {
      name = ["time" "timeZone"];
      default = "CET";
      example = "America/New_York";
      description = "The time zone used when displaying times and dates.";
    }

  we have

    time = {
      timeZone = {
        default = "CET";
        example = "America/New_York";
        description = "The time zone used when displaying times and dates.";
      };
    };

  And instead of `config.get ["time" "timeZone"]' you can now just say
  `config.time.timeZone'.  Furthermore, this option representation
  will allow option structures with repetition (such as in
  networking.interfaces or services.httpd.subservices) to be defined.

svn path=/nixos/trunk/; revision=9618
 2007-11-09 18:12:23 +00:00
Eelco Dolstra
5bb4e343b4 * Configuration options networking.defaultMailServer to enable direct mail 
delivery without a local mail server (via ssmtp).
* Add vimDiet to the CD, not the system path in general.

svn path=/nixos/trunk/; revision=9607
 2007-11-08 18:15:12 +00:00
Marc Weber
89670079ab vimDiet and reiserfsprogs added to systemPathList 
svn path=/nixos/trunk/; revision=9600
 2007-11-07 22:00:05 +00:00
Eelco Dolstra
81c7e17e02 * An option nix.useChroot to enable chroot builds in NixOS. 
svn path=/nixos/trunk/; revision=9583
 2007-11-05 11:19:51 +00:00
Michael Raskin
8c9d312e21 Added xfs; fixed nixos-checkout 
svn path=/nixos/trunk/; revision=9579
 2007-11-05 08:54:30 +00:00
Michael Raskin
b494c20cb5 Small correction to xserver.nix for compiz; also nixos-checkout now creates services where it should be. 
svn path=/nixos/trunk/; revision=9578
 2007-11-05 08:33:12 +00:00
Michael Raskin
0ff3fc1882 Added option tcpEnable for X server. Needed for xmove. 
svn path=/nixos/trunk/; revision=9532
 2007-10-26 05:52:35 +00:00
Michael Raskin
b4be8e3b92 Added a way to add arbitrary entries in /etc/hosts . 
svn path=/nixos/trunk/; revision=9528
 2007-10-26 04:49:44 +00:00
Michael Raskin
e4626e0f0d Added some options for manual text insertion into xorg.conf . Removed (commented out) MonitorLayout by default. It was the thing that prevents i915GM on laptops from working. Those who need it can add it back in extraDeviceOptions. 
svn path=/nixos/trunk/; revision=9527
 2007-10-26 04:28:01 +00:00