Peter Simons
8c702b7c28
Merge pull request #147 from offlinehacker/nameservers
...
Static nameservers should have precedence
2013-04-22 02:16:11 -07:00
Jaka Hudoklin
b230153cfd
Merge branch 'master' of https://github.com/NixOS/nixos into nameservers
...
Conflicts:
modules/tasks/network-interfaces.nix
2013-04-21 20:02:26 +02:00
Jaka Hudoklin
7427639b84
Static nameservers have precedence
2013-04-21 19:48:15 +02:00
Lluís Batlle i Rossell
7a71320a9c
Adding freenet module
2013-04-21 11:27:41 +04:00
Vladimír Čunát
41ccade531
Merge pull request #132 from ierton/udisks2-v2
...
add udisks2 for Xfce
2013-04-20 01:36:14 -07:00
Shea Levy
e32774c270
rabbitmq.nix: Set SYS_PREFIX empty so files live in /var
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-19 10:49:46 -04:00
viric
204f5a3f4c
Merge pull request #143 from viric/grub_all
...
Making grub display 'All configurations', not 'Old'
2013-04-17 08:05:09 -07:00
Lluís Batlle i Rossell
1caa1b96cb
network-interfaces: fixing a cat/EOF piping confusion
2013-04-17 09:10:41 +02:00
Lluís Batlle i Rossell
927a3e3ff2
fcron: fixing the startOn, since upstart times.
2013-04-17 00:21:19 +02:00
Marco Maggesi
04415eb582
Remove obsolete option in Xen domU module
2013-04-16 19:46:22 +02:00
Shea Levy
cc1ae918bd
Fix cut-off comment in generated configuration.nix
...
Pointed out by Mathnerd626 on irc
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-16 13:34:37 -04:00
Moritz Ulrich
89cf51f2a4
Forgot semicolon. (M)
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-04-16 17:37:36 +02:00
Moritz Ulrich
4be036ca64
ssmtp: Add AuthUser and AuthPass options.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-04-16 17:01:35 +02:00
Lluís Batlle i Rossell
3be4fd3f38
Making grub display 'All configurations', not 'Old'
...
That confused some people, as the first generation shown is
the 'current'.
2013-04-16 11:09:25 +02:00
viric
7d2ec75ae7
Merge pull request #128 from pSub/bitlbee
...
Bitlbee: updated for systemd; added more options like AuthMode
2013-04-14 12:49:18 -07:00
Domen Kožar
25cd3579cb
Merge pull request #141 from orbitz/fix-nginx-required-config
...
Fix nginx required config
2013-04-14 02:28:23 -07:00
orbitz
388d83c586
Set required nginx options and sane default
2013-04-14 11:17:16 +02:00
orbitz
8e7bb847c6
Cleanup whitespaces
2013-04-14 11:14:27 +02:00
Jack Cummings
edc12de8c9
add wantedBy network.target so that hostapd starts by default
2013-04-12 23:25:32 -07:00
Shea Levy
ce8c145a98
nixos-install: Include nix's perl libs in perl's INC
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-11 16:18:24 -04:00
Shea Levy
6e0723bac6
nixos-install: Mound nixos and nixpkgs src directly
...
Previously nixos-install would fail if nixos and nixpkgs weren't on the same mountpoint as /
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-11 16:12:43 -04:00
Eelco Dolstra
e28b0453bf
MediaWiki: Update to 1.20.3
2013-04-11 17:29:34 +02:00
Eelco Dolstra
56e678725d
Remove Upstart reference
2013-04-11 17:29:34 +02:00
Peter Simons
e627d309fd
bash-completion: support the "$out/share/bash-completion" location used by modern packages
2013-04-11 00:48:58 +02:00
Marc Weber
9bf073b58b
s/boot.grubDevice/boot.loader.grub.device/ to shut down warnings
2013-04-10 23:54:37 +02:00
Shea Levy
a215600335
nixos-install: Unmount efivars if mounted
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-10 15:08:33 -04:00
Shea Levy
6a1e1fa108
nixos-install: Bind-mount efivars if it exists
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-10 09:15:54 -04:00
Rickard Nilsson
bf2707d359
unionfs-fuse: Fix conditional expressions
2013-04-10 14:06:29 +02:00
Rickard Nilsson
c59761e994
openldap: Adjust to systemd
2013-04-09 22:48:13 +02:00
Rickard Nilsson
0ccc107300
nslcd: Start after network.target (but don't require network)
2013-04-09 22:47:59 +02:00
Rickard Nilsson
b2b221d533
Add unionfs-fuse to system.fsPackages if needed
2013-04-09 16:44:14 +02:00
Eelco Dolstra
86f11dadaa
switch-to-configuration: Use full path to sync
2013-04-08 17:34:14 +02:00
Domen Kozar
8d5c252ae1
add thinkfan service
2013-04-06 23:35:04 +02:00
Florian Friesdorf
92ad293d02
iso_minimal_new_kernel
2013-04-06 18:24:50 +02:00
Shea Levy
0ff2d2755b
release-combined: Remove maintainers from everything but `tested'
...
This will make it possible to turn on email notifications for the
`tested' job without duplicating emails for all the other jobs
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 13:59:43 -04:00
Shea Levy
52fc087296
Revert "postgresql: version the dataDir by default"
...
This reverts commit 7f1e728606e99dbf394790bdf6eccca685fe981b.
This would have been nice if we had had it from the start, but now it
just breaks things for existing users. Maybe we can add it conditionally
when new postgres versions come out.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 09:20:50 -04:00
Shea Levy
56a60c7fe6
Revert "Fix nixos evaluation on systems that haven't set postgresql.package"
...
This reverts commit 1e543984bcaf5c9e2c26a1b3de86ffa4d9fe7ba3.
This would have been nice if we had had it from the start, but now it
just breaks things for existing users. Maybe we can add it conditionally
when new postgres versions come out.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 09:19:23 -04:00
Shea Levy
1e543984bc
Fix nixos evaluation on systems that haven't set postgresql.package
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 08:01:06 -04:00
Shea Levy
7f1e728606
postgresql: version the dataDir by default
...
Among other things, this will make migrating between versions easier
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 07:55:02 -04:00
Mathijs Kwik
58240e2304
add e17 desktop manager
...
desktop-manager is a bit misleading in this case as there is no
session yet and most apps are still missing. This can eventually
grow further once more e17 apps get packaged for nix.
However, for now, I need to initialize some e17 dbus services to
have the "terminology" terminal emulator provide gfx previews.
2013-04-04 22:19:22 +02:00
Mathijs Kwik
57dc4b9188
xsession: add config option to let systemd handle lid/power events
2013-04-04 22:19:22 +02:00
Mathijs Kwik
fd6b48783d
remove redundant if
2013-04-04 22:19:22 +02:00
Mathijs Kwik
3c8d95f726
xsession: remove duplicate sourcing of /etc/profile
2013-04-04 22:19:22 +02:00
Eelco Dolstra
a446fa9099
PostgreSQL: Don't specify a default PostgreSQL package
...
The user should specify which major version to use
(e.g. "services.postgresql.package = pkgs.postgresql92"). We can't
really provide a sensible default, because such a default would have
to be updated from time to time, and there is no automated upgrade
procedure. So leave upgrading to the user.
2013-04-04 18:21:51 +02:00
Sergey Mironov
303794e0d7
Xfce: use udisks2 instead of udisks
...
Enabling udisks2 allows gvfs (which should be built with udisks support) to
perform mount/unmount operations on removable drives. It affects Thunar and
probably other Gtk-based file managers.
Gvfs doesn't supports earlier versions of udisks.
2013-04-04 12:09:26 +04:00
Sergey Mironov
4b504d8bba
udisks2: add udisks2 service
...
Udisks2 is a Dbus service started by systemd on demand.
2013-04-04 12:06:34 +04:00
Rickard Nilsson
3d93fb9243
xbmc: Use /var/run/lirc/lircd as lirc socket
...
The latest version of the lirc daemon uses /var/run/lirc/lircd, not
/dev/lircd that xbmc uses as default.
2013-04-03 23:16:27 +02:00
Shea Levy
1def5bad35
Revert "Use the new net.ifnames kernel command line flag to disable persistent interface names"
...
As @edolstra pointed out, this behavior is not equivalent to what we had
before as the kernel command line parameter won't take effect until the
next boot. Probably it's not likely that someone will make this change
and then add a network card before rebooting, but might as well support
that since we can.
This reverts commit f7563698dfcc4621cc996142b046c6a4941e68ec.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-03 07:37:04 -04:00
Eelco Dolstra
ee29054da1
Create an empty /etc/resolv.conf to shut up nscd
2013-04-03 13:27:41 +02:00
Eelco Dolstra
fef5a18587
Enable sudoedit
2013-04-03 13:27:41 +02:00