Commit graph

1672 commits

Author SHA1 Message Date
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
Eelco Dolstra
b701207ead * Typo.
svn path=/nixos/branches/modular-nixos/; revision=16039
2009-06-24 22:27:54 +00:00
Eelco Dolstra
9704472d1c Some hacks to support clean shutdowns of VMs that mount the Nix store
ove QEMU (and other NixOS instances that use a remote filesystem like
NFS):

* Don't take down the network interfaces during shutdown.
* Don't try to unmount the Nix store.  Usually, this doesn't work
  because it's still in use, but on remote filesystems like CIFS the
  `-f' umount flag actually works.

svn path=/nixos/branches/modular-nixos/; revision=16036
2009-06-24 13:33:03 +00:00
Eelco Dolstra
aa075f089e * Set the default gateway.
svn path=/nixos/branches/modular-nixos/; revision=16034
2009-06-24 12:16:06 +00:00
Eelco Dolstra
2c03c134f5 * Build the big CD image in Hydra.
svn path=/nixos/branches/modular-nixos/; revision=16033
2009-06-24 09:14:28 +00:00
Eelco Dolstra
1803c67d13 * Leave out HAL and d-bus (not needed).
svn path=/nixos/branches/modular-nixos/; revision=16032
2009-06-24 09:11:26 +00:00
Eelco Dolstra
2346754f5e * Don't add xterm and feh to the system path if the X server is
disabled.  Other desktop/display/window manager modules should be
  conditional on config.services.xserver.enable as well, but at least
  they're disabled by default due to other options.

svn path=/nixos/branches/modular-nixos/; revision=16031
2009-06-22 20:34:51 +00:00
Eelco Dolstra
74995fe553 * The CD volume label was just over the limit of 32 characters.
svn path=/nixos/branches/modular-nixos/; revision=16027
2009-06-22 16:38:11 +00:00
Eelco Dolstra
27ad47bdac * Build the ISO from the modular branch. Don't bzip the ISO anymore
since it's already compressed using squashfs.

svn path=/nixos/branches/modular-nixos/; revision=16026
2009-06-22 16:28:21 +00:00
Eelco Dolstra
ccdae5ed87 * Fix building the manual.
svn path=/nixos/branches/modular-nixos/; revision=16025
2009-06-22 16:06:11 +00:00