BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2177 commits 1 branch 0 tags 3.8 GiB
Commit graph

567 commits

Author SHA1 Message Date
Ludovic Courtès
6472ee4d20 X11: Always honor ~/.xsession. 
See http://thread.gmane.org/gmane.linux.distributions.nixos/2879 .

svn path=/nixos/trunk/; revision=17814
 2009-10-15 08:27:51 +00:00
Marc Weber
f3472f7163 new nixos-rebuild shortcut for --no-fetch --no-nix-build --show-trace called --redo 
svn path=/nixos/trunk/; revision=17813
 2009-10-14 23:56:11 +00:00
Marc Weber
ba496e25c4 allow starting of sshd using "start sshd" - but don't start it on 
startup automatically because root password is empty by default.

svn path=/nixos/trunk/; revision=17811
 2009-10-14 21:48:12 +00:00
Marc Weber
e611266285 Revert "add /root/my-firmware to the list of firmware directories" 
This reverts rev 17809  - I missed the update

svn path=/nixos/trunk/; revision=17810
 2009-10-14 21:44:25 +00:00
Marc Weber
70b4e1a371 add /root/my-firmware to the list of firmware directories 
svn path=/nixos/trunk/; revision=17809
 2009-10-14 21:35:39 +00:00
Lluís Batlle i Rossell
336d33e591 Adding the wifi nic rt73 firmware into the nixos cds. 
I'm not sure if I had to add the module file reference in "required", or all
modules are properly loaded.


svn path=/nixos/trunk/; revision=17800
 2009-10-14 13:10:41 +00:00
Eelco Dolstra
e4defbe8bd * Bring back loading of firmware from /root/test-firmware. 
svn path=/nixos/trunk/; revision=17797
 2009-10-14 09:38:56 +00:00
Ludovic Courtès
290f41bd9f GRUB: "Grub" -> "GRUB". 
svn path=/nixos/trunk/; revision=17793
 2009-10-13 21:39:23 +00:00
Ludovic Courtès
f9541e0d12 Add GRUB 2 support. 
svn path=/nixos/trunk/; revision=17792
 2009-10-13 21:39:18 +00:00
Marc Weber
ccd2a0b617 sudo default configFile: replace outdated comment 
svn path=/nixos/trunk/; revision=17790
 2009-10-13 21:29:30 +00:00
Lluís Batlle i Rossell
e9702320bf Fixing nvidiaLegacy /var/run/opengl-driver 
svn path=/nixos/trunk/; revision=17786
 2009-10-13 17:52:58 +00:00
Lluís Batlle i Rossell
a347979be5 Adding nvidiaLegacy xorg option for suspend to work 
svn path=/nixos/trunk/; revision=17785
 2009-10-13 17:52:49 +00:00
Sander van der Burg
8457873334 The 'resolution section' is not generated in the xorg.conf when using the vboxvideo driver. This allows us to perform dynamic resolution resizing 
svn path=/nixos/trunk/; revision=17784
 2009-10-13 15:16:30 +00:00
Sander van der Burg
4eea2539c1 Added udev permissions for virtualbox guest additions 
svn path=/nixos/trunk/; revision=17783
 2009-10-13 15:05:06 +00:00
Sander van der Burg
b9d9802c45 Pass virtualbox package as HAL package, so that the guest mouse cursor will follow the host mouse cursor 
svn path=/nixos/trunk/; revision=17781
 2009-10-13 14:30:37 +00:00
Sander van der Burg
50902d2e58 Added some basic VirtualBox driver support. Input driver and dynamic resizing still remains on my todo list 
svn path=/nixos/trunk/; revision=17779
 2009-10-13 13:56:30 +00:00
Eelco Dolstra
1581d91330 * Fix the job name of the Nix daemon. 
svn path=/nixos/trunk/; revision=17776
 2009-10-13 10:09:06 +00:00
Nicolas Pierron
24cbefd7a8 Fix example value of httpd. 
svn path=/nixos/trunk/; revision=17774
 2009-10-13 09:49:26 +00:00
Eelco Dolstra
eba8f94069 * jobAttrs -> jobs. 
svn path=/nixos/trunk/; revision=17769
 2009-10-12 18:09:34 +00:00
Eelco Dolstra
40c9057a49 * Remove the obsolete "jobs" option. 
svn path=/nixos/trunk/; revision=17765
 2009-10-12 17:32:30 +00:00
Eelco Dolstra
d982f23f20 * Convert the remaining jobs to jobAttrs style. 
svn path=/nixos/trunk/; revision=17764
 2009-10-12 17:27:57 +00:00
Eelco Dolstra
9943e0762e * Update some more modules. 
svn path=/nixos/trunk/; revision=17763
 2009-10-12 17:09:38 +00:00
Eelco Dolstra
e91d882a94 * Converted modules that were still using the old (concrete syntax) 
style of declaring Upstart jobs.  While at it, converted them to the
  current NixOS module style and improved some option descriptions.
  Hopefully I didn't break too much :-)

svn path=/nixos/trunk/; revision=17761
 2009-10-12 16:36:19 +00:00
Eelco Dolstra
4a78ef25e7 * Start mysql automatically on startup. 
svn path=/nixos/trunk/; revision=17755
 2009-10-12 11:30:43 +00:00
Michael Raskin
32229e0c05 Make NixOS harder to kill on boot by leaving stale locks for mtab 
svn path=/nixos/trunk/; revision=17734
 2009-10-09 16:09:56 +00:00
Eelco Dolstra
679c3f9295 * Fix the xfsprogs/jfsutils attribute names. TODO: these shouldn't be 
listed in three different places.  The set of "rescue" packages
  should be factored out into a separate module.

svn path=/nixos/trunk/; revision=17727
 2009-10-08 13:10:08 +00:00
Rob Vermaas
a39b238e69 symlink handling mode for sitecopy backup 
svn path=/nixos/trunk/; revision=17716
 2009-10-08 11:08:45 +00:00
Rob Vermaas
81e37d8475 added deps for activation scripts of backup modules 
svn path=/nixos/trunk/; revision=17714
 2009-10-08 09:29:16 +00:00
Rob Vermaas
8d9c51a991 activation script should have unique name 
svn path=/nixos/trunk/; revision=17706
 2009-10-07 20:05:08 +00:00
Nicolas Pierron
2e34baba3b Rename environment.extraPackages to environment.systemPackages. 
svn path=/nixos/trunk/; revision=17705
 2009-10-07 17:14:25 +00:00
Sander van der Burg
43b3ccc620 remove unnecessary concatstrings 
svn path=/nixos/trunk/; revision=17699
 2009-10-07 13:12:45 +00:00
Rob Vermaas
00668de9f1 removed unnecessary optional 
svn path=/nixos/trunk/; revision=17697
 2009-10-07 13:00:37 +00:00
