Thomas Tuegel
849647a3eb
environment: set paths for Qt plugins and QML
2015-01-26 20:59:49 -06:00
Domen Kožar
9df1bdefef
Merge pull request #5982 from robberer/pkgs/openldap
...
openldap: add dataDir, use cfg.user and cfg.group to run slapd
2015-01-26 10:33:57 +01:00
Domen Kožar
c1ce67561d
openldap: correct directory hint
2015-01-26 10:03:25 +01:00
Longrin Wischnewski
a4af32eec3
openldap: add dataDir, use cfg.user and cfg.group to run slapd
2015-01-26 09:35:56 +01:00
aszlig
eae32fb798
nixos/tests/chromium: Increase VM memory size.
...
Chromium is quite memory hungry and we frequently get random crashes in
the tests, so let's set it to 1024 MB because new releases of Chromium
most probably won't consume *less* memory.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-26 09:31:03 +01:00
aszlig
d110f5adf7
nixos/gitlab: Fix evaluation.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-26 08:20:14 +01:00
Jaka Hudoklin
6e7d708bcc
nixos/rabbitmq: fix module
2015-01-26 02:09:04 +01:00
Charles Strahan
61816b06e7
nixos: disable gitlab test for now
2015-01-25 16:29:37 -05:00
Charles Strahan
6eaa419920
gitlab: fix evaluation
2015-01-25 16:28:18 -05:00
Domen Kožar
2daba83828
openldap: add example config
2015-01-25 21:15:29 +01:00
aszlig
6308cba3fa
nixos/manual: Re-add development section.
...
I think this has been accidentally dropped by a099ca4
, at least there is
no reason stated, why it shouldn't be included, so I'm bringing it back.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-25 20:12:06 +01:00
Edward Tjörnhammar
6bbec634a7
Merge pull request #5850 from edwtjo/kodi-plugins
...
XBMC to Kodi migrations
2015-01-24 14:17:14 +01:00
Domen Kožar
cb7cd012df
Merge pull request #5593 from abbradar/modprobe-fix
...
modprobe: wrap all of kmod
2015-01-24 07:11:16 +01:00
Domen Kožar
fde45d217e
Merge pull request #5531 from abbradar/tlp
...
tlp: add package
2015-01-24 07:10:48 +01:00
Nikolay Amiantov
b7b3a0972d
nixos/tlp: add service
2015-01-24 02:56:21 +03:00
Eelco Dolstra
11a0344e13
Merge pull request #5918 from robberer/openntpd
...
openntpd: add extraConfig and extraOptions
2015-01-23 16:43:15 +01:00
Longrin Wischnewski
4fa5d1f626
openntpd: add extraConfig and extraOptions
2015-01-23 16:15:20 +01:00
aszlig
127c928c23
nixos/rename: Fix merging multiple destinations.
...
The renaming of options define the original value for the new attribute
path. This works well if there is only *one* target, but if there are
more, we end up recursing into the attribute set of the option
definition itself.
We now check for that within the parent recursion node (we can't check
that from the subnode, because we lack that information about whether
it's defined multiple times) and if the subnode consist entirely of a
list of definitions, we use mkMerge on it.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-22 14:08:28 +01:00
wmertens
8780caadd4
Merge pull request #5499 from wizeman/u/zfs-dont-fsck
...
nixos: When generating /etc/fstab, ZFS and NFS filesystems shouldn't be checked
2015-01-22 12:09:22 +01:00
Charles Strahan
8d49e87dec
Merge pull request #4677 from cstrahan/pleasant-ruby
...
Pleasant ruby
2015-01-21 23:27:38 -05:00
Matej Cotman
3ed3977166
owncloud: make .htaccess available
2015-01-21 22:49:22 +01:00
Matej Cotman
7494bd389e
apache-httpd: add owncloud
2015-01-21 22:49:22 +01:00
Matej Cotman
6630e3e4fe
apache-httpd: add restartSec option
2015-01-21 22:49:22 +01:00
Ricardo M. Correia
1b66077205
nixos: Don't do filesystem checks on ZFS or NFS filesystems
2015-01-21 17:39:53 +01:00
Eelco Dolstra
f637e27138
Fix release notes
2015-01-21 16:27:48 +01:00
Charles Strahan
dfc225d143
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/git-and-tools/default.nix
pkgs/applications/version-management/git-and-tools/hub/default.nix
pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Ricardo M. Correia
a11dc2f0a3
grsecurity: Add denyUSB
option to grsec NixOS module
...
The option had been added to the grsec build-support code,
but it hadn't been added to the grsec module.
After this commit, grsec module users will be able to change
the default value. It also serves to document that this option
exists and that NixOS will disable it by default.
2015-01-20 19:18:06 +01:00
Joachim Fasting
7023e03d77
firewall service: fix pingLimit example value
...
The example uses single dashes, whereas iptables requires double dashes.
2015-01-20 08:47:11 +01:00
Edward Tjörnhammar
5b1c9417a8
Add Kodi desktop-manager
2015-01-19 22:14:36 +01:00
lethalman
d957d9e6bc
Merge pull request #5517 from paraseba/bumblebee
...
Bumblebee config to enable multiple monitors
2015-01-19 15:00:11 +01:00
wmertens
d3383e4879
Merge pull request #4394 from wmertens/patch-6
...
setup-etc.pl: Fail when symlink/rename fails
2015-01-19 12:39:41 +01:00
lethalman
9cd9264ef3
Merge pull request #5849 from robberer/systemd/restartassert
...
systemd: extend checkUnitConfig with on-abnormal
2015-01-19 11:48:48 +01:00
Longrin Wischnewski
4b0100774a
systemd: extend checkUnitConfig with on-abnormal
2015-01-19 11:41:18 +01:00
Andrey Arapov
04be7262a6
nixos/dovecot: added configFile option and default Restart on-failure, PR #5845
...
Absolute path is required when one has such postfix configuration
where he/she needs to specify the actual (real) path to active dovecot
config.
Without this commit applied, the dovecot is running in such way:
/nix/store/hashAAA-dovecot-ver/sbin/dovecot -F -c /nix/store/hashBBB-dovecot2.conf
and postfix can't be aware of the value of "hashBBB" via services.postfix.extraConfig = '' ... '';
(it can only be aware of "hashAAA" with ${pkgs.dovecot} parameter)
Also enable Restart on-failure.
Edit: set RestartSec to 1s
2015-01-19 11:05:56 +01:00
William A. Kennington III
130f66b683
nixos/sync-server: Respect the enable option
2015-01-18 14:21:40 -08:00
Domen Kožar
3b174a4024
Merge pull request #5301 from nbp/syncserver
...
Add Firefox Sync service
2015-01-18 17:47:51 +01:00
Nicolas B. Pierron
8196727fad
Improve the documentation of the syncserver module.
2015-01-18 12:21:23 +01:00
Nicolas B. Pierron
0d13ea0131
Change default syncserver listen.port to a safer one.
2015-01-18 12:20:44 +01:00
Domen Kožar
b92a62165d
Merge pull request #5726 from spwhitt/zsh-command-not-found
...
command-not-found: Add ZSH Support
2015-01-17 18:15:35 +01:00
Damien Cassou
a7024cb4b4
Create a nixos module for cups-browsed
2015-01-16 14:10:57 +01:00
Eelco Dolstra
efa8fc2b0a
Paranoia
2015-01-15 18:37:55 +01:00
Eelco Dolstra
b9c4569b6b
nixos-install: Create /root with 700 permission
2015-01-15 18:37:55 +01:00
Eelco Dolstra
3ca275d7ba
NixOS containers: Create /root with 700 permission
...
Systemd-nspawn creates /root with 755 permission if it doesn't exist,
which is bad. So we have to create it ourselves before calling
systemd-nspawn.
2015-01-15 17:51:43 +01:00
Eelco Dolstra
24ce7ff3ea
test-instrumentation.nix: Prevent calling a pager
2015-01-15 14:39:29 +01:00
Edward Tjörnhammar
837cfbb9ea
nixos: adding nylon service with uid,gid
2015-01-14 22:08:47 +01:00
William A. Kennington III
8e5ef7da54
nixos/network-interfaces: Fix rstp support
2015-01-14 10:34:28 -08:00
Luca Bruno
804a958663
pam: add pam_wheel
2015-01-14 18:32:08 +01:00
Luca Bruno
2beb43174f
nixos-rebuild: use reload-or-restart for dbus. Closes #5767
...
Now that dbus reload has been moved before restarting units,
the reload may fail if dbus has been stopped before.
The reload-or-restart will reload dbus if it's active,
otherwise start it.
2015-01-14 16:08:47 +01:00
Rob Vermaas
df7923fa82
Merge pull request #5515 from oconnorr/master
...
GCE updates to ntp server and to fetch all ssh keys
2015-01-14 13:19:38 +01:00
Matej Cotman
4e6efec4b4
enlightenment: fix media preview
2015-01-13 14:56:35 +01:00