Peter Simons
a9c53037fa
Merge remote-tracking branch 'origin/master' into staging.
2014-11-02 16:15:53 +01:00
Peter Simons
415f41bf68
nixos/modules/services/monitoring/graphite.nix: strip trailing whitespace
2014-11-02 12:40:00 +01:00
Peter Simons
96a7e65c37
nixos/modules/services/monitoring/graphite.nix: don't create graphite user unconditionally
...
I'm not sure what exactly this user is needed for, i.e. under what circumstances
it must exist or not, but creating it unconditionally seems like the wrong thing
to do. I complained to @offlinehacker about this on Github, but got no response
for a week or so. I'm disabling the extraUsers bit to put out the fire, and now
hope that someone who actually knows about Graphite implements a proper solution
later.
2014-11-02 12:34:16 +01:00
Nikolay Amiantov
5423f62373
gitolite: add dataDir
2014-11-02 02:24:41 +03:00
lethalman
f079cd1721
Merge pull request #4750 from abbradar/nix-maxcores
...
Add buildCores option to nix
2014-11-01 22:01:39 +01:00
Nikolay Amiantov
e8dace201f
nix-daemon: add maxCores option
2014-11-01 23:58:21 +03:00
William A. Kennington III
ba53392bce
nixos/nat: Fix override so that sysctls are properly preserved
2014-10-31 16:50:25 -07:00
Peter Simons
b11060d8db
Merge remote-tracking branch 'origin/master' into staging.
2014-10-31 11:14:24 +01:00
Peter Simons
e18e77fbcd
Merge pull request #4746 from abbradar/synaptics-fingers
...
Add "fingersMap" option to Synaptics
2014-10-31 11:06:58 +01:00
Nikolay Amiantov
118096fc0b
synaptics: add fingersMap option
2014-10-31 12:45:54 +03:00
Nikolay Amiantov
0eb86647b3
synaptics: add types to options
2014-10-31 12:45:54 +03:00
Aristid Breitkreuz
93f2c180d0
rsnapshot: add git version & make it configurable in the nixos module
2014-10-27 20:38:39 +01:00
Kirill Elagin
0c6d49da7d
xsession: Start the right pulseaudio binary
...
Fixes #4663 .
2014-10-27 15:43:19 +03:00
Rickard Nilsson
e2ada42623
syslog-ng: Update from 3.5.6 to 3.6.1
...
Also update the NixOS module, syslog-ng now automatically listens to
the systemd journal, so we don't have to set up syslog.socket.
2014-10-27 12:22:22 +01:00
lethalman
40b5aa1d33
Merge pull request #4506 from cstrahan/logstash-config
...
logstash service: make log verbosity configurable.
2014-10-26 20:10:03 +01:00
Aristid Breitkreuz
dabdab8dce
Merge pull request #4640 from lethalman/installer-icons
...
kde installer: Add gparted, nixos manual and konsole in the desktop
2014-10-25 16:32:56 +02:00
Eelco Dolstra
f4be4f5e54
Merge remote-tracking branch 'origin/master' into staging
2014-10-24 12:24:13 +02:00
Luca Bruno
9e1ab43459
gnome3: Add cantarell fonts. Closes #4633
2014-10-24 11:50:47 +02:00
Luca Bruno
e553e27f48
kde installer: Add gparted, nixos manual and konsole in the desktop
2014-10-23 18:59:25 +02:00
Vladimír Čunát
2cf17b0802
Merge recent master into staging
...
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Domen Kožar
3b133beb7a
Merge pull request #4553 from ehmry/polipo
...
drop permission prestart from polipo service module
2014-10-23 12:51:36 +02:00
Thomas Tuegel
da77d9f409
Merge pull request #4614 from geerds/kde4-plasma-nm
...
kde4: Use plasma-nm instead of knetworkmanager
2014-10-22 20:28:36 -05:00
Jascha Geerds
83ae3042a7
kde4: Use plasma-nm instead of knetworkmanager
2014-10-22 13:27:19 +02:00
Emery Hemingway
a3338abcfe
cjdns: add peer hostnames to extraHosts, option for external config
2014-10-21 13:16:04 -04:00
Georges Dubus
50be0d5447
Removed the kde4_next nixos module
...
Merged its differences into kde4. This commit fixes #4519 .
2014-10-21 14:04:28 +02:00
Jaka Hudoklin
594f354bc7
nixos/graphite: fix grahite api documentation url
2014-10-20 13:32:58 +02:00
Jaka Hudoklin
09c8d909fb
nixos/graphite: update docs, add graphite pager
2014-10-20 13:27:21 +02:00
Eelco Dolstra
a3b873924b
Let the kernel load firmware directly
...
Loading firmware via udevd is obsolete. Fixes #4552 .
2014-10-20 13:25:00 +02:00
Vladimír Čunát
359dd3b8ac
nixos: fix two pipefail problems
...
It failed since 3c6efec2c0
, i.e. #4453 .
Now it should "work" the same as before.
2014-10-19 19:29:28 +02:00
Jaka Hudoklin
988ed87e70
nixos/neo4j: add package option
2014-10-18 13:18:37 +02:00
Emery Hemingway
32d6ae7ed9
drop permission prestart from polipo service module
...
chowning the cache directory can timeout the service, permissions
on this directory should never change without user intervention
2014-10-16 10:57:16 -04:00
Eelco Dolstra
09dc132e04
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Rickard Nilsson
135d677690
nixos/logrotate: Fix spelling mistake
2014-10-16 08:20:43 +02:00
Rickard Nilsson
cdba59d0f2
nixos/syslog-ng: Add option configHeader
2014-10-16 08:14:45 +02:00
Rickard Nilsson
2ffe274486
nixos/logrotate: Specify type for config option
2014-10-15 16:52:50 +02:00
Domen Kožar
bc015be0f3
fix eval
2014-10-15 12:00:20 +02:00
Lluís Batlle i Rossell
f594033822
nixos nfs: allow setting the lockd ports.
...
This helps in setting a fixed firewall open port for NFS lockd.
Based on:
http://rlworkman.net/howtos/NFS_Firewall_HOWTO
(cherry picked from commit b32ca0616ff70795f71995fa79ea508b82f30b3a)
Conflicts:
nixos/modules/services/network-filesystems/nfsd.nix
2014-10-15 10:59:33 +02:00
Joachim Schiele
13298fcbb9
Merge pull request #4535 from flosse/lua-bitop
...
lua-packages: added lua-bitop to add websocket support for prosody
2014-10-15 09:41:32 +02:00
Markus Kohlhase
5308d3284b
prosody: added websocket support
2014-10-15 03:57:00 +02:00
Rickard Nilsson
54a0ac090c
nixos/syslog-ng: Replace option serviceName with listenToJournal. Fix socket activation
2014-10-14 15:38:42 +02:00
Mateusz Kowalczyk
b9c2fe5fd8
Merge pull request #4400 from matejc/seeksservice
...
seeks: update and write nixos module
2014-10-13 21:37:11 +01:00
Charles Strahan
dc2fac7c0c
logstash service: make log verbosity configurable.
2014-10-13 15:48:41 -04:00
Michael Raskin
2ef0a17561
Merge pull request #4387 from 1126/refactor-stumpwm
...
stumpwm: update and refactoring
2014-10-13 17:50:46 +04:00
Matej Cotman
561d3b3860
seeks: nixos module
2014-10-13 13:10:49 +02:00
Jaka Hudoklin
dd0758ab6b
Merge pull request #4392 from cstrahan/logstash
...
logstash service improvements
2014-10-12 23:02:52 +02:00
Joachim Schiele
df95acd13c
Merge pull request #3960 from flosse/prosody-service
...
Prosody service
2014-10-11 23:10:05 +02:00
Markus Kohlhase
d86c2c30c5
prosody: packaged as a service
...
Conflicts:
nixos/modules/misc/ids.nix
2014-10-11 18:53:43 +02:00
Domen Kožar
1992bd1331
Merge pull request #4409 from iElectric/redmine
...
Add Redmine package and NixOS Service
2014-10-07 13:41:46 +02:00
Shea Levy
3432414808
Merge branch 'nixos-cronfiles' of git://github.com/rickynils/nixpkgs
...
nixos: Add option services.cron.cronFiles
2014-10-07 05:59:03 -04:00
Domen Kožar
b4a335cd59
nixos: add redmine service
2014-10-07 10:55:50 +02:00