Rob Vermaas
ddf7a784e7 * removed unnecessary comments 
svn path=/nixos/trunk/; revision=17696
 2009-10-07 12:54:22 +00:00
Rob Vermaas
cc5d5b3e77 * removed unnecessary comments 
svn path=/nixos/trunk/; revision=17695
 2009-10-07 12:53:59 +00:00
Rob Vermaas
06f26e1ad0 * removed unnecessary comments 
svn path=/nixos/trunk/; revision=17694
 2009-10-07 12:53:27 +00:00
Rob Vermaas
e6e3c11dba * moved example to example attribute, changed description of sitecopy backup module 
svn path=/nixos/trunk/; revision=17693
 2009-10-07 12:52:04 +00:00
Rob Vermaas
15ffc4a296 shouldn't use <'s in description 
svn path=/nixos/trunk/; revision=17692
 2009-10-07 12:08:04 +00:00
Rob Vermaas
870b2ae68e PostgreSQL should be MySQL 
svn path=/nixos/trunk/; revision=17691
 2009-10-07 11:58:23 +00:00
Rob Vermaas
704e56667a added nixos modules to perform simple backup scheduling for directories, postgresql and mysql database dumps 
svn path=/nixos/trunk/; revision=17690
 2009-10-07 11:55:36 +00:00
Nicolas Pierron
9b5611e35e Option "kde.extraPackages" is now deprecated. 
svn path=/nixos/trunk/; revision=17682
 2009-10-06 19:25:25 +00:00
Nicolas Pierron
2969f36b15 Add the computation of upstart-packages inside the job sub-module by adding 
the option named "upstartPkg".

Move the obsolete option "services.extraJobs" to the rename module.

svn path=/nixos/trunk/; revision=17672
 2009-10-06 09:30:13 +00:00
Marc Weber
7e72788a39 rewrite sshd using jobAtts serving as example 
svn path=/nixos/trunk/; revision=17651
 2009-10-05 18:31:30 +00:00
Marc Weber
d0c68bc9ab adding jobAttrs which is filled from jobs contents 
Purpose: Allow overwriding of properties such as:
           config.jobAttrs.sshd.startOn = "never";

thanks to Nicolas Pierron for reviewing and
extending nixpkgs to make this possible

I'll convert most of the jobs ASAP so please don't care
about the depreceateion much right now

svn path=/nixos/trunk/; revision=17650
 2009-10-05 18:31:27 +00:00
Rob Vermaas
0e2c160e2e added privoxy nixos module 
svn path=/nixos/trunk/; revision=17646
 2009-10-05 15:11:32 +00:00
Eelco Dolstra
8ab6828f31 * Export the manual under system.build.manual to make it easier to 
test (nix-build /etc/nixos/nixos -A config.system.build.manual).

svn path=/nixos/trunk/; revision=17644
 2009-10-05 13:55:33 +00:00
Eelco Dolstra
e4c27acde3 * The mod_php option is no longer implemented. 
svn path=/nixos/trunk/; revision=17578
 2009-10-01 15:34:51 +00:00
Eelco Dolstra
fdab662659 * Add iproute to the system path. It was a dependency of dhclient 
already anyway.

svn path=/nixos/trunk/; revision=17512
 2009-09-29 15:43:52 +00:00
Nicolas Pierron
5c0c8a4017 Add messages inside the renaming process to force user to rename their 
options.

Add the "deprecated" status which breaks until options are manually
renamed.

svn path=/nixos/trunk/; revision=17508
 2009-09-29 15:21:36 +00:00
Nicolas Pierron
08c3069e40 Add obsolete "boot.grubSplashImage". 
svn path=/nixos/trunk/; revision=17507
 2009-09-29 15:03:08 +00:00
Eelco Dolstra
a5ad5a035e * Firewall: by default, only log rejected TCP connections. Otherwise 
you get a lot of garbage in the log.  Also, an option to reject
  instead of drop packets.

svn path=/nixos/trunk/; revision=17505
 2009-09-29 14:21:56 +00:00
Nicolas Pierron
eb1ee3206e Rename module: 
- Improve error messages.

svn path=/nixos/trunk/; revision=17500
 2009-09-29 13:44:07 +00:00
Eelco Dolstra
d142b8a13b * Remove the ACPI actions. There's obsolete now (handled by HAL / 
pm-utils / KDE).

svn path=/nixos/trunk/; revision=17495
 2009-09-29 09:52:25 +00:00
Eelco Dolstra
636a9e7e32 * Add rename clauses for the old Grub options. 
* Renamed some of the new Grub options to more sensible names
  (e.g. extraGrubEntries to extraEntries, bootMount to bootDevice,
  etc.).

svn path=/nixos/trunk/; revision=17494
 2009-09-29 09:50:38 +00:00
Nicolas Pierron
c9f5889ad1 move "environment.extraPackages" into the rename module. 
svn path=/nixos/trunk/; revision=17485
 2009-09-28 18:26:18 +00:00
Nicolas Pierron
7568587e88 Add a renaming module. This module introduce the rename function to 
fetch definitions of oldest options and to add them inside the new option.

Properties are still valid and will not be affected by the renaming. e.g:

with: rename alias "foo.bar" to "baz.quz"
and with the following module:

{
  foo.bar = (mkOverride 10 {}) 42;
  baz.quz = 21;
}

the result of baz.quz would be 42 because the priority is still working
after the renaming.

svn path=/nixos/trunk/; revision=17484
 2009-09-28 18:26:13 +00:00
Eelco Dolstra
373445c410 * Start bluetoothd from udev. 
svn path=/nixos/trunk/; revision=17475
 2009-09-28 16:37:46 +00:00
Eelco Dolstra
647d9ba3b6 * udev: removed the /var/run/devices-created hack. It's no longer 
needed now that we don't use pam_devperm anymore.  When udev is
  restarted, it now asks ConsoleKit to get the active users and sets
  device ACLs accordingly.

svn path=/nixos/trunk/; revision=17474
 2009-09-28 16:27:01 +00:00
Lluís Batlle i Rossell
4163ff95b4 Reverting r17459 - I had wpa_supplicant addapted to my system (nic device), and 
I didn't want to commit that for all nixos users. We may write some day a better
wpa_supplicant solution.

svn path=/nixos/trunk/; revision=17462
 2009-09-27 21:54:38 +00:00
Lluís Batlle i Rossell
b0a6c15f42 Fixing a reference to a grub in kdm, I hadn't tested before. 
svn path=/nixos/trunk/; revision=17461
 2009-09-27 21:51:47 +00:00
Lluís Batlle i Rossell
75f6cd20da Making modular my previous changes for armv5tel. I updated the way to use 
grub. Its options are no more inside 'boot', but inside 'boot.loader.grub'.
I added a new bootloader configuration for nixos, generationsDir. It creates
/boot/default/{init,initrd,kernel,system} symlinks, and the same for the generations
in /boot/system-$gen/{init,initrd,kernel,system}.

