Luca Bruno
eac32cf697
Revert "Merge pull request #7032 from flosse/change-option-names"
...
This reverts commit c265aafb55
, reversing
changes made to c9bbf2228f
.
Breaks evaluation, see https://github.com/NixOS/nixpkgs/pull/7032#issuecomment-87641471
2015-03-30 13:45:07 +02:00
lethalman
c265aafb55
Merge pull request #7032 from flosse/change-option-names
...
nixos: prosody service - rename 'enabled' to 'enable'
2015-03-30 12:47:11 +02:00
William A. Kennington III
ca149f2be0
nixos/mysql: All versions of mysql have mysqld in /bin
2015-03-29 13:30:05 -07:00
Arseniy Seroka
a639c710ae
Merge pull request #6968 from oxij/unquestionably-good
...
Easy to check to be unquestionably good changes
2015-03-28 13:16:13 +03:00
Markus Kohlhase
47aa6725e2
nixos: prosody service - rename virtualHosts option 'enabled' to 'enable'
2015-03-27 21:36:05 +00:00
Jaka Hudoklin
d3c6d4175a
Merge pull request #6940 from offlinehacker/pkgs/ripple-data-api/add
...
Add ripple data api package and nixos service
2015-03-26 20:04:51 +01:00
Jaka Hudoklin
75169aabc3
Add ripple data api package and nixos service
2015-03-26 20:02:39 +01:00
Jan Malakhovski
5c6d86540b
nixos: use types.enum instead of ad-hoc check in sshd service
2015-03-26 12:43:42 +00:00
Jan Malakhovski
dc4fa2da8a
nixos: udev: build rules locally
2015-03-26 12:43:42 +00:00
Arseniy Seroka
ff22e19fc4
Merge pull request #6893 from hrdinka/nsd-config-options
...
nsd: Fix automatic config options
2015-03-23 13:19:29 +03:00
Jaka Hudoklin
491c8f82b2
Merge pull request #6917 from offlinehacker/rippled/module/awesome
...
rippled: expose more options, make compatible with new rippled version
2015-03-22 23:13:48 +01:00
Jaka Hudoklin
ad10db7617
Merge pull request #6882 from offlinehacker/nixos/fluentd
...
Add fluentd package and module
2015-03-21 22:37:48 +01:00
Jaka Hudoklin
916aab2927
Merge pull request #6875 from offlinehacker/nixos/cadvisor/fix
...
nixos/cadvisor: fixes
2015-03-21 22:36:11 +01:00
William Casarin
ea2baa8abf
spectrwm window manager
2015-03-21 11:02:44 -07:00
Jaka Hudoklin
4947bacd52
rippled: expose more options, make compatible with new rippled version
2015-03-21 12:52:06 +01:00
Edward Tjörnhammar
664592561d
nixos: added aiccu service
2015-03-20 22:01:35 +01:00
aszlig
ea2fd84ecd
nixos/mpd: Fix creation of "mpd" group.
...
The group is specified using a singleton list, so the loaOf merging is
done by iterating through the list items with imap, so it enumerates
every element and sets that as the default "name" attribute.
From lib/types:143:
name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";
So, people get groups like "unnamed-X.Y" instead of "mpd".
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
Tested-by: devhell <"^"@regexmail.net>
2015-03-20 20:58:13 +01:00
Jaka Hudoklin
89f41b90fa
Merge pull request #6874 from offlinehacker/pkgs/kubernetes/update
...
kubernetes: update to 0.12.1, fix module
2015-03-20 11:22:48 +01:00
Arseniy Seroka
9cfdeba324
Merge pull request #6611 from jagajaga/slurm
...
Slurm module
2015-03-19 21:06:49 +03:00
Christoph Hrdinka
d3a2edb8ce
nsd: Fix automatic config options
2015-03-19 12:10:55 +01:00
Jaka Hudoklin
1b99f0aeb6
Merge pull request #6873 from offlinehacker/pkgs/panamax/update
...
panamax: update, fix module
2015-03-19 09:18:48 +01:00
Arseniy Seroka
15f7afa6b4
Merge pull request #6885 from hrdinka/update-nsd
...
nsd: Update from 4.1.0 -> 4.1.1
2015-03-19 03:15:35 +03:00
Jaka Hudoklin
fca0aa7077
Add fluentd package and module
2015-03-18 21:18:47 +01:00
Rickard Nilsson
bdbdaee3c0
scollector module: Add extraOpts option
2015-03-18 21:16:31 +01:00
Christoph Hrdinka
6db8155e37
nsd: Update from 4.1.0 -> 4.1.1
2015-03-18 21:01:35 +01:00
Luca Bruno
cb45b7ec3e
Revert "nixos: Multiple service instances, apply to nginx. See #6784 "
...
This reverts commit 7ef59c4fe2
.
Wrong push! Sorry!
2015-03-18 14:09:24 +00:00
Luca Bruno
7ef59c4fe2
nixos: Multiple service instances, apply to nginx. See #6784
2015-03-18 14:07:29 +00:00
Jaka Hudoklin
2482b75eae
kubernetes: update to 0.12.1, fix module
2015-03-18 14:37:03 +01:00
Jaka Hudoklin
079520ced5
panamax: update, fix module
2015-03-18 14:35:24 +01:00
Jaka Hudoklin
536694bcd4
nixos/cadvisor: fixes
...
- run as non root user, because of docker
- run docker by default
2015-03-18 14:31:08 +01:00
lethalman
cdbeb7143c
Merge pull request #6832 from k0ral/icecast
...
Added icecast module
2015-03-17 16:43:02 +01:00
koral
54857abfc9
Added icecast module.
2015-03-17 14:21:57 +00:00
lethalman
c91ccb4b9c
Merge pull request #6842 from philandstuff/hash-owncloud-admin-password
...
owncloud: don't store plaintext adminPassword in nix store
2015-03-17 12:59:58 +01:00
lethalman
359bc60ec8
Merge pull request #6448 from eduarrrd/ddclient
...
ddclient module: fix module
2015-03-17 12:38:12 +01:00
Philip Potter
7ad6dac43b
owncloud: don't store plaintext adminPassword in nix store
...
Rather than using openssl to hash the password at build time, and hence
leaving the plaintext password world-readable in the nix store, we can
instead hash the password in the nix expression itself using
builtins.hashString.
2015-03-16 22:42:22 +00:00
Peter Simons
56bb114905
Merge pull request #6722 from joachifm/fix-id-mismatches
...
Fix id mismatches
2015-03-16 18:46:38 +01:00
Joachim Fasting
3518b761ba
TCSD: use tss user/group instead of nginx
...
For some reason TCSD is configured to use the nginx uid/gid.
Use the newly created tss uid/gid instead.
2015-03-16 09:58:16 +01:00
koral
9c4cbaa553
Fix mpd configuration (enclosing quotes needed).
2015-03-14 12:15:34 +00:00
lethalman
f72d1abb79
Merge pull request #5846 from arno01/nginx
...
nginx service improvements
2015-03-13 11:41:27 +01:00
Vladimír Čunát
208d1f24db
xfce: more update fallout
...
- forgotten mousepad update, including some wrapping magic
- dealing with panel plugins (either fix or mark as broken)
CC maintainer @AndersonTorres.
- remove some libxfcegui4 occurrences, as it's being phased out
- minor stuff
2015-03-12 23:02:15 +01:00
Kirill Elagin
356810b178
cupsd: rename cupsd.service
to cups.service
2015-03-12 09:00:56 +03:00
Thomas Tuegel
61cf7e1265
Merge branch 'kde5'
2015-03-11 11:49:45 -05:00
Thomas Tuegel
f370af91ad
kde5: use ksshaskpass for SSH_ASKPASS
2015-03-11 11:49:29 -05:00
Thomas Tuegel
5b5b7aa951
kde5: add kde-workspace and kde-runtime to systemPackages
2015-03-11 11:49:28 -05:00
lethalman
fe79bf34a5
Merge pull request #6512 from bjornfor/nixos-haproxy-cleanup
...
nixos/haproxy: remove broken default 'config'
2015-03-11 16:29:06 +01:00
lethalman
c8ac069772
Merge pull request #6724 from anderspapitto/local
...
Add x11 service for unclutter
2015-03-11 15:32:40 +01:00
Arseniy Seroka
ef37154c82
Merge pull request #6739 from joachifm/refactor-tarsnap-service
...
nixos: refactor tarsnap backup service module
2015-03-11 11:22:32 +03:00
Arseniy Seroka
1c58c3a772
Merge pull request #6345 from puffnfresh/feature/mtrack-options
...
Add more options to multitouch (mtrack) module
2015-03-11 11:10:51 +03:00
William A. Kennington III
26020cfe8a
nixos/lightdm: Add a background option
2015-03-10 15:57:46 -07:00
William A. Kennington III
e519414e1f
nixos/lightdm: Fix data directory
2015-03-10 14:55:54 -07:00