3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4851 commits

Author SHA1 Message Date
Shea Levy cf3ef6a1fc Merge branch 'lighttpd' of git://github.com/bjornfor/nixos into upstream-master
Moves config file into the store rather than polluting etc, which has a
number of benefits

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-01 13:09:23 -04:00
Shea Levy f7563698df Use the new net.ifnames kernel command line flag to disable persistent interface names
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-01 07:03:00 -04:00
Shea Levy 863c6f2490 Fix missed kernel->kernelDev change
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-01 06:08:30 -04:00
Domen Kozar 969c577173 fixes #127 2013-03-31 21:18:57 +02:00
Bjørn Forsman 395bc5d05c lighttpd: restart service if config changes
Using /etc/lighttpd.conf "hides" the config file from NixOS so that it
will not automatically restart the service when its config file changes.
So don't do that.
2013-03-31 18:06:43 +02:00
Eelco Dolstra f40a38b2c8 Remove /etc lock files at boot time 2013-03-31 15:40:13 +02:00
Lluís Batlle i Rossell 86c1e10a43 Setting pam otpw *after* pam_unix, for dovecot failed auth messages.
I think it's nice that it first asks the usual password, and then offers the
otpw one if enabled. That enables dovecot to show the last pam prompt.

I also add the dovecot option for that.
2013-03-30 22:25:19 +01:00
Lluís Batlle i Rossell c53bd1b279 pam: adding otpw optional, default false 2013-03-30 21:06:23 +01:00
Pascal Wittmann 8d0a7cb6d2 Bitlbee: tabs to spaces 2013-03-29 12:51:47 +01:00
Pascal Wittmann e33af28567 Bitlbee: hardcode username and configdir; homedir == configdir 2013-03-29 12:37:06 +01:00
Pascal Wittmann 4af26d582c Bitlbee: updated for systemd; added more options like AuthMode 2013-03-29 10:28:54 +01:00
Eelco Dolstra fbde5e027e Sync after installing the boot loader
Previously we synced just before calling switch-to-configuration.
That prevents corruption of the Nix store, but it can leave the boot
loader configuration and kernel files in /boot corrupted.  So do the
sync after installing the boot loader.
2013-03-28 16:11:54 +01:00
Eelco Dolstra 9000fd81d5 Hack: force timers.target to be started
Usually timers.target is pulled in by basic.target, but we don't
restart basic.target.  So timers.target wouldn't be started when
coming from an older systemd.
2013-03-28 15:02:11 +01:00
Eelco Dolstra c2977f134e nix-gc.timer: Fix the start time 2013-03-28 13:35:07 +01:00
Eelco Dolstra 7ad91f31d6 Add support for systemd timers 2013-03-28 11:54:19 +01:00
Eelco Dolstra 9c3a31ff4c Clear /proc/sys/kernel/hotplug again
Otherwise the kernel will pointlessly try to invoke /sbin/hotplug all
the time.  Another feature lost in the systemd switch.
2013-03-27 23:03:37 +01:00
Eelco Dolstra c039e286b9 Set the kernel.poweroff_cmd sysctl
This allows Xen (and EC2) to power off an instance properly.  We had
this before (see aeb89fc753), but it got
lost in the systemd migration.
2013-03-27 23:03:37 +01:00
Eelco Dolstra f3bea050f8 Updates for systemd 198/199 2013-03-27 23:03:37 +01:00
Eelco Dolstra 8b9216fdcb Don't set the firmware path in 3 different places 2013-03-27 23:03:37 +01:00
Domen Kozar c52cb9bb65 add almir service 2013-03-27 11:47:28 +01:00
Shea Levy 6c6b0be503 iso_efi: Fix build
Thanks to mwc in irc for pointing it out

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-26 14:36:53 -04:00
Shea Levy 652e2ab610 "Maintain" the tested job so I get notifications when it fails
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-26 12:35:28 -04:00
Shea Levy 89dd7b0f69 Revert "Don't mount /nix/store ro if it's a mountpoint"
Now that nixUnstable supports remounting in the "/nix/store is a
mountpoint" case, this is no longer necessary.