I can program the u-boot loader to load /boot/default files always, and have
a minimal nixos boot loader installer functionality. Additionally, I can refer
to the other system generations easily, with a simple 'ls' in /boot.

svn path=/nixos/trunk/; revision=17460
 2009-09-27 21:51:37 +00:00
Lluís Batlle i Rossell
852478ff79 Making supplicant work on eth1 
svn path=/nixos/trunk/; revision=17459
 2009-09-27 21:51:22 +00:00
Nicolas Pierron
a701637f94 Use servicePath instead of relative paths. 
svn path=/nixos/trunk/; revision=17454
 2009-09-26 23:04:43 +00:00
Eelco Dolstra
c5d45514a1 * Don't restart dbus, since that causes ConsoleKit to forget about 
current sessions.

svn path=/nixos/trunk/; revision=17452
 2009-09-26 21:00:47 +00:00
Eelco Dolstra
17d0b83eef * Enable power management support in HAL. So now you can for instance 
suspend from within KDE.

svn path=/nixos/trunk/; revision=17451
 2009-09-26 20:37:48 +00:00
Eelco Dolstra
b3818c1a77 * Add eject to the system path. 
svn path=/nixos/trunk/; revision=17448
 2009-09-26 18:57:34 +00:00
Eelco Dolstra
d933f55e45 * Tell PolicyKit about the policies of HAL and ConsoleKit. 
svn path=/nixos/trunk/; revision=17439
 2009-09-26 10:32:57 +00:00
Eelco Dolstra
693e017bfe * HAL expects a /media directory for mounting removable media. 
svn path=/nixos/trunk/; revision=17437
 2009-09-26 10:27:47 +00:00
Eelco Dolstra
3d5462c980 * Install a PolicyKit policy configuration file. There should be a 
configuration option to add to this file.

svn path=/nixos/trunk/; revision=17436
 2009-09-26 00:07:52 +00:00
Eelco Dolstra
a83e308856 * Clean up ConsoleKit. 
svn path=/nixos/trunk/; revision=17434
 2009-09-25 23:18:52 +00:00
Eelco Dolstra
69f68c319d * A module for the old PolicyKit. 
svn path=/nixos/trunk/; revision=17433
 2009-09-25 23:06:38 +00:00
Eelco Dolstra
684eb63658 * fsck is no longer in e2fsprogs. 
* Don't try to remount CIFS filesystems.
* For devices specified by label, use /dev/disk/by-label instead of
  LABEL=.  The initrd already did this.
* Improved the flagging of pseudo devices.

svn path=/nixos/trunk/; revision=17431
 2009-09-25 22:38:37 +00:00
Eelco Dolstra
530c96761a * Start dbus after udev. Otherwise ConsoleKit may or may not 
recognise X logins as active sessions (i.e. ck-list-sessions will
  show "active = FALSE", and the user doesn't get ownership of
  devices).  I guess console-kit-daemon (which is started by dbus)
  needs some device in /dev to exist.

svn path=/nixos/trunk/; revision=17428
 2009-09-25 20:41:15 +00:00
Eelco Dolstra
3e5912833d * For consistency with Nixpkgs. 
svn path=/nixos/trunk/; revision=17427
 2009-09-25 20:12:35 +00:00
Eelco Dolstra
38898d5304 * r17391 changed the mingetty ttys to device names instead of tty 
numbers.  This also requires kbd and tty-backgrounds to be updated
  (and by extension syslogd and rogue).  Also updated the style of
  those modules.

svn path=/nixos/trunk/; revision=17424
 2009-09-25 19:55:08 +00:00
Eelco Dolstra
69998a8d61 * libgcc_s.so is in $gcc/lib64 on x86_64-linux. 
svn path=/nixos/trunk/; revision=17417
 2009-09-25 12:34:09 +00:00
Lluís Batlle i Rossell
ff1a79ed88 Fixing the top-level expression not to boot only from uImage, but keep on 
booting vmlinuz in non armv5tel.

svn path=/nixos/trunk/; revision=17393
 2009-09-23 20:51:09 +00:00
Lluís Batlle i Rossell
8b9f510b08 Removing grub from the system expression for armv5tel-linux. 
svn path=/nixos/trunk/; revision=17392
 2009-09-23 20:51:00 +00:00
Lluís Batlle i Rossell
b2334990db Making the mingetty module support not only vc ttys. 
svn path=/nixos/trunk/; revision=17391
 2009-09-23 20:50:53 +00:00
Lluís Batlle i Rossell
eab68acb35 Conditioning on /sys/power, and adding double patchelf for armv5tel-linux 
svn path=/nixos/trunk/; revision=17390
 2009-09-23 20:50:48 +00:00
Lluís Batlle i Rossell
7b14ee9932 Setting the files cipher algorithm depending on the architecture 
(with libxcrypt or without libxcrypt, at the end)

svn path=/nixos/trunk/; revision=17389
 2009-09-23 20:50:41 +00:00
Marc Weber
e49ea46466 nfs-kernel: 
fix creating directories by skipping comments and interpreting quotes,
 take input from ${exports} which may be different from /etc/exports
 which also restarts the service in this case updating the export list
 Also run rpc.statd in forground so that it doesn't get respawned

svn path=/nixos/trunk/; revision=17358
 2009-09-23 00:54:09 +00:00
Michael Raskin
478dd67532 Fixing incorrect file reference 
svn path=/nixos/trunk/; revision=17311
 2009-09-20 18:48:34 +00:00
Michael Raskin
69cc6ce3ec Refactoring modules and cleaning up a comment 
svn path=/nixos/trunk/; revision=17310
 2009-09-20 18:15:52 +00:00
Michael Raskin
de555c3705 Reduce size of iso-minimal-fresh-kernel and make it easier to install offline 
svn path=/nixos/trunk/; revision=17301
 2009-09-20 15:07:19 +00:00
Michael Raskin
9be240eaf2 Add rescue functionality 
svn path=/nixos/trunk/; revision=17296
 2009-09-20 09:50:24 +00:00
Michael Raskin
406bcd0d4f Adding the single package needed for the offline installation 
svn path=/nixos/trunk/; revision=17291
 2009-09-20 06:00:50 +00:00
Lluís Batlle i Rossell
67fa5622bf Adding support for the nvidia legacy drivers (videoDriver = "nvidiaLegacy") 
svn path=/nixos/trunk/; revision=17285
 2009-09-19 22:09:29 +00:00
Michael Raskin
a574ae095a Fresh kernel means fresh kernel! 
svn path=/nixos/trunk/; revision=17272
 2009-09-19 11:09:22 +00:00
Lluís Batlle i Rossell
4670b1318a Adding support for the rt73 usb wifi nic firmware loading. 
svn path=/nixos/trunk/; revision=17264
 2009-09-18 20:49:12 +00:00
