Eelco Dolstra
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Pascal Wittmann
261ecebfaf
Merge pull request #3323 from wjlroe/logstash-1.4.2
...
Logstash 1.4.2
2014-07-21 20:02:11 +02:00
William Roe
8f31b13938
Fix service to use logstash new directory layout
2014-07-21 16:24:18 +01:00
Evgeny Egorochkin
2660e19b73
Google Compute config: add a unit to wait for the metadata server to become available
2014-07-20 14:07:46 +03:00
Matej Cotman
1afb26fb17
e18: enlightenment desktop manager version 18
2014-07-17 23:00:38 +02:00
Eelco Dolstra
1a1442db74
Don't restart systemd-journal-flush
...
It only needs to be started during boot. Starting it at other times
shouldn't hurt, except that if systemd-journald is restarting at the
same time, the latter might not have a SIGUSR1 signal handler
installed yet, so it might be killed by systemd-journal-flush. (At
least that's my theory about the dead systemd-journald instances in
the build farm...)
2014-07-17 21:01:25 +02:00
Bjørn Forsman
f9a24ba487
nixos/module-list.nix: keep it sorted
2014-07-16 22:16:34 +02:00
Peter Simons
75bbad8abe
Merge pull request #3285 from ehmry/polipo
...
Polipo
2014-07-16 18:29:11 +02:00
Emery Hemingway
e5988bf4dd
polipo: new service expression
2014-07-16 11:29:40 -04:00
Shea Levy
654c88cc6b
Fix virtualbox image building with new nix
2014-07-15 19:17:06 -04:00
Bjørn Forsman
a4cf5e903b
nixos/redis: fix evaluation
...
Commit 89fee1006c
("nixos/redis: clean up
option types") broke nixos evaluation:
error: attempt to call something which is not a function but a set, at .../nixpkgs/nixos/modules/services/databases/redis.nix:111:28
Fix it.
Reported by Oliver Charles (thanks!).
2014-07-15 17:05:54 +02:00
Bjørn Forsman
89fee1006c
nixos/redis: clean up option types
...
Some options lack a type and some use the deprecated "string" type. Fix
it.
2014-07-15 15:45:52 +02:00
Paul Colomiets
496d12958e
Add automatic plugin activation for vim
2014-07-15 14:59:15 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
Pascal Wittmann
e57e57c25d
Merge pull request #3245 from rastus-vernon/patch-1
...
Fix repeated typo
2014-07-12 09:36:22 +02:00
Evgeny Egorochkin
64c01fdf81
Google Compute Image: fetch host keys if possible
2014-07-12 08:47:03 +03:00
Evgeny Egorochkin
9d8ddd465d
Google Compute Image needs the interface to be named eth0 for google tools to work properly
2014-07-12 08:47:03 +03:00
Rastus Vernon
d5daa8ae6f
Fix repeated typo
...
"Can either by" should be "Can either be". There are three occurrences of this mistake, all in descriptions of configuration options.
2014-07-11 23:14:53 -04:00
Eelco Dolstra
3b2609deec
Don't restart systemd-remount-fs
...
It's only needed during early boot (in fact, it's probably not needed
at all on NixOS). Restarting it is expensive because it does a sync()
of the root file system.
2014-07-11 23:34:58 +02:00
Luca Bruno
da9b510996
Move at_spi2_core and at_spi2_atk outside of the gnome3 attrset
2014-07-10 11:39:16 +02:00
Eelco Dolstra
973c9abdbe
Fix info command
...
The "info" command has been broken on NixOS since
457fdb3842
(proving that nobody uses
info).
2014-07-08 15:19:08 +02:00
Marc Weber
672adc126e
nixos: add 'firebird' group
...
The firebird module complains without missing 'firebird' group, add it.
2014-07-08 00:00:33 +02:00
Sönke Hahn
09448101c3
mediawiki: add patch for fixing postgresql errors
2014-07-07 23:19:31 +08:00
lethalman
e497265b72
Merge pull request #2963 from Fuuzetsu/locate
...
locate service: allow customisation
2014-07-07 14:24:04 +02:00
Eelco Dolstra
95b828de42
Merge remote-tracking branch 'origin/master' into staging
2014-07-07 13:16:26 +02:00
lethalman
789c9508c2
Merge pull request #2582 from chexxor/feature/add-znc-module
...
Add ZNC module
2014-07-06 11:23:08 +02:00
Igor Pashev
d4a320cd12
Updated Mediawiki to 1.23.1
2014-07-04 17:34:37 +02:00
Alex Berg
7b768ba2f5
Merge remote-tracking branch 'nixos/master' into feature/add-znc-module
...
Conflicts:
nixos/modules/misc/ids.nix
2014-07-03 11:30:11 -05:00
lethalman
cb86818789
Merge pull request #3079 from wmertens/patch-4
...
virtualbox: Fix permissions for /dev/vboxdrvu
2014-07-03 15:05:05 +02:00
Shea Levy
b3cfb9084b
Get all lib functions from lib, not pkgs.lib, in modules
2014-07-02 12:28:18 -04:00
Eelco Dolstra
06fc1ec34d
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
.
2014-06-30 14:56:10 +02:00
Jaka Hudoklin
16f801cba9
nixos/pam: make pam_loginuid optional if in container
2014-06-30 11:08:39 +02:00
Michael Raskin
77314b7eb2
Merge pull request #2888 from nilcons/no-random-arch-downgrades
...
Fix nixos-rebuild.sh to depend on Nix
2014-06-30 12:47:17 +04:00
Michael Raskin
02266194ea
Merge pull request #2894 from kirelagin/fixusergroup
...
Fix conditional handling of users and groups in some services
2014-06-30 10:16:20 +04:00
Michael Raskin
b403893aa2
Merge pull request #2778 from edwtjo/radicale
...
Adding Radicale package and service
2014-06-30 10:11:23 +04:00
Michael Raskin
f2e9ebbd46
Merge pull request #2283 from wizeman/u/sysctl-merge
...
nixos: Fix sysctl option merging
2014-06-30 09:03:33 +04:00
aszlig
da32f052b1
Revert "nixos/sshd: drop mode from auth keys file".
...
This reverts commit a3331eb87b
.
See https://github.com/NixOS/nixpkgs/issues/2559#issuecomment-47313334
for a description why this is not a good idea.
I guess it's better to implement a sane way to remove all files in
authorized_keys.d, especially because it is also backwards-compatible.
Reopens #2559 .
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-06-27 09:22:07 +02:00
John Wiegley
8eedf968eb
Merge pull request #3093 from lethalman/sshkeys
...
nixos/sshd: drop mode from auth keys file. Closes #2559
2014-06-26 10:26:47 -07:00
Luca Bruno
a3331eb87b
nixos/sshd: drop mode from auth keys file. Closes #2559
2014-06-26 10:15:34 +02:00
Austin Seipp
13162e8cdb
Fix gitolite docs
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:55:43 -05:00
Austin Seipp
3eb2d1e03e
nixos: add gitolite module
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-25 22:54:18 -05:00
Alex Berg
9af1e2ab51
Add ZNC module. Has zncConfOptions or specify full conf file.
2014-06-26 05:44:32 +02:00
Jan Malakhovski
37c7d024ef
nixos: change EDITOR and PAGER environment variables to mkDefaults
...
Signed-off-by: Domen Kožar <domen@dev.si>
2014-06-25 17:07:10 +02:00
wmertens
147fd1ff12
virtualbox: Fix permissions for /dev/vboxdrvu
...
See https://bugs.archlinux.org/task/38314 and https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Installer/linux/installer-common.sh?rev=47894#L28
2014-06-25 15:52:05 +02:00
Bjørn Forsman
4def9a762f
nixos: add some missing '.' in option descriptions
2014-06-24 21:25:11 +02:00
Bjørn Forsman
f78ce19d8c
nixos/elasticsearch: capitalize systemd service description
2014-06-24 21:11:12 +02:00
Bjørn Forsman
6ce8f753e0
nixos/elasticsearch: add '.' at end of description strings
...
Nixos option descriptions should be full sentences, ending in a full
stop. (Package descriptions, on the other hand, should not.)
2014-06-24 21:06:30 +02:00
Mateusz Kowalczyk
4934f52bb7
locate service: allow customisation
...
Fixes #2961
2014-06-24 12:54:16 +02:00
lethalman
6d006a9cca
Merge pull request #3005 from offlinehacker/nixos/logstash/enableWeb
...
nixos/logstash: add enableWeb option to enable kibana web interface
2014-06-24 12:42:26 +02:00