This reverts commit f1d48aec43.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-26 12:20:06 -04:00
Eelco Dolstra 991a78dd8b Use nixUnstable 2013-03-26 15:58:38 +01:00
Eelco Dolstra 2f5576b539 Grmbl 2013-03-26 14:44:24 +01:00
Eelco Dolstra f235cc2884 Add an aggregated to replace the "tested" NixOS view
Also get rid of the "system" jobset input.
2013-03-26 14:00:31 +01:00
Eelco Dolstra 1b0acab1e5 Only include Linux builds in the NixOS channel 2013-03-26 13:13:52 +01:00
Lluis Batlle 8881d1a920 Fixing the system tarball for the sheevaplug 2013-03-25 21:57:18 +01:00
Eelco Dolstra 1568b6858d Use programs.sqlite from the NixOS channel 2013-03-25 14:14:55 +01:00
Mathijs Kwik b5e2ff4bed mongodb: v8 is the default javascript engine now 2013-03-25 08:10:36 +01:00
Eelco Dolstra cc6bd6d7bb Fix evaluation if driSupport32Bit is enabled on NVIDIA 2013-03-24 22:08:01 +01:00
Eelco Dolstra 2936e44956 Manual: xserver -> display-manager 2013-03-24 22:07:27 +01:00
Marc Weber bfc290421d When enabling wacom put xsetwacom in PATH.
I know that gnome/kde may have their own way to configure wacom tablets
2013-03-24 18:31:31 +01:00
Nicolas B. Pierron 8b2256686b Merge pull request #123 from MarcWeber/feed-upstream/toList
replace list by listOf using same style as for attrsOf
2013-03-23 16:21:21 -07:00
Domen Kozar b8a1ccd16a Add bacula service 2013-03-23 01:23:59 +01:00
Peter Simons c5ba924143 Revert "Add /run/nss to LD_LIBRARY_PATH".
Commit c948494342 exports too many shared
objects into the LD_LIBRARY_PATH, which causes problems with mplayer.
2013-03-21 11:25:25 +01:00
Peter Simons 83e7689d02 Merge pull request #107 from Davorak/fixXorgVMware
Fix Xorg-server on vmware inconjunction with
2013-03-21 03:18:05 -07:00
Rob Vermaas 960bb2bcd3 Fix nixos test driver startJob function. It was stopping the job before. 2013-03-20 20:45:43 +01:00
Rob Vermaas ef28e8e70e Add WorkingDirectory default configuration value for rsyslog. 2013-03-17 21:36:25 +01:00
Rob Vermaas 9a9b53aa9f Add module for rsyslog. Although rsyslog is supposed to be a drop-in
replacement for sysklogd, it lacks some support for certain arguments
used in the default syslog module of NixOS.
2013-03-15 12:55:49 +01:00
Rickard Nilsson f3d063f398 Merge pull request #106 from rickynils/pulseaudio
Merge hardware.pulseaudio and services.pulseaudio
2013-03-14 15:36:12 -07:00
Rickard Nilsson be698e93a4 Merge hardware.pulseaudio and services.pulseaudio
More specifically, this removes services.pulseaudio and adds the option
hardware.pulseaudio.systemWide which defaults to false but can be used to turn
on the system-wide PulseAudio server (previously defined in
services.pulseaudio). Since the two PulseAudio modes are mutually exclusive
anyway (maybe not strictly true, but I don't think is a good idea combining
them) its nicer to be able to reuse server and ALSA configuration between them.

Also the system-wide PulseAudio service has been adjusted to systemd, and a few
things has been fixed (there was no alsa.conf before, for example).

The bottomline is that people that was using hardware.pulseaudio before should
be able to keep doing it in exactly the same way, and people that used
services.pulseaudio must switch over to hardware.pulseaudio.systemWide instead.
2013-03-14 23:33:45 +01:00
Marc Weber f3e6b42258 replace list by listOf using same style as for attrsOf 2013-03-14 17:09:21 +01:00
Shea Levy 6e20c697cd alsa-store.service: Avoid unnecessary shell
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-13 19:58:35 -04:00
Shea Levy 7bbf034f93 alsa-store.service: Ensure /var/lib/alsa exists
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-13 19:48:58 -04:00
Peter Simons 8f679fef5b Merge pull request #116 from rickynils/nss
Add /run/nss to LD_LIBRARY_PATH
2013-03-13 02:57:32 -07:00
Rob Vermaas 28f3d02c29 symlink /etc/localtime was broken, /etc/localtime now points to a location in tzdata in stead of glibc 2013-03-12 10:56:43 +01:00
Shea Levy d67d3b5b6a extraModprobeConfig: set type to types.lines
This makes it so multiple definitions are merged by adding a newline
between each entry, to avoid the need to add a newline to the end of
every definition of extraModprobeConfig. See #119 for an example of an
issue this has caused.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-12 05:51:45 -04:00
Rickard Nilsson 78f3da65ec Revert "nslcd: Require network.target"
This reverts commit af152556e3.

The network target is probably not really required, needs
further testing.
2013-03-12 09:38:22 +01:00
Peter Simons 7abc36c145 Merge pull request #119 from jcumming/zfs.130311
need a newline in extraModprobeConfig
2013-03-11 09:30:52 -07:00