Nicolas Pierron
2ebd1252aa Fix typo. 
svn path=/nixos/trunk/; revision=17260
 2009-09-18 15:47:02 +00:00
Nicolas Pierron
0e3981213f Add an option to change the policy of source file links inside the manual. 
The default policy use local files instead of remote ones.

svn path=/nixos/trunk/; revision=17258
 2009-09-18 15:27:10 +00:00
Eelco Dolstra
70a10c1720 * In the generation of machines.nix, support specifying a 
speed factor and multiple system types.

svn path=/nixos/trunk/; revision=17231
 2009-09-17 16:22:26 +00:00
Rob Vermaas
bd6fbce0f3 * vsftpd typo 
svn path=/nixos/trunk/; revision=17215
 2009-09-17 07:39:21 +00:00
Michael Raskin
3202022355 Adding an updated iso_minimal version 
svn path=/nixos/trunk/; revision=17186
 2009-09-16 12:31:23 +00:00
Rob Vermaas
bb8c6b038d * use new job style for ddclient upstart 
svn path=/nixos/trunk/; revision=17184
 2009-09-16 11:57:41 +00:00
Rob Vermaas
44f99c64d4 * added ddclient module to allow synchronization of machine's ip address with dynamic dns provider 
svn path=/nixos/trunk/; revision=17180
 2009-09-16 11:22:45 +00:00
Michael Raskin
b9079b8da9 Returning selinux=0: convenient with allmodconfig 
svn path=/nixos/trunk/; revision=17179
 2009-09-16 11:03:15 +00:00
Rob Vermaas
185c8a3884 * add uptimed to system packages 
svn path=/nixos/trunk/; revision=17175
 2009-09-16 08:01:03 +00:00
Rob Vermaas
ba1a9aecfd * added uptimed module, default disabled 
svn path=/nixos/trunk/; revision=17174
 2009-09-16 07:49:23 +00:00
Rob Vermaas
9587192c68 * added uptimed module 
svn path=/nixos/trunk/; revision=17173
 2009-09-16 07:48:47 +00:00
Nicolas Pierron
10e9705a86 Replace optionDeclarations by options which is directly computed by 
moduleMerge.

svn path=/nixos/trunk/; revision=17166
 2009-09-15 14:09:18 +00:00
Nicolas Pierron
36573e5e5c Convert module which are declaring options into modules separated with an 
"options" set to declare options and a "config" set to define options.

svn path=/nixos/trunk/; revision=17148
 2009-09-15 08:33:45 +00:00
Eelco Dolstra
a9eadf9fe6 * Add vfat to the initrd on the CD to enable people to copy the 
contents of the CD to a bootable USB stick.

svn path=/nixos/trunk/; revision=17109
 2009-09-14 13:19:28 +00:00
Nicolas Pierron
a07e90d6f3 Update the documentation: 
* Change the module syntax of the example to follow Eelco's suggestions.

* Add a section "Building your own NixOS CD", which explain how to replace
configuration.nix by the configuration file of a live CD/DVD.

* Fix "Testing the installer" and "Testing the initrd" to fit the location
of derivations.

svn path=/nixos/trunk/; revision=17105
 2009-09-13 22:13:19 +00:00
Nicolas Pierron
ff7e67f2d3 Use the system hostname as default for the avahi daemon. 
svn path=/nixos/trunk/; revision=17104
 2009-09-13 22:13:07 +00:00
