Eelco Dolstra
f53c9d70ec
* The lack of a newline at the end of "EnableSendFile Off" caused a
...
broken httpd.conf to be generated. We should really have a merge
function that appends newlines to every value of options like
services.httpd.extraConfig.
svn path=/nixos/branches/modular-nixos/; revision=16404
2009-07-16 16:13:35 +00:00
Eelco Dolstra
2cd3e205f4
svn path=/nixos/branches/modular-nixos/; revision=16397
2009-07-16 15:01:56 +00:00
Eelco Dolstra
6119c399d8
* Support tasks in the new Upstart formalism.
...
* Swap task: fixed removing disabled swap devices.
* Swap task: specified the type of swapDevices.
svn path=/nixos/branches/modular-nixos/; revision=16396
2009-07-16 14:51:49 +00:00
Eelco Dolstra
7cb4503ad6
* More Upstart refactoring.
...
svn path=/nixos/branches/modular-nixos/; revision=16394
2009-07-16 13:55:11 +00:00
Eelco Dolstra
bb292fdf04
* Support post-stop actions.
...
svn path=/nixos/branches/modular-nixos/; revision=16393
2009-07-16 13:46:49 +00:00
Michael Raskin
8f7b33c87d
I thought squashfs would not require loop.ko
...
svn path=/nixos/branches/modular-nixos/; revision=16388
2009-07-16 10:28:58 +00:00
Michael Raskin
fac9d09941
Oops, forgot FS modules
...
svn path=/nixos/branches/modular-nixos/; revision=16387
2009-07-16 10:06:53 +00:00
Michael Raskin
e155a46516
Forgot all-module fixes for the correct booting in rescue CD
...
svn path=/nixos/branches/modular-nixos/; revision=16386
2009-07-16 09:48:22 +00:00
Michael Raskin
a7f24fd4bb
Trying to build a good rescue CD..
...
svn path=/nixos/branches/modular-nixos/; revision=16385
2009-07-16 09:22:40 +00:00
Eelco Dolstra
889311f4ca
* Refactored the sshd module.
...
svn path=/nixos/branches/modular-nixos/; revision=16377
2009-07-15 15:53:39 +00:00
Eelco Dolstra
c45cf3a28e
* In the jobs attribute, support a more high-level way of specifying
...
jobs, e.g. (from the nscd job)
{ name = "nscd";
description = "Name Service Cache Daemon";
startOn = "startup";
stopOn = "shutdown";
environment = { LD_LIBRARY_PATH = nssModulesPath; };
preStart =
''
mkdir -m 0755 -p /var/run/nscd
mkdir -m 0755 -p /var/db/nscd
'';
exec = "${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null";
};
The Upstart job is generated from this. The main goal is to provide
some abstraction from the Upstart syntax. For instance, this should
make it easier to upgrade to newer versions of Upstart, to switch to
an entirely different process management system (e.g. initng or
launchd), or to test a job independantly from Upstart. (However the
startOn and stopOn attributes are tied to Upstart's event model.)
svn path=/nixos/branches/modular-nixos/; revision=16376
2009-07-15 15:24:11 +00:00
Eelco Dolstra
0e3bef4195
* Declare the type of jobs.
...
svn path=/nixos/branches/modular-nixos/; revision=16375
2009-07-15 13:41:00 +00:00
Eelco Dolstra
f076849acd
* Escape strings.
...
svn path=/nixos/branches/modular-nixos/; revision=16374
2009-07-15 13:40:30 +00:00
Eelco Dolstra
1424399002
* Simplify.
...
svn path=/nixos/branches/modular-nixos/; revision=16373
2009-07-15 12:52:32 +00:00
Eelco Dolstra
96fe3ba1b7
* Inline make-job.nix.
...
svn path=/nixos/branches/modular-nixos/; revision=16372
2009-07-15 11:38:17 +00:00
Eelco Dolstra
9d1e31117f
* Get rid of the "users" and "groups" fields in jobs.
...
svn path=/nixos/branches/modular-nixos/; revision=16371
2009-07-15 11:34:55 +00:00
Eelco Dolstra
ca8e00cafa
* Got rid of the extraPath field in jobs (use
...
environment.systemPackages instead). Also renamed
services.extraJobs to jobs.
svn path=/nixos/branches/modular-nixos/; revision=16370
2009-07-15 11:19:11 +00:00
Eelco Dolstra
def0be732f
* job.extraHttpdConfig: not used anywhere.
...
svn path=/nixos/branches/modular-nixos/; revision=16369
2009-07-15 09:14:24 +00:00
Eelco Dolstra
118418ba31
* Refactoring the Upstart module. Got rid of job.extraEtc, it's
...
redundant now (modules can just define environment.etc).
svn path=/nixos/branches/modular-nixos/; revision=16367
2009-07-15 09:06:36 +00:00
Eelco Dolstra
b66fd2364c
* Don't put /etc/nixos/nixos in ~/.nix-defexpr.
...
svn path=/nixos/branches/modular-nixos/; revision=16366
2009-07-15 08:45:29 +00:00
Eelco Dolstra
da996583ee
* Include the NixOS manpages in the system environment. Actually
...
there is only one currently: configuration.nix(5), which contains a
list of all the options.
svn path=/nixos/branches/modular-nixos/; revision=16360
2009-07-14 16:27:46 +00:00
Eelco Dolstra
896a9f0508
* Generate a manual page for configuration.nix containing all the
...
options.
svn path=/nixos/branches/modular-nixos/; revision=16358
2009-07-14 15:47:03 +00:00
Eelco Dolstra
a27f3942ef
* Callouts require the docbook_xsl images.
...
svn path=/nixos/branches/modular-nixos/; revision=16354
2009-07-14 13:31:32 +00:00
Eelco Dolstra
ab1676b457
* Urgh, this should have been in commit r16350.
...
svn path=/nixos/branches/modular-nixos/; revision=16353
2009-07-14 13:28:50 +00:00
Eelco Dolstra
b56d08fc83
* Move the hardware modules back to the main modules tree. No need
...
for a separate tree.
* Pass the path of the modules tree to modules so that you don't have
to write absolute paths, e.g. you can say
require = [ "${modulesPath}/hardware/network/intel-3945abg.nix" ];
instead of
require = [ /etc/nixos/nixos/hardware/network/intel-3945abg.nix ];
The latter is bad because it makes it hard to build from a different
NixOS source tree.
svn path=/nixos/branches/modular-nixos/; revision=16350
2009-07-14 12:36:02 +00:00
Eelco Dolstra
b84bab7873
* Use the relatime mount option by default. (This is the default
...
anyway in Linux 2.6.30.)
svn path=/nixos/branches/modular-nixos/; revision=16348
2009-07-14 12:07:17 +00:00
Lluís Batlle i Rossell
c331fd106b
Updated the xserver video drivers list, removing the old via, and putting the new openchrome.
...
svn path=/nixos/branches/modular-nixos/; revision=16330
2009-07-11 10:33:42 +00:00
Marc Weber
d4a37c2f1b
fix copy paste error
...
svn path=/nixos/branches/modular-nixos/; revision=16278
2009-07-09 14:35:03 +00:00
Ludovic Courtès
6d2cc812c2
Make the Liberation Fonts available by default.
...
svn path=/nixos/branches/modular-nixos/; revision=16274
2009-07-09 12:10:58 +00:00
Eelco Dolstra
c42e6da111
svn path=/nixos/branches/modular-nixos/; revision=16271
2009-07-09 11:57:20 +00:00
Ludovic Courtès
fa9f557b96
Add `localhost' under its "real" host name to /etc/hosts.
...
svn path=/nixos/branches/modular-nixos/; revision=16258
2009-07-08 16:10:09 +00:00
Ludovic Courtès
a62e1cf2dd
Disable proprietary fonts by default.
...
svn path=/nixos/branches/modular-nixos/; revision=16253
2009-07-08 14:52:58 +00:00
Michael Raskin
35011ade4e
Adding back passthru functionality
...
svn path=/nixos/branches/modular-nixos/; revision=16237
2009-07-08 09:10:48 +00:00
Michael Raskin
9a66d59786
Fixing wrong assertion sign
...
svn path=/nixos/branches/modular-nixos/; revision=16236
2009-07-08 09:10:26 +00:00
Michael Raskin
1118c4b6d1
Fix service tree paths
...
svn path=/nixos/branches/modular-nixos/; revision=16235
2009-07-08 09:09:57 +00:00
Nicolas Pierron
284f0e7d26
Use "definitionsOf" & "fixableDeclarationsOf": Hide implementation details.
...
svn path=/nixos/branches/modular-nixos/; revision=16199
2009-07-06 23:25:12 +00:00
Nicolas Pierron
36bc4971ba
Inline the require attribute and move the set into lib/check-config.nix.
...
svn path=/nixos/branches/modular-nixos/; revision=16194
2009-07-06 16:21:03 +00:00
Nicolas Pierron
26fcc601a6
Update function arguments to follow nixpkgs modification.
...
svn path=/nixos/branches/modular-nixos/; revision=16193
2009-07-06 16:20:58 +00:00
Ludovic Courtès
1f9d8f45ea
lshd: Fix typo; comment on the seed generation.
...
svn path=/nixos/branches/modular-nixos/; revision=16142
2009-07-02 14:05:01 +00:00
Ludovic Courtès
74738de1f8
Make NSS modules visible to `avahi-daemon'.
...
It allows it to know whether `libnss-mdns' is available, which clients
can ask via the `IsNSSSupportAvailable' D-Bus method.
svn path=/nixos/branches/modular-nixos/; revision=16125
2009-07-01 12:27:35 +00:00
Ludovic Courtès
e2e373b89c
bitlbee: Fix `systemPackages' attribute.
...
svn path=/nixos/branches/modular-nixos/; revision=16090
2009-06-30 08:01:14 +00:00
Ludovic Courtès
6566bc4882
gpsd: Fix UID/GID declaration.
...
svn path=/nixos/branches/modular-nixos/; revision=16089
2009-06-30 07:56:08 +00:00
Ludovic Courtès
05183ccb78
Use the right iwl4965 firmware depending on the kernel version.
...
svn path=/nixos/branches/modular-nixos/; revision=16065
2009-06-26 21:40:29 +00:00
Ludovic Courtès
d68e177909
Oops.
...
svn path=/nixos/branches/modular-nixos/; revision=16064
2009-06-26 21:39:31 +00:00
Ludovic Courtès
dbac392266
Fix typo in `config/nsswitch.nix'.
...
svn path=/nixos/branches/modular-nixos/; revision=16063
2009-06-26 21:24:18 +00:00
Nicolas Pierron
5f59ac0447
Fix a bad use of pkgs.lib.optional. (detect with bad type error on x11Packages)
...
svn path=/nixos/branches/modular-nixos/; revision=16053
2009-06-26 12:14:02 +00:00
Eelco Dolstra
0d5ea86748
* Merge some stuff from the trunk.
...
svn path=/nixos/branches/modular-nixos/; revision=16051
2009-06-26 11:36:38 +00:00
Nicolas Pierron
f61a3ebd2c
Generate hal configuration file form the xserver settings.
...
svn path=/nixos/branches/modular-nixos/; revision=16046
2009-06-25 23:29:49 +00:00
Nicolas Pierron
0bd210bb78
Fix typos in type names. (types.packages -> types.package)
...
svn path=/nixos/branches/modular-nixos/; revision=16045
2009-06-25 22:49:05 +00:00
Nicolas Pierron
6e802e5d75
Replace extraPackages by x11Packages for all windows/desktop managers.
...
-> No longer install graphical packages if the xserver is disabled.
-> avoid duplication of "mkIf config.services.xserver.enable".
svn path=/nixos/branches/modular-nixos/; revision=16044
2009-06-25 22:08:03 +00:00