Commit graph

493 commits

Author SHA1 Message Date
Marc Weber
f889d6215e Convert "nixos security options"
svn path=/nixos/branches/fix-style/; revision=14363
2009-03-06 12:25:46 +00:00
Marc Weber
b5a7c767c5 Convert "ldap" (untested)
svn path=/nixos/branches/fix-style/; revision=14362
2009-03-06 12:25:44 +00:00
Marc Weber
bca405ae44 Convert "kbd" (i18n)
svn path=/nixos/branches/fix-style/; revision=14361
2009-03-06 12:25:38 +00:00
Marc Weber
a86ae923d7 Convert "nixos-environment"
in particular: (override) nix, extraPackages, checkConfigurationOptions

svn path=/nixos/branches/fix-style/; revision=14360
2009-03-06 12:25:35 +00:00
Marc Weber
e344a2d055 Convert "unix-odbc-drivers"
svn path=/nixos/branches/fix-style/; revision=14359
2009-03-06 12:25:33 +00:00
Marc Weber
1c43b4946b Convert "acpid"
svn path=/nixos/branches/fix-style/; revision=14358
2009-03-06 12:25:25 +00:00
Marc Weber
8c5f0522e7 removed new proposal jobs
the fix-style branch makes them obsolete
It was broken anyway. I'll readd synergy (client, server) jobs again
later

svn path=/nixos/branches/fix-style/; revision=14353
2009-03-05 17:11:40 +00:00
Lluís Batlle i Rossell
632d77806f Fixing vsftpd without anonymous users, adding localUsers, and creating chroot path.
svn path=/nixos/trunk/; revision=14286
2009-02-28 20:01:49 +00:00
Ludovic Courtès
d1f57d6e1b Convert `portmap' Upstart job to the "new" style.
svn path=/nixos/trunk/; revision=14232
2009-02-24 19:17:25 +00:00
Nicolas Pierron
1c66b3e0c0 Fix activation script's merge function.
svn path=/nixos/branches/fix-style/; revision=14199
2009-02-22 23:33:58 +00:00
Nicolas Pierron
357ca60ed7 * Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in bashrc. This has
the advantage that KDE applications work when logging in via ssh,
  and that you don't need to logout to have KDE upgrades take effect.
  On the downside, since the various KDE packages and shared-mime-info
  all have their own MIME databases, if we put them in one symlink
  tree (systemPath), we need to rerun update-mime-database on the
  symlink tree.  Also, systemPath is getting very large.

svn path=/nixos/branches/fix-style/; revision=14191
2009-02-22 16:09:14 +00:00
Nicolas Pierron
86f5d9dace added hint about how to get the swap partion kernel node numbers
svn path=/nixos/branches/fix-style/; revision=14184
2009-02-22 16:08:41 +00:00
Nicolas Pierron
094aee7467 * acpid: switch to the ondemand CPU scaling governer when on battery power.
Disabled acpid by default because it's not configurable enough yet.

svn path=/nixos/branches/fix-style/; revision=14182
2009-02-22 16:08:33 +00:00
Nicolas Pierron
0c6afe1dd2 Add Upstart job for PulseAudio as a system-wide daemon.
svn path=/nixos/branches/fix-style/; revision=14171
2009-02-22 16:07:42 +00:00
Nicolas Pierron
41b1b80d9e * Quick hack to make the `info' command work properly by generating
a "dir" file on the fly in a wrapper script.

svn path=/nixos/branches/fix-style/; revision=14164
2009-02-22 16:07:10 +00:00
Nicolas Pierron
d5f3418507 Added guestUsers job for automatical adding guests
svn path=/nixos/branches/fix-style/; revision=14160
2009-02-22 16:06:52 +00:00
Nicolas Pierron
f824a1e753 Added rogue job used by CD
svn path=/nixos/branches/fix-style/; revision=14159
2009-02-22 16:06:47 +00:00
Nicolas Pierron
b1eabe2b1b An upstart job to display manual
svn path=/nixos/branches/fix-style/; revision=14158
2009-02-22 16:06:42 +00:00
Nicolas Pierron
95ef8b1694 Option for proxy usage in Nix daemon
Signed-off-by: Nicolas Pierron <nicolas.pierron@lrde.epita.fr>