Ludovic Courtès
66ebc25eb9 Bitlbee: Change ownership of `/var/lib/bitlbee'. 
svn path=/nixos/trunk/; revision=17099
 2009-09-13 18:26:05 +00:00
Eelco Dolstra
6ca8fa8949 * Enable Grub support in kdm, i.e., the reboot menu option can be used 
to directly boot into any of the Grub menu entries.  This doesn't
  work yet though.  Probably Grub needs some messing with the
  savedefault option.

svn path=/nixos/trunk/; revision=17091
 2009-09-13 15:03:07 +00:00
Eelco Dolstra
379778c385 * For X logins, don't use pam_ck_connector since it doesn't really 
work for X logins.  (The documentation also says so.)  Instead just
  call ck-launch-session from the xsession script.

svn path=/nixos/trunk/; revision=17090
 2009-09-13 14:05:21 +00:00
Eelco Dolstra
0806a8e203 * Support the custom session type (i.e. ~/.xsession) in SLiM. 
svn path=/nixos/trunk/; revision=17088
 2009-09-13 13:40:06 +00:00
Eelco Dolstra
6596a3ec55 * When using kdm, always use our xsession script, even when the 
default session is selected.  This is because we always want to run
  our own initialisation (like starting ssh-agent).

* ssh-agent: don't start it is a child but have it re-exec the
  xsession script.  This ensures that ssh-agent quits when we log out.

* In the xsession script, don't redirect output to ~/.xsession-errors
  if the display manager is kdm, since kdm already does that.  In fact
  it uses ~/.xsession-errors<optional number> if there are concurrent
  X sessions.

* For consistency with other distros and the xdm manpage, exec the
  ~/.xsession script instead of sourcing it.  Do this for the "custom"
  session type provided by kdm.

svn path=/nixos/trunk/; revision=17087
 2009-09-13 13:34:52 +00:00
Eelco Dolstra
d1e7a90277 * KDE likes to have xprop. 
svn path=/nixos/trunk/; revision=17086
 2009-09-13 13:26:35 +00:00
Eelco Dolstra
6e2914fb9b * Make the KDE modules work with KDE 4.2 and 4.3. Also, when using 
KDE 4.3, add Qt 4.5 instead of Qt 4.4 to the system path.

svn path=/nixos/trunk/; revision=17085
 2009-09-13 11:09:58 +00:00
Nicolas Pierron
6b0487d47f Replace "mergeOneOption" by "types.uniq". 
svn path=/nixos/trunk/; revision=17074
 2009-09-12 22:46:53 +00:00
Sander van der Burg
5c53a29a01 Changed reference from KDE 4.2 to KDE 4.3 
svn path=/nixos/trunk/; revision=17044
 2009-09-11 10:48:54 +00:00
Sander van der Burg
297889f05c Switched KDE 4.2 to KDE 4.3 
svn path=/nixos/trunk/; revision=17043
 2009-09-11 10:43:13 +00:00
Lluís Batlle i Rossell
ca241a4801 Making twm work with the new xserver expression. 
svn path=/nixos/trunk/; revision=17042
 2009-09-11 09:41:19 +00:00
Eelco Dolstra
ecde113c52 * Fix logging out in X. Without this option, the X server dies for 
some reason:

  Sep 10 17:52:49 dutibo kernel: mtrr: no MTRR for f0000000,400000 found
  Sep 10 17:52:50 dutibo kdm[2960]: X server for display :0 terminated unexpectedly
  Sep 10 17:52:50 dutibo kdm[2960]: Unable to fire up local display :0; disabling.

svn path=/nixos/trunk/; revision=17013
 2009-09-10 15:58:39 +00:00
Eelco Dolstra
0156cfbe9e * Cleaned up the display manager module a bit. 
svn path=/nixos/trunk/; revision=17012
 2009-09-10 15:49:16 +00:00
Eelco Dolstra
22693ae44e * Disable wireless in a VM to prevent wpa_supplicant from flooding the 
log.

svn path=/nixos/trunk/; revision=17010
 2009-09-10 14:43:11 +00:00
Eelco Dolstra
5d55df7abf * Cleanup. 
svn path=/nixos/trunk/; revision=17008
 2009-09-10 13:53:31 +00:00
Eelco Dolstra
bc95e0fdf9 * Simplified the X server directory structure: x11/xserver/* -> x11/. 
svn path=/nixos/trunk/; revision=17005
 2009-09-10 12:50:58 +00:00
Eelco Dolstra
6920f43f1c Refactoring of the X server module: 
* Modularised the xorg.conf generation.  For instance, the Wacom and
  Synaptics support has been moved into separate modules.  The
  contents of xorg.conf is defined by the option
  services.xserver.config, and various other options for specific
  sections (e.g. services.xserver.serverLayoutSection).

* displayManager.job.env: made this an attribute set.

* tcpEnable -> enableTCP for naming consistency.

* defaultDepth can be set to 0 to leave it undefined (needed for the
  vmware driver).

* Removed some options that seem obsolete or are now the default
  (e.g. RenderAccel, AllowGLXWithComposite).

* Removed services.xserver.package.  This can now be done using
  nixpkgs.config.packageOverrides.

svn path=/nixos/trunk/; revision=17004
 2009-09-10 12:37:33 +00:00
Eelco Dolstra
cbe27af191 * Removed an unnecessary flag. 
svn path=/nixos/trunk/; revision=16999
 2009-09-09 21:22:25 +00:00
Eelco Dolstra
93571df680 * Make sure that hal is really running when the X server starts, 
otherwise we could end up without any input devices.

svn path=/nixos/trunk/; revision=16998
 2009-09-09 21:22:00 +00:00
Sander van der Burg
17c063b627 Added an option that automatically creates the mount points in /etc/exports, so that everything is self initializing 
svn path=/nixos/trunk/; revision=16963
 2009-09-04 22:01:08 +00:00
Sander van der Burg
f6f6bfbc2f The /var/trac directory needs to be accessible by the webserver user 
svn path=/nixos/trunk/; revision=16962
 2009-09-04 15:58:04 +00:00
Eelco Dolstra
17d287afa5 * Bump the number of maximum open files for Nix builders. 
Our VM builds were causing Samba to go over this limit.

svn path=/nixos/trunk/; revision=16960
 2009-09-04 15:27:52 +00:00
Eelco Dolstra
685335df2f * system.build.system -> system.build.toplevel, since the former name 
is just too weird.

svn path=/nixos/trunk/; revision=16954
 2009-09-04 09:29:18 +00:00
Sander van der Burg
9843fa2ed7 Various NFS server fixes: 
- Added rpc.statd service, which prevents messages that tell you that you should use -o nolock
- Create /var/lib/nfs on initialization
- Create /etc/exports, so that exportfs can create /var/lib/nfs/etab. This prevents errors such as: mount.nfs: an incorrect mount option was specified


svn path=/nixos/trunk/; revision=16953
 2009-09-03 14:47:58 +00:00
Eelco Dolstra
67db733123 * Simplify the generation of kdmrc. Instead of using sed to 
substitute some values, just prepend them to the start of kdmrc.
  KDM will merge multiple sections with the same name (even though it
  complains a bit).  Option definitions that occur first have
  precedence.

svn path=/nixos/trunk/; revision=16940
 2009-09-02 18:35:23 +00:00
Eelco Dolstra
6723473421 * Give some more memory to the VMs. 
svn path=/nixos/trunk/; revision=16939
 2009-09-02 18:33:38 +00:00
Sander van der Burg
48f22eb62d Fixed errors with: export command not found 
svn path=/nixos/trunk/; revision=16938
 2009-09-02 17:59:46 +00:00
Eelco Dolstra
331bee12a4 * Fold the functionality of guest-users.nix into users-groups.nix by 
adding an attribute "password" that defines the default password for
  an account.  The default (null, as opposed to the empty string)
  means not to set a password.

svn path=/nixos/trunk/; revision=16937
 2009-09-02 17:35:24 +00:00
Eelco Dolstra
a186b5e4b4 * Fix kdm logins. Doh! 
svn path=/nixos/trunk/; revision=16936
 2009-09-02 17:00:25 +00:00
Sander van der Burg
484580dbbd Updated disnix service to work with latest revision 
svn path=/nixos/trunk/; revision=16929
 2009-09-02 10:27:44 +00:00
Eelco Dolstra
e7acca2ba3 * Cleanup the kernel coverage analysis. 
svn path=/nixos/trunk/; revision=16919
 2009-09-01 22:50:46 +00:00
Eelco Dolstra
2c5599f59b * Urgh, cleanSource doesn't work on paths in the store. Looks like a 
bug.

svn path=/nixos/trunk/; revision=16905
 2009-08-31 15:12:42 +00:00
Eelco Dolstra
9359bf11d5 * Build the Subversion test in Hydra (as a regression test for NixOS). 
* Pass the location to the services tree around instead of requiring
  it to be in ../services.

svn path=/nixos/trunk/; revision=16901
 2009-08-31 14:56:19 +00:00
Eelco Dolstra
a2945a2eb2 svn path=/nixos/trunk/; revision=16900 2009-08-31 14:26:31 +00:00
Eelco Dolstra
a7001d34d7 * Oops, didn't want to commit that. 
svn path=/nixos/trunk/; revision=16898
 2009-08-31 13:46:56 +00:00
Eelco Dolstra
921b838149 * test -> tests. 
svn path=/nixos/trunk/; revision=16897
 2009-08-31 13:40:57 +00:00
Sander van der Burg
4a0be54df0 Added subversion python modules to the PYTHONPATH 
svn path=/nixos/trunk/; revision=16895
 2009-08-30 19:45:15 +00:00
Sander van der Burg
8fd9fa36c4 Added an initial Trac subservice. Trac projects still have to be created by using the trac-admin tool 
svn path=/nixos/trunk/; revision=16894
 2009-08-30 19:11:47 +00:00
Eelco Dolstra
7f8272dd70 * Make the host filesystem writable for non-root. This is a temporary 
hack to enable non-root processes to write coverage data.

svn path=/nixos/trunk/; revision=16891
 2009-08-29 14:14:42 +00:00
Marc Weber
39e12e13c4 cupsd: add bindirCmds so that you can test other backends easier. 
svn path=/nixos/trunk/; revision=16879
 2009-08-27 23:16:09 +00:00
Eelco Dolstra
2892aed712 * lib/eval-config.nix: combined "configuration" and "extraModules" 
into one argument "modules".
* release.nix: fixed the manual job.
* ISO generation: break an infinite recursion.  Don't know why this
  suddenly happens.  Probably because of the nixpkgs.config change,
  but I don't see why.  Maybe the option evaluation is too strict.

svn path=/nixos/trunk/; revision=16878
 2009-08-27 11:57:43 +00:00
Eelco Dolstra
6f1b1aefde * Added an option `nixpkgs.config' that allows the Nixpkgs options to 
be set from the NixOS configuration.  For instance, you can say

    nixpkgs.config.firefox.enableGeckoMediaPlayer = true;

    environment.systemPackages = [ pkgs.firefox ];

  but the more interesting application is to apply global overrides to
  Nixpkgs throughout NixOS, e.g.

    nixpkgs.config.packageOverrides = pkgs:
      { glibc = pkgs.glibc27;
        gcc = pkgs.gcc42;
      };

  would build the whole system with Glibc 2.7 and GCC 4.2.  (There are
  some issues with "useFromStdenv" in all-packages.nix that need to be
  fixed for packages in the stdenv bootstrap though.)

  The implementation of this option is kind of evil though due to the
  need to prevent a circularity between the evaluation of
  nixpkgs.config and the "pkgs" module argument.

svn path=/nixos/trunk/; revision=16866
 2009-08-26 16:52:38 +00:00
Eelco Dolstra
ff146aee08 svn path=/nixos/trunk/; revision=16843 2009-08-24 22:09:19 +00:00
Eelco Dolstra
8e6ad840f2 * Modularised the xinetd service. tftp has been factored out into a 
separate module, which just declares a configuration value that
  causes the xinetd module to add it to xinetd.conf.  Also Nixified
  the service declarations to abstract over the inetd implementation.
  
* Renamed the services.xinetd.tftpd options to services.tftpd.  The
  fact that the tftpd module uses xinetd is an implementation detail.

* xinetd: use -dontfork to let Upstart monitor it, and use -syslog to
  get error messages at startup.

svn path=/nixos/trunk/; revision=16803
 2009-08-21 13:05:45 +00:00
Eelco Dolstra
fb730174a1 * Style change. Tried to have the kde4 module set a default for 
services.xserver.desktopManager.default (so that the user doesn't
  have to) but it doesn't work yet.

svn path=/nixos/trunk/; revision=16800
 2009-08-21 10:13:27 +00:00
Eelco Dolstra
f1035de47c * For the generation of manual / manpages, don't evaluate the option 
declarations again (because we already have them).  This cuts
  evaluation time from 7.2s to 4.9s.

svn path=/nixos/trunk/; revision=16798
 2009-08-21 09:08:55 +00:00
Eelco Dolstra
b48a1c394b * Since atd forks into the background, it wasn't properly monitored by 
Upstart.

svn path=/nixos/trunk/; revision=16795
 2009-08-21 00:02:45 +00:00
Eelco Dolstra
44fb2e4ecd * Allow adding additional kernel parameters. 
svn path=/nixos/trunk/; revision=16792
 2009-08-20 23:20:19 +00:00
Lluís Batlle i Rossell
8db9b2ca54 Fixing a typo in nfs-kernel.nix (export -> exports) 
svn path=/nixos/trunk/; revision=16785
 2009-08-19 20:20:57 +00:00
Lluís Batlle i Rossell
f250f69ee8 Adding xinetd with a possible tftpd server. 
svn path=/nixos/trunk/; revision=16784
 2009-08-19 20:20:51 +00:00
Michael Raskin
769dc2f7e6 Write an explanation for a rule edit needed by LiveCD 
svn path=/nixos/trunk/; revision=16774
 2009-08-19 17:24:33 +00:00
Eelco Dolstra
11c603c3fb * Fix booting from CD. 60-persistent-storage.rules requires some 
variables set by 60-cdrom_id.rules.

svn path=/nixos/trunk/; revision=16773
 2009-08-19 16:48:28 +00:00
Nicolas Pierron
923f58794a Add --rollback option to nixos-rebuild. 
svn path=/nixos/trunk/; revision=16771
 2009-08-19 15:04:19 +00:00
Nicolas Pierron
5980d130c9 Check sshd.permitRootLogin values. 
svn path=/nixos/trunk/; revision=16769
 2009-08-19 15:04:05 +00:00
Sander van der Burg
8b229a45c3 Removed the rm -rf command and replaced symlink operations by ln -sfn so that the state of tomcat can be retained \(unless somebody messes it up manually of course\) 
svn path=/nixos/trunk/; revision=16757
 2009-08-18 11:50:32 +00:00
Eelco Dolstra
447c1ac34a * SLiM / ConsoleKit compatibility hack. 
svn path=/nixos/trunk/; revision=16744
 2009-08-17 01:35:48 +00:00
Eelco Dolstra
7ab616f659 * Added support for ConsoleKit. 
* Let ConsoleKit track the current logins instead of pam_console.
  Udev now takes care of setting the device permissions to the active
  user.  This works much better, since pam_console wouldn't apply
  permissions to new (hot-plugged) devices.  Also, the udev+ConsoleKit
  approach supports user switching.  (We don't have that for X yet,
  but it already works for logins on virtual consoles: if you switch
  between different users on differents VCs with Alt+Fn, the device
  ownership will be changed automatically.)

svn path=/nixos/trunk/; revision=16743
 2009-08-17 01:16:38 +00:00
Eelco Dolstra
ac24c7834d * A module for policy-kit (not enabled yet). 
svn path=/nixos/trunk/; revision=16738
 2009-08-16 21:48:46 +00:00
Eelco Dolstra
7dbf523ddc * dbus: enable support for system services (these are programs that 
the bus daemon can start on demand).  ConsoleKit and PolicyKit need
  this.  This requires a setuid wrapper for dbus-daemon-launch-helper,
  as well as a "messagebus" group.

svn path=/nixos/trunk/; revision=16736
 2009-08-16 21:46:26 +00:00
Eelco Dolstra
26439de75b * security.setuidPrograms: don't set the default in the "default" 
mkOption argument, because then we lose them if somebody sets
  security.setuidPrograms somewhere else.  (Shouldn't "default" be
  merged as well?)

svn path=/nixos/trunk/; revision=16734
 2009-08-16 21:11:04 +00:00
Eelco Dolstra
dba1964122 * setuid-wrappers: support setting the mode. For instance, some 
programs require that the mode is 4550 so that execution of the
  setuid program can be restricted to members of a group.
* setuid-wrappers: remove a race condition in the creation of the
  wrappers if the ownership or mode was different than root:root and
  4555.
* setuid-wrappers: allow the full path of the wrapped program to be
  specified, rather than looking it up in $PATH.