svn path=/nixos/branches/fix-style/; revision=14156
2009-02-22 16:06:27 +00:00
Eelco Dolstra
311ff6c8e7 * Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in bashrc. This has
the advantage that KDE applications work when logging in via ssh,
  and that you don't need to logout to have KDE upgrades take effect.
  On the downside, since the various KDE packages and shared-mime-info
  all have their own MIME databases, if we put them in one symlink
  tree (systemPath), we need to rerun update-mime-database on the
  symlink tree.  Also, systemPath is getting very large.

svn path=/nixos/trunk/; revision=14148
2009-02-20 16:31:42 +00:00
Marc Weber
bcba001e37 added hint about how to get the swap partion kernel node numbers
svn path=/nixos/trunk/; revision=14081
2009-02-13 19:01:13 +00:00
Eelco Dolstra
03e7f296b1 * acpid: switch to the ondemand CPU scaling governer when on battery power.
Disabled acpid by default because it's not configurable enough yet.

svn path=/nixos/trunk/; revision=14070
2009-02-13 12:11:42 +00:00
Ludovic Courtès
2b8216bdda Add Upstart job for PulseAudio as a system-wide daemon.
svn path=/nixos/trunk/; revision=13907
2009-01-29 18:28:09 +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
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
bb56774a54 Fix hostname (inverse test).
svn path=/nixos/branches/fix-style/; revision=13851
2009-01-25 15:48:35 +00:00
Nicolas Pierron
348afe7dc6 Replace old argument syntax.
svn path=/nixos/trunk/; revision=13848
2009-01-25 15:26:46 +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
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
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
Michael Raskin
d8c1734b99 Synaptics two-finger scrolling option
svn path=/nixos/trunk/; revision=13663
2008-12-20 14:29:52 +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
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
Nicolas Pierron
2f0e8e370a Update argument style.
svn path=/nixos/branches/fix-style/; revision=13584
2008-12-04 15:48:27 +00:00
Ludovic Courtès
8373c890a8 atd: Make `at' and friends actually usable by regular users.
This patch makes the `at' commands setuid `atd' (instead of `root')
and fixes the ownership of `/etc/at/at.deny'.

svn path=/nixos/trunk/; revision=13515
2008-11-29 17:36:00 +00:00
Michael Raskin
7a6df0a5a8 Create a low-priority section in system.nix; host goes there
svn path=/nixos/trunk/; revision=13513
2008-11-29 07:10:31 +00:00
Michael Raskin
7ebc1821f9 Fixing build for new kernels when Intel WiFi firmware is used
svn path=/nixos/trunk/; revision=13470
2008-11-27 20:35:26 +00:00
Ludovic Courtès
3919a28971 Add host' to systemPathList'.
svn path=/nixos/trunk/; revision=13462
2008-11-27 15:30:25 +00:00
Marc Weber
d02e581192 fix: FCRON should no longer be build by default
svn path=/nixos/trunk/; revision=13436
2008-11-26 14:38:35 +00:00
Eelco Dolstra
e39be7a088 * Commented out the fcron job - for some reason it starts to build fcron
even though it should be disabled by default, and the build fails.
  Strange...

svn path=/nixos/trunk/; revision=13394
2008-11-25 00:05:08 +00:00
Nicolas Pierron
205a7431ac Remove extra arguments comming from config.*.
svn path=/nixos/branches/fix-style/; revision=13381
2008-11-23 01:29:20 +00:00
Nicolas Pierron
3b2016569a Replace some ${nixpkgsPath}/pkgs by ${pkgs.path}.
svn path=/nixos/branches/fix-style/; revision=13380
2008-11-23 01:29:13 +00:00
Nicolas Pierron
157bb2b71a Convert "alsa" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13379
2008-11-23 01:29:05 +00:00
Nicolas Pierron
9c0eef3bae Convert "dbus" & "avahi-deamon" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13378
2008-11-23 01:28:58 +00:00
Nicolas Pierron
dc634f5297 Convert "hal" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13377
2008-11-23 01:28:52 +00:00
Nicolas Pierron
585fd9d911 Convert "gpm" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13376
2008-11-23 01:28:45 +00:00
Nicolas Pierron
afe160c6b2 Convert "nagios" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13375
2008-11-23 01:28:34 +00:00
Nicolas Pierron
a63ea50ee9 Fix zabbix-server.nix.
svn path=/nixos/branches/fix-style/; revision=13374
2008-11-23 01:28:25 +00:00
Marc Weber
eea7e6c213 adding fcron daemon.
I have only tested it with upstart 0.5, maybe you have to fix small things in the job description

svn path=/nixos/trunk/; revision=13369
2008-11-22 17:05:20 +00:00
Marc Weber
80377e512e added sshd GatwayPorts option
svn path=/nixos/trunk/; revision=13363
2008-11-20 23:47:05 +00:00
Nicolas Pierron
9c751d377d Use the new scheme for zabbix upstart-job.
svn path=/nixos/branches/fix-style/; revision=13329
2008-11-18 18:00:21 +00:00
Nicolas Pierron
3a25babf1b Use the new scheme for disnix upstart-job.
svn path=/nixos/branches/fix-style/; revision=13328
2008-11-18 18:00:15 +00:00
Nicolas Pierron
892d12bccf - Move some system configuration to options:
* system.nssModules
  * system.modulesTree
  * system.sbin.modprobe
  * system.sbin.mount
  * nix.envVars

- Remove Arguments that can be accessed either by "config" or "pkgs".

- Use the new scheme for upstart-jobs/default.nix.
This is now a configuration file which is imported by system/options.nix.

- Jobs can now include upstart-job/default.nix:
  * upstrat-jobs/cron.nix
  * upstart-jobs/dhclient.nix

=> No Nixos file refers to upstart-jobs/default.nix except if one of its options is require to define an extra job. (e.g.: cron, dhclient)

svn path=/nixos/branches/fix-style/; revision=13327
2008-11-18 18:00:09 +00:00
Nicolas Pierron
2ed34fae67 Extract "locate" job from the "cron" job.
svn path=/nixos/trunk/; revision=13236
2008-11-09 16:44:53 +00:00
Nicolas Pierron
866987a60e cron.nix: Use the new option scheme.
svn path=/nixos/trunk/; revision=13235
2008-11-09 16:44:43 +00:00
Nicolas Pierron
2e6c2f9aaf Add config.etc option to add extra /etc/* files.
svn path=/nixos/trunk/; revision=13234
2008-11-09 16:44:37 +00:00
Nicolas Pierron
92f790036c Replace obsolete name.
svn path=/nixos/trunk/; revision=13233
2008-11-09 16:44:31 +00:00
Nicolas Pierron
ed1df64e2a fix typo in the upstart jobs example.
svn path=/nixos/trunk/; revision=13232
2008-11-09 16:44:22 +00:00
Nicolas Pierron
b73a579d18 Fix previous commit.
svn path=/nixos/trunk/; revision=13229
2008-11-08 21:45:58 +00:00
Nicolas Pierron
4a55f02005 "dhclient.nix" is now a self-contained job.
svn path=/nixos/trunk/; revision=13228
2008-11-08 21:32:48 +00:00
Eelco Dolstra
1ef6d0c61b * growisofs needs to be setuid for high priority scheduling.
svn path=/nixos/trunk/; revision=13220
2008-11-07 13:38:46 +00:00
Eelco Dolstra
37b57e84cf * Disable the warning about missing wrapped setuid programs for now.
svn path=/nixos/trunk/; revision=13219
2008-11-07 13:38:05 +00:00
Michael Raskin
c76632804c meta.function -> passthru.function
svn path=/nixos/trunk/; revision=13191
2008-11-04 21:24:58 +00:00
Eelco Dolstra
4bd1537860 * Create /nix/var/nix/chroots in the activation script
and re-create it at boot time.

svn path=/nixos/trunk/; revision=13152
2008-10-29 15:43:37 +00:00
Marc Weber
32b263e429 added system cron mailto option
svn path=/nixos/trunk/; revision=13114
2008-10-25 22:03:12 +00:00
Michael Raskin
1d55390e1c An option for XRandr support. Use it for dualhead ATi (and probably Intel) cards.
svn path=/nixos/trunk/; revision=13109
2008-10-24 10:30:38 +00:00
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