svn path=/nixos/trunk/; revision=16733
 2009-08-16 17:24:59 +00:00
Eelco Dolstra
f31e2718b7 * Print an error if the exec fails. 
svn path=/nixos/trunk/; revision=16732
 2009-08-16 16:46:00 +00:00
Eelco Dolstra
3b931f7861 * We still need /etc/pam.d/other to keep usermod happy. 
svn path=/nixos/trunk/; revision=16731
 2009-08-16 15:46:24 +00:00
Eelco Dolstra
2884c9a836 * Style change. 
svn path=/nixos/trunk/; revision=16730
 2009-08-16 14:54:31 +00:00
Eelco Dolstra
39bffdb34c * Make the generation of /etc/pam.d more declarative. There now is an 
option security.pam.services containing the list of PAM services.
  For instance, the SLiM module simply declares:

    security.pam.services = [ { name = "slim"; localLogin = true; } ];

svn path=/nixos/trunk/; revision=16729
 2009-08-16 14:49:14 +00:00
Eelco Dolstra
88c505c9e0 * make-etc.sh: fixed the duplicate entry check. 
* Inlined make-etc.nix since it's a trivial function.

svn path=/nixos/trunk/; revision=16728
 2009-08-16 13:14:33 +00:00
Eelco Dolstra
9493ecc2a4 * Use the hal-info package. 
svn path=/nixos/trunk/; revision=16693
 2009-08-11 21:16:59 +00:00
Eelco Dolstra
dc093b57dd * Updates to the udev service: support persistant CD-ROM / network 
interface names, use udev's own firmware loader, and dropped the
  sndMode option (udev puts all audio devices in the "audio" group, so
  users can be added to that group if necessary).

svn path=/nixos/trunk/; revision=16692
 2009-08-11 21:16:15 +00:00
Eelco Dolstra
25dbf1594e * Updates for the new udev and util-linux-ng: fsck is now in 
util-linux-ng instead of e2fsprogs, blkid is in util-linux-ng, and
  we need to manually create /dev/.udev prior to starting udevd for
  some reason.

svn path=/nixos/trunk/; revision=16691
 2009-08-11 21:12:37 +00:00
Eelco Dolstra
39d1b11ff7 * The mount hack is gone, just use the regular mount from 
util-linux-ng and make sure that the needed mount helpers
  (e.g. ntfs3g) are in /var/lib/current-system/sw/sbin.

svn path=/nixos/trunk/; revision=16690
 2009-08-11 21:10:33 +00:00
Eelco Dolstra
fd56f110da * Clean up some boot messages. 
svn path=/nixos/trunk/; revision=16689
 2009-08-11 21:09:25 +00:00
Eelco Dolstra
bed6fd6a61 * `umount -f' causes lots of problems, so don't do it. 
svn path=/nixos/trunk/; revision=16688
 2009-08-11 21:08:05 +00:00
Eelco Dolstra
bd2fbcf9e5 * Fix the bluetoothd stop condition. 
svn path=/nixos/trunk/; revision=16687
 2009-08-11 21:06:17 +00:00
Eelco Dolstra
fe329f96ef * Mount the host's /nix/var/nix/db in the guest. 
svn path=/nixos/trunk/; revision=16674
 2009-08-11 14:28:25 +00:00
Sander van der Burg
e8103aa39d Implemented support for per application configuration files 
svn path=/nixos/trunk/; revision=16668
 2009-08-11 09:40:31 +00:00
Eelco Dolstra
c21b02d34b * Add some groups required by the latest udev. 
svn path=/nixos/trunk/; revision=16667
 2009-08-11 09:17:30 +00:00
Eelco Dolstra
f666aa7479 * With "nixos-rebuild build-vm", override the video driver of 
the host (since e.g. "nvidia" won't work in the VM).

svn path=/nixos/trunk/; revision=16663
 2009-08-11 02:02:01 +00:00
Eelco Dolstra
89ef5c979b * New nixos-rebuild action: "nixos-rebuild build-vm" builds a virtual 
machine containing a replica (minus the state) of the system
  configuration.  This is mostly useful for testing configuration
  changes prior to doing an actual "nixos-rebuild switch" (or even
  "nixos-rebuild test").  The VM can be started as follows:

  $ nixos-rebuild build-vm
  $ ./result/bin/run-*-vm

  which starts a KVM/QEMU instance.  Additional QEMU options can be
  passed through the QEMU_OPTS environment variable
  (e.g. QEMU_OPTS="-redir tcp:8080::80" to forward a host port to the
  guest).  The fileSystem attribute of the regular system
  configuration is ignored (using mkOverride), because obviously we
  can't allow the VM to access the host's block devices.  Instead, at
  startup the VM creates an empty disk image in ./<hostname>.qcow2 to
  store the VM's root filesystem.

  Building a VM in this way is efficient because the VM shares its Nix
  store with the host (through a CIFS mount).  However, because the
  Nix store of the host is mounted read-only in the guest, you cannot
  run Nix build actions inside the VM.  Therefore the VM can only be
  reconfigured by re-running "nixos-rebuild build-vm" on the host and
  restarting the VM.

svn path=/nixos/trunk/; revision=16662
 2009-08-11 01:35:56 +00:00
Sander van der Burg
ebd2fbd24f Removed mod_jk option, which is obsolete 
svn path=/nixos/trunk/; revision=16660
 2009-08-10 20:16:33 +00:00
Eelco Dolstra
f003f6d7cd * Fixed the path to the services tree. This should be a NixOS module argument. 
svn path=/nixos/trunk/; revision=16658
 2009-08-10 20:07:58 +00:00
Eelco Dolstra
167ccdd537 * Move the firmware loader into a separate module. 
* services.udev.addFirmware -> hardware.firmware.

svn path=/nixos/trunk/; revision=16657
 2009-08-10 19:27:15 +00:00
Eelco Dolstra
b3c0061a91 * services.udev.addUdevPkgs -> services.udev.packages. 
* Simplified the udev rules generation: merged nixRules into
  services.udev.extraRules, and handle services.udev.extraRules using
  services.udev.packages.

svn path=/nixos/trunk/; revision=16655
 2009-08-10 19:05:20 +00:00
Sander van der Burg
0d35699507 Implemented virtual host support. Now it's possible to assign web applications to virtual host, for example: 
{
  ...

  services = {
    tomcat = {
      enable = true;
      virtualHosts = [
        { name = "test1.localhost";
          webapps = [ mypkgs.HelloApp ];
        }
        { name = "test2.localhost";
          webapps = [ mypkgs.ByeApp ];
        }
      ];
    };
  };
}


svn path=/nixos/trunk/; revision=16654
 2009-08-10 18:45:18 +00:00
Eelco Dolstra
b4f8f919ab * Clean up the udev module. 
svn path=/nixos/trunk/; revision=16653
 2009-08-10 18:41:57 +00:00
Eelco Dolstra
2331a5140d * Added a module for the bluetooth daemon. 
* Refactored some other modules (dbus, hal).

svn path=/nixos/trunk/; revision=16652
 2009-08-10 18:25:09 +00:00
Eelco Dolstra
0ab6be1c81 * Restarting dbus no longer seems to kill the X server. 
svn path=/nixos/trunk/; revision=16650
 2009-08-10 16:18:51 +00:00
Sander van der Burg
89810914e4 Added virtual host support, which requires some more testing 
svn path=/nixos/trunk/; revision=16649
 2009-08-10 15:27:25 +00:00
Ludovic Courtès
fe51b0c6c3 bashrc: Source `${bash}/etc/bash_completion' when available. 
svn path=/nixos/trunk/; revision=16641
 2009-08-10 10:18:33 +00:00
Ludovic Courtès
4c848efc1a bashrc: Remove obsolete aclocal' and rpcgen' hacks. 
svn path=/nixos/trunk/; revision=16640
 2009-08-10 10:07:30 +00:00
Ludovic Courtès
ac29ad197b stage-1-init: Remove timeout from `fail()'. 
Timeouts upon failure can be harmful, e.g., after a file system failure
that needs manual intervention.

svn path=/nixos/trunk/; revision=16637
 2009-08-10 09:20:05 +00:00
Sander van der Burg
8c034b988d Added a lot of modifications in order to expression a Tomcat configuration better and to perform more efficient management of various Tomcat components. 
With these modifications, a user can configure a tomcat instance with web applications and web services by writing a service, such as:

...

services = {
  tomcat = {
    enable = true;
    webapps = [ mypkgs.HelloWorldWebApplication ];
    axis2 = {
      enable = true;
      services = [ mypkgs.HelloService mypkgs.HelloWorldService ];
    };
  };
};


svn path=/nixos/trunk/; revision=16619
 2009-08-09 20:19:07 +00:00
Eelco Dolstra
02c119a104 * Workaround for hangs on x86_64. 
svn path=/nixos/branches/modular-nixos/; revision=16590
 2009-08-05 11:43:51 +00:00
Eelco Dolstra
7d3e2b15ef svn path=/nixos/branches/modular-nixos/; revision=16585 2009-08-04 16:09:07 +00:00
Eelco Dolstra
32bb5b2d0f * Bring back the options to enable/disable the Intel firmwares. 
svn path=/nixos/branches/modular-nixos/; revision=16574
 2009-08-04 08:50:02 +00:00
Michael Raskin
c8705704e1 Add Wacom X11 driver support 
svn path=/nixos/branches/modular-nixos/; revision=16569
 2009-08-03 19:55:33 +00:00
Eelco Dolstra
383370f782 * Don't create a temporary file in $HOME. 
svn path=/nixos/branches/modular-nixos/; revision=16561
 2009-08-03 12:44:45 +00:00
Eelco Dolstra
6802a75076 * nixos-rebuild: replaced some environment variables with options 
(e.g. --install-grub instead of $NIXOS_INSTALL_GRUB).  Also support
  some nix-build options (e.g. --show-trace and -j).

svn path=/nixos/branches/modular-nixos/; revision=16560
 2009-08-03 12:36:15 +00:00
Eelco Dolstra
bc54061cba svn path=/nixos/branches/modular-nixos/; revision=16557 2009-08-03 12:17:23 +00:00
Michael Raskin
137ce0907c Some fixes in on-boot activation 
svn path=/nixos/branches/modular-nixos/; revision=16525
 2009-07-31 08:32:53 +00:00
Michael Raskin
f05682c84d Give some progress indications during Stage2 boot 
svn path=/nixos/branches/modular-nixos/; revision=16523
 2009-07-31 04:56:52 +00:00
Michael Raskin
bef1dc8bd5 Update RC kernel for rescue CD: includes some BtrFS fixes 
svn path=/nixos/branches/modular-nixos/; revision=16515
 2009-07-30 04:20:56 +00:00
Michael Raskin
6aba79bed5 Update child configuration generation 
svn path=/nixos/branches/modular-nixos/; revision=16514
 2009-07-30 04:20:23 +00:00
Rob Vermaas
9c05dd98dc intel5000 firmware 
svn path=/nixos/branches/modular-nixos/; revision=16473
 2009-07-27 14:08:14 +00:00
Eelco Dolstra
f0f5434eaa * Add an option to enable the firewall. It should eventually be 
enabled by default.

svn path=/nixos/branches/modular-nixos/; revision=16464
 2009-07-26 21:27:35 +00:00
Eelco Dolstra
264b49fce7 * A very basic firewall that rejects all incoming connections except 
for the ports defined in networking.firewall.allowedTCPPorts.

svn path=/nixos/branches/modular-nixos/; revision=16460
 2009-07-24 23:12:52 +00:00
Eelco Dolstra
38d594deec * wpa_supplicant: start/stop automatically. 
svn path=/nixos/branches/modular-nixos/; revision=16451
 2009-07-24 00:31:42 +00:00
Eelco Dolstra
c4780a8953 * dhcp 4.1 requires IPv6 support. 
svn path=/nixos/branches/modular-nixos/; revision=16450
 2009-07-24 00:31:22 +00:00
Eelco Dolstra
32b311a0f5 * Add gzip to the $PATH of nix-daemon, otherwise distributed builds 
don't work.  This is a regression wrt the trunk.

svn path=/nixos/branches/modular-nixos/; revision=16448
 2009-07-23 23:25:50 +00:00
Marc Weber
dbd6ea7f63 adding daemonNiceLevel option. running biulds with niceness 0 can be annoying 
svn path=/nixos/branches/modular-nixos/; revision=16420
 2009-07-18 16:14:03 +00:00
Eelco Dolstra
d591559609 * A simple module for running wpa_supplicant. 
svn path=/nixos/branches/modular-nixos/; revision=16409
 2009-07-16 21:08:32 +00:00
Eelco Dolstra
3abf509637 * Don't try to start dhclient on the wmaster0 interface. This just 
gets rid of endless dhclient log messages such as

    Jul 16 19:09:30 dutibo dhclient: DHCPDISCOVER on wmaster0 to 255.255.255.255 port 67 interval 19
    Jul 16 19:09:30 dutibo dhclient: send_packet: Network is down

svn path=/nixos/branches/modular-nixos/; revision=16407
 2009-07-16 17:25:50 +00:00
Eelco Dolstra
b58682401e * Give a type to networking.interfaces. 
* Simplified the pre-start script of the network-interfaces module.
* Removed wireless support from the network-interfaces module.  It
  only worked for static WEP configurations anyway, and AFAIK nobody
  used it.

svn path=/nixos/branches/modular-nixos/; revision=16406
 2009-07-16 17:18:54 +00:00
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
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
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
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
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
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