Luca Bruno
83221f3886
Merge branch 'master' into staging
...
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Pascal Wittmann
d6e87f1749
Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
2014-11-08 15:25:40 +01:00
Aristid Breitkreuz
cf4a976ced
quassel: make a proper systemd unit (also properly works in containers now)
2014-11-08 14:59:25 +01:00
Nikolay Amiantov
46b866cf63
nixos/git-daemon: fix 'exportAll' option
2014-11-07 15:50:01 +03:00
Nikolay Amiantov
af1d09879b
nixos/git-daemon: add 'user' and 'group' options
2014-11-07 15:49:45 +03:00
Nikolay Amiantov
4b2e43865a
nixos/git-daemon: add types
2014-11-07 15:49:03 +03:00
Rickard Nilsson
71f64ded06
Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""
...
This reverts commit 8e1072fd60
.
2014-11-06 21:59:04 +01:00
Rickard Nilsson
2b3c3d0e32
Fixes to Apache 2.4 configuration
2014-11-06 21:58:40 +01:00
Eelco Dolstra
b3eb981a95
apache-httpd: Make 2.4 the default
...
The NixOS 14.11 release is a good time to finally make 2.4 the
default.
2014-11-06 14:55:44 +01:00
Evgeny Egorochkin
85d23f5292
thermald needs dbus config files to run
2014-11-06 15:19:33 +02:00
Vladimír Čunát
52404a868d
Merge recent master into staging
...
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
Conflicts:
nixos/tests/gnome3_10.nix (auto-solved)
pkgs/applications/video/aegisub/default.nix
pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Jaka Hudoklin
d232390d5d
nixos/graphite: fix user creation
2014-11-04 19:38:24 +01:00
Ricardo M. Correia
98a59df81f
nixos/transmission: Start after local-fs.target
2014-11-04 18:40:13 +01:00
Nikolay Amiantov
5f84c785ff
synaptics: fix tapButtons setting
2014-11-04 06:20:10 +03:00
lethalman
636a4c00ca
Merge pull request #4801 from robberer/pkgs/zabbix-server
...
zabbix-server: add extraConfig option
2014-11-04 00:32:46 +01:00
Longrin Wischnewski
ce8e1a278b
zabbix-server: add extraConfig option
...
add types to options
2014-11-03 16:47:07 +01:00
William A. Kennington III
8e1072fd60
Revert "syslog-ng: Update from 3.5.6 to 3.6.1"
...
This reverts commit e2ada42623
.
2014-11-02 17:22:28 -08:00
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
Eelco Dolstra
a85dcf4a00
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/libav/default.nix
pkgs/shells/bash/bash-4.2-patches.nix
pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Charles Strahan
fc7098abf7
logstash service improvements
...
* add logstash-contrib plugins package
* add additional options to the logstash service
2014-10-05 21:53:05 -04:00
Bjørn Forsman
fca51849ec
nixos/lighttpd: add services.lighttpd.enableModules option
...
This option makes the coupling between lighttpd and its sub-services
more "loose".
While the option is a list, its purpose is to provide a "set" of needed
modules to load for lighttpd to function correctly with its config. The
NixOS lighttpd module ensures that lighttpd modules are loaded no more
than once (because lighttpd dislikes that), and in the correct order.
Also add an assertion that all modules listed in .enableModules are
valid.
2014-10-05 19:15:19 +02:00
Vladimír Čunát
e4436ad841
FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf
...
Any reasonably new version of fontconfig does search that path by default,
and setting this globally causes problems, as 2.10 and 2.11 need
incompatible configs.
Tested: slim+xfce desktop, chrootenv-ed steam.
I have no idea why we were setting the global variable;
e.g., neither Fedora nor Ubuntu does that.
2014-10-05 17:05:27 +02:00
_1126
7536d41287
stumpwm: update and refactoring
...
This commit updates the stumpwm to version 0.9.8. Futhermore, it
refactors the expression quite a lot:
* stumpwm has been moved from lisp modules to window-managers.
* stumpwm has been added to the window managers NixOS knows about, this
enables the user to add stumpwm as a default window manager in his
NixOS configuration like with Xmonad or i3.
* the package has been split into stumpwm and stumpwmContrib. This is
due to the fact that development of stumpwm and its extension modules
has been split into two repositories. As of today, the release is the
last one before this split. This split into two packages only reflect
those upcoming upstream changes already.
It is planned to make the addition of the extension modules voluntarily,
like with Xmonads option "enableContribAndExtras". Furthermore it might
be possible to add an option to compile stumpwm with clisp instead of
sbcl.
2014-10-05 14:50:08 +02:00
Eelco Dolstra
97220c973f
Replace hasAttr/getAttr calls with the ? and . operators
...
For NixOS evaluation, this gives a ~21% reduction in the number of
values allocated and a ~4% speedup. It's also more readable.
2014-10-05 01:11:06 +02:00
Austin Seipp
8cc3460a87
Merge pull request #4294 from daogames/tb/psql-port-fix
...
postgresql: use configured port when invoking psql
2014-10-01 18:56:39 -05:00
Rickard Nilsson
57721a2888
nixos: Add option services.cron.cronFiles
...
This allows you to configure extra files that should be appended to your
crontab. Implemented by writing to /etc/crontab when the cron service starts.
Would be nicer to use a cron that supports /etc/cron.d but that would require
us to patch vixie-cron.
2014-10-01 17:33:38 +02:00
Shea Levy
f5aaefbb6c
More pkgs.lib -> lib fixes
2014-09-29 09:45:59 -04:00
Vladimír Čunát
4bcae6dc96
merge #4265 : add KDE 4.14.1
2014-09-27 18:15:00 +02:00
Tino Breddin
eb7bbb4862
postgresql: use configured port when invoking psql
2014-09-27 14:37:11 +02:00
Jaka Hudoklin
ff8f23ab26
Merge pull request #4280 from wkennington/master.consul
...
nixos/consul: Add module
2014-09-27 07:00:39 +02:00
Attila Sztupak
90a326eecd
crashplan: nixos module for backup service
2014-09-26 15:33:36 +01:00
William A. Kennington III
36f9b9c284
nixos/consul: Add module
2014-09-26 03:25:14 -07:00
Matej Cotman
5e18182a30
mailpile: add module
2014-09-26 10:49:09 +02:00
ambrop7@gmail.com
bea503ec36
kde: Allow kde_next as a desktop environment
...
This is the same as
93fda9e353
2014-09-24 23:50:23 +02:00
Bjørn Forsman
3ebe3df4d0
nixos/samba: add services.samba.configText option
...
The .configText option is for providing verbatim content of smb.conf.
I'm adding this because I cannot seem to find any other way to override
(with mkForce) the generated smb.conf with the current samba module. All
attempts ends with errors ("duplicate entry samba/smb.conf").
2014-09-24 18:31:20 +02:00
Bjørn Forsman
753d9d4e4f
nixos/samba: remove services.samba.defaultShare option
...
It's not that difficult to define shares using standard samba config
file syntax, so why do we need the semi-configurable .defaultShare
option?
Also:
* It uses /home/smbd and I think /home should be reserved
for real human users.
* If enabled, it breaks the assumption that .extraConfig continues in
the [global] section.
Without .defaultShare there is no need for the "smbguest" user and group
either, mark them as unused.
2014-09-24 18:31:20 +02:00
Emery Hemingway
61f0d9b251
cjdns: update from 20140919 20140922
...
package installs to .../bin
fix service module to look in .../bin
Closes #4240
2014-09-23 22:30:53 +01:00
Luca Bruno
8ef7b83ca7
Fix nixos-rebuild evaluation
2014-09-23 14:01:25 +02:00
Mateusz Kowalczyk
cd5f4e7f85
Merge pull request #4211 from ehmry/cpuminer-cryptonight
...
Cpuminer cryptonight
2014-09-22 19:26:35 +01:00
Emery Hemingway
c8109488b3
cpuminer-cryptonight: new service module
2014-09-22 13:37:47 -04:00
Mateusz Kowalczyk
1ffe41b34f
Merge branch 'dev/ati-drivers' of https://github.com/nathanielbaxter/nixpkgs
2014-09-22 01:27:00 +01:00
AndersonTorres
9c25f350a8
Ratpoison: updated for 1.4.8
...
Also, adding the infamous service file
Closes #4192
2014-09-21 20:05:12 +01:00
Mateusz Kowalczyk
7fedb1baa6
Try fixing #4084
2014-09-21 07:04:01 +01:00
Dmitry Malikov
08cc8da65a
mpd service: add network.{host,port} options
...
Closes #4084
2014-09-21 01:43:06 +01:00
Ronny Esterluss
473ffd9eae
extended gitolite service to take custom hooks
...
Closes #4160
2014-09-21 00:08:40 +01:00
AndersonTorres
90fcd66599
AfterStep (version 2.2.12): New Package
...
AfterStep is a beautiful window manager, inspired by NEXTStep interface
Closes #4177
2014-09-21 00:03:44 +01:00
AndersonTorres
c6f28f988c
Windowmaker: adding system service file, and a long description
...
Closes #4066
2014-09-20 23:36:07 +01:00
Domen Kožar
2247f3a8d3
Merge pull request #4168 from lostdj/ltp/master/btsyncfix
...
bittorrentsync: fix storage_path
2014-09-20 10:53:57 +02:00
lostdj
f02d4ec9ed
bittorrentsync: fix storage_path.
...
If this path is a symlink, btsync won't be able to read it if it's not ending with "/".
2014-09-19 18:19:04 +04:00
Eelco Dolstra
91ec6e0d90
Merge remote-tracking branch 'origin/master' into staging
2014-09-18 22:28:35 +02:00
William A. Kennington III
ae195727b7
nixos/nat: Don't flush tables, create subchains for autogenerated rules
2014-09-18 11:28:58 -07:00
Eelco Dolstra
0de982d75b
httpd: Add option for specifying robots.txt
2014-09-18 19:05:26 +02:00
Eelco Dolstra
837a0c05e5
httpd: Don't emit robots.txt if there are no robots entries
2014-09-18 18:48:28 +02:00
Eelco Dolstra
ec4f38c56f
Manual: Remove some option defaults that refer to store paths
...
Option defaults should not refer to store paths, because they cause
the manual to be rebuilt gratuitously. It's especially bad to refer to
a highly variable path like a computed configuration file.
2014-09-18 16:21:26 +02:00
Rickard Nilsson
8fc777ffd6
syslog-ng module: Add package option
2014-09-17 19:48:51 +02:00
Jaka Hudoklin
9c3c7a75d3
collectd: add pidFile option, change default pid to /var/run/collectd.pid
2014-09-17 19:21:05 +02:00
Jaka Hudoklin
1cdb6cfb00
nixos/graphite: add package option to graphiteApi
2014-09-17 18:33:51 +02:00
Jaka Hudoklin
75aaeca9d2
nixos/graphite: add seyren service, graphite alerting dashboard
2014-09-17 18:33:50 +02:00
Jaka Hudoklin
c396ee9912
nixos: add collectd module
2014-09-17 18:33:50 +02:00
William A. Kennington III
ec9c4143a7
nixos/firewall: Cleanup in case reload fails
2014-09-16 15:51:57 -07:00
lethalman
3224b32e64
Merge pull request #4101 from ts468/e19
...
Add package: Enlightenment E19!!!!
2014-09-16 16:13:56 +02:00
Jaka Hudoklin
9bd66b24d9
nixos/graphiteApi: add example config for influxdb backend
2014-09-16 10:41:56 +02:00
Jaka Hudoklin
996da030b6
nixos/mongodb: service fixes
...
- Log to syslog, so journal picks-up logs
- Start as foring service, so systemd will wait for service to start
- Add extraConfig option
2014-09-16 10:28:04 +02:00
Jaka Hudoklin
271e0f7488
nixos/graphite: add host and port options for graphiteApi
2014-09-16 10:28:04 +02:00
William A. Kennington III
1321fd175d
nixos/nat: Leverage firewall module
2014-09-15 21:31:27 -07:00
William A. Kennington III
6a43d51291
nixos/firewall: Support extraStopCommands
2014-09-15 21:31:26 -07:00
William A. Kennington III
43c2bc0f8c
Merge pull request #4108 from wkennington/master.firewall
...
Firewall: Don't allow traffic during nixos-switch / reload
2014-09-15 20:42:40 -07:00
William A. Kennington III
fd7b9b4291
nixos/firewall: Don't allow traffic during reload
2014-09-15 20:40:16 -07:00
Thomas Strobel
1613d6cca6
Add package: Enlightenment E19!
...
Wayland desktop shell is not enabled, yet.
2014-09-15 23:34:28 +02:00
Michael Raskin
d05684be21
Merge pull request #3694 from matejc/cmst
...
new package: cmst - qt gui for connman
2014-09-15 23:12:01 +04:00
Vladimír Čunát
d957b4bd78
Merge recent master into staging
...
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
Jaka Hudoklin
d6f9878fbf
nixos/elasticsearch: wait for start
2014-09-13 02:21:31 +02:00
Jaka Hudoklin
f7ba3d833f
nixos/znc: fix module, createUser option does not exist anymore
2014-09-13 02:20:32 +02:00
Jaka Hudoklin
74122464da
nixos/influxdb: wait for start
2014-09-13 02:19:39 +02:00
Jaka Hudoklin
26fd945151
nixos/rabbitmq: wait for start
2014-09-13 02:16:53 +02:00
Jaka Hudoklin
a23e4997d3
Merge pull request #4034 from offlinehacker/graphiteApi
...
nixos: add graphite api to graphite functionality
2014-09-13 00:05:36 +00:00
Bjørn Forsman
ec59929c9f
nixos/jekins: add services.jenkins.extraGroups option
...
This makes it easy to give jenkins extra privileges by adding group
memberships. Use with care :-)
2014-09-12 15:25:15 +02:00
Matej Cotman
99a46a0eca
set network manager as default true
2014-09-12 13:52:26 +02:00
William A. Kennington III
bab5efd237
nixos/ssh: Allow user to configure the package that provides ssh/sshd
2014-09-11 22:07:39 -07:00
Bjørn Forsman
a44de69d06
nixos/tomcat: make package version configurable
2014-09-11 22:32:16 +02:00
Jaka Hudoklin
bc6b180d90
nixos/statsd: add support for external backends, fix a few options
2014-09-11 18:11:16 +02:00
Jaka Hudoklin
19ea435cf8
nixos: add graphite api to graphite functionality
2014-09-11 18:09:40 +02:00
Luca Bruno
ac724e7bbc
Added TORQUE package and nixos module
...
Resource management system for submitting and controlling
jobs on supercomputers, clusters, and grids
http://www.adaptivecomputing.com/products/open-source/torque
2014-09-09 18:24:46 +02:00
Bjørn Forsman
e84b0c94f0
nixos/jekins: rename option services.jenkins.{extraOpts => extraOptions}
...
I noticed "extraOptions" is infinitely more used than "extraOpts" in
NixOS.
2014-09-09 17:40:53 +02:00
Bjørn Forsman
cb614ef4ad
nixos/jenkins: remove use of types.string (it's deprecated)
2014-09-09 17:36:25 +02:00
Bjørn Forsman
cf7b782ea9
nixos/jenkins: add services.jenkins.extraOpts option
...
Allows passing extra command line arguments to Jenkins.
2014-09-09 17:36:25 +02:00
Luca Bruno
e4e39f26ba
Change default from gnome 3.10 to gnome 3.12
2014-09-08 18:35:45 +02:00
Eelco Dolstra
152ae27aac
Merge remote-tracking branch 'origin/systemd-216' into staging
2014-09-08 13:53:33 +02:00
Igor Pashev
5c6e4e7433
Updated Mediawiki to 1.23.3
...
Removed mediawiki-postgresql-fixes.patch (fixed upstream)
2014-09-07 17:50:51 +02:00
Nathaniel Baxter
c16874c4c0
ati_unfree: Create a nixos module for the ati_unfree x11 driver and
...
blacklist the radeon driver when ati_unfree is installed.
2014-09-07 12:40:32 +10:00
Aristid Breitkreuz
c3fe942a57
start dhcpcd after network-interfaces
2014-09-06 13:52:09 +02:00
Aristid Breitkreuz
958c1c68c2
Merge pull request #3977 from manveru/diod
...
diod: fix service
2014-09-06 12:31:00 +02:00
Bjørn Forsman
db86b03b1c
nixos/apcupsd: add systemd documentation hint
...
systemctl has the ability to display a list of documentation URLs in the
output of "systemctl status <service-name>".
2014-09-06 00:14:42 +02:00
Bjørn Forsman
b7a889759d
nixos/fail2ban: don't use types.string (it's deprecated)
...
I'm not really sure which one of types.lines or types.str that fit
better, but I'm going for types.lines because it behaves more like the
current type (i.e. have the ability to merge).
2014-09-05 22:56:30 +02:00
Eelco Dolstra
59edfd61ad
Increase systemd timeout on Jenkins and Munin tests
...
These were timing out a lot.
http://hydra.nixos.org/build/13991108
http://hydra.nixos.org/build/13991107
2014-09-05 15:50:55 +02:00
Eelco Dolstra
b0855d59a1
Improve option descriptions a bit
2014-09-05 15:28:24 +02:00
Michael Fellinger
00887dc3f8
diod: fix service
2014-09-05 14:39:55 +02:00
aszlig
e8c4fde22d
nixos/nsd: Improve support for journald/systemd.
...
Don't fork into the background and just log to stderr.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-05 02:54:39 +02:00
aszlig
6386df1645
nixos/nsd: Fix indentation/coding style.
...
For Nix, we indent using two spaces, but in this module somehow 4 spaces
were snuck in. Other than that, remoteControl and ratelimit are just
nested attribute sets, so we don't need to make another submodule type
for no particular reason.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-05 02:54:39 +02:00
Michael Raskin
a3b9bf6c87
Merge pull request #3653 from iyzsong/nixos/xfce4-mixer
...
nixos: don't set variables for gstreamer-0.10 (fix #3652 )
2014-09-04 20:54:57 +04:00
Luca Bruno
2ba523df24
nixos nat: add description to forwardPorts
2014-09-04 11:33:08 +02:00
Luca Bruno
e6ab680cbf
nixos nat: add type for sourcePort and destination of forwardPorts
2014-09-04 10:26:33 +02:00
Michael Raskin
4155121069
Merge pull request #3926 from lethalman/fwdports
...
nixos/nat: add forwardPorts for external->internal DNAT
2014-09-03 21:54:37 +04:00
Nathan Bijnens
00ad134284
Mesos: services
2014-09-03 19:21:49 +02:00
Michael Raskin
3e841ef642
Fixing comment case
2014-09-03 20:03:15 +04:00
Michael Raskin
94a131b95a
Fix forgotten unit entry
2014-09-03 15:47:53 +04:00
Strahinja Popovic
fe3f7716f0
Enabled access to binaries of needed tools, and worker daemons can be enabled for phabricator #3306
2014-09-03 15:46:59 +04:00
Sergey Mironov
2b72edad9b
yandex-disk: fix the url; introduce systemd.service #2228
2014-09-03 12:36:29 +04:00
Michael Raskin
d1ae15b680
Merge pull request #3804 from ehmry/unbound
...
unbound: run in chroot
2014-09-03 11:45:20 +04:00
Nathan Bijnens
33a3f76ee4
Copy.com: client #3617
2014-09-03 11:31:51 +04:00
Michael Raskin
8e968b18e4
Merge pull request #2952 from edwtjo/cups-syswide-clientconf
...
CUPS system wide client side remote printing.
2014-09-03 10:51:49 +04:00
Michael Raskin
a82c623c26
Merge pull request #3940 from wkennington/master.dnsmasq
...
nixos/dnsmasq: Fix regressions during the systemd update
2014-09-03 10:06:26 +04:00
Michael Fellinger
e805c78ed3
diod: remove redundant default doc
2014-09-03 02:55:00 +02:00
Michael Fellinger
0bf05a02f4
diod: add systemd service and config
2014-09-03 02:30:04 +02:00
William A. Kennington III
9659d0f4fb
nixos/dnsmasq: Fix regressions during the systemd update
2014-09-02 17:23:55 -07:00
Eelco Dolstra
3d821c068a
Merge remote-tracking branch 'origin/master' into systemd-216
2014-09-02 14:43:27 +02:00
lethalman
a3e91bbfa3
Merge pull request #3901 from vlstill/ssh_ip
...
Allow binding sshd to specified addresses.
2014-09-02 10:38:16 +02:00
Vladimir Still
13bbce96c3
sshd: Fix typo in assetion.
2014-09-02 10:06:04 +02:00
Michael Raskin
3ad91106f1
Merge pull request #3704 from sfultong/upstream-master
...
tomcat: update to upstream master
2014-09-02 02:09:18 +04:00
Michael Raskin
2a1a814e53
Make console-getty only used inside container by default
2014-09-02 01:36:10 +04:00
Michael Raskin
d140851472
Merge pull request #3779 from offlinehacker/docker
...
full nixos inside docker
2014-09-02 01:04:05 +04:00
Vladimir Still
a2394f09c7
sshd: Add note about listening on port 22 to listenAddresses.
2014-09-01 22:56:35 +02:00
Vladimir Still
ac39d839c3
sshd: Add note about firewall and listenAddresses.
2014-09-01 22:56:35 +02:00
Vladimir Still
e12337156c
sshd: Allow to specify ListenAddress.
2014-09-01 22:56:35 +02:00
Michael Raskin
5bbeba3d97
Merge pull request #3911 from vlstill/nfs-port_pullreq
...
nfsd: Make it possible to fix rpc.{mountd,statd,lockd} ports.
2014-09-02 00:53:52 +04:00
Michael Raskin
a6dfb4dc28
Merge pull request #3241 from ehmry/cjdns
...
cjdns declarative configuration
2014-09-02 00:53:18 +04:00
Michael Raskin
8c167b22a5
Merge pull request #3918 from robberer/pkgs/clamav
...
clamav: update to version 0.98.4 and run freshclam in daemon mode
2014-09-02 00:46:25 +04:00
Luca Bruno
b21ac60290
nixos/nat: add forwardPorts for external->internal DNAT
2014-09-01 22:31:56 +02:00
Luca Bruno
31b7cae018
nixos/znc: fix immutable config.
...
Fix references to coreutils echo and rm.
Make config writable even if immutable because of
https://github.com/znc/znc/blob/master/src/znc.cpp#L964 .
2014-09-01 16:21:12 +02:00
aszlig
29f4642284
nixos: Add new service for OpenNTPd.
...
This conflicts with the existing reference NTP daemon, so we're using
services.ntp.enable = mkForce false here to make sure both services
aren't enabled in par.
I was already trying to merge the module with services.ntp, but it would
have been quite a mess with a bunch of conditions on the package name.
They both have a bit in common if it comes to the configuration files,
but differ in handling of the state dir (for example, OpenNTPd doesn't
allow it to be owned by anything other than root).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-01 16:07:28 +02:00
Longrin Wischnewski
28fd7ea190
clamav: run freshclam in daemon mode
2014-09-01 09:41:19 +02:00
Emery Hemingway
f5b4eacad6
uhub: initial service expression
2014-09-01 10:53:19 +04:00
Michael Raskin
9e3d1b1a8f
Merge pull request #3908 from wkennington/master.ip
...
Reapply the multi-ip code
2014-09-01 10:28:54 +04:00
Jan Malakhovski
8c9b6d932a
nixos: add dhcpcd.persistent option
2014-09-01 10:33:48 +04:00
Jan Malakhovski
99243a5c51
nixos: add atftpd service
2014-09-01 10:33:48 +04:00
Emery Hemingway
f60ac82cac
cjdns: new declarative service expression
...
systemd service wants network-interfaces.target rather than network.target
assertion on config.networking.enableIPv6
2014-08-31 18:14:16 -04:00
Vladimir Still
a735c308b6
nfsd: Make it possible to fix rpc.{mountd,statd,lockd} ports.
2014-08-31 22:00:16 +02:00
William A. Kennington III
3d037ebb94
Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6""
...
This reverts commit ea8910652f
.
2014-08-31 09:46:16 -07:00
Rob Vermaas
ea8910652f
Revert "Merge pull request #3182 from wkennington/master.ipv6"
...
This reverts commit b23fd65854
, reversing
changes made to 43654cba2c
.
2014-08-31 10:58:54 +02:00
Suvash Thapaliya
9073a30cee
Add extraConfig
option for SLiM
...
so that various configuration options can be set without having to
expose every single configurable parameter
2014-08-31 03:21:37 +02:00
Nicolas B. Pierron
a5d6219897
Merge pull request #3864 from nbp/useless-submodules
...
Remove useless use of undocumented submodules.
2014-08-30 18:21:17 +02:00
William A. Kennington III
4d8390be60
nixos/network-interfaces: Support the old ip configuration convention
2014-08-30 08:05:00 -07:00
William A. Kennington III
098c8f4c77
nixos/network-interfaces: Add support for multiple ipv4 / ipv6 addresses
2014-08-30 07:33:38 -07:00
Michael Raskin
8937b70d07
Merge pull request #3344 from ehmry/privoxy
...
privoxy: upstart to systemd conversion, actions file editing
2014-08-30 14:19:57 +04:00
Nicolas Pierron
8c19690d99
Remove useless use of optionSet.
2014-08-29 18:43:03 +02:00
Nicolas Pierron
43e52ef001
Remove useless use of undocumented submodules.
2014-08-29 18:28:34 +02:00
Igor Pashev
019bc6bb2b
Made Mediawiki rewrite rules work for virtual hosts
...
Related to cdd1785cd6
2014-08-29 13:56:23 +02:00
Michael Raskin
844fd2553e
Merge pull request #3745 from wkennington/master.dnsmasq
...
dnsmasq: Update and enable dbus support
2014-08-29 01:43:41 +04:00
Michael Raskin
c42e7dfc0c
Merge pull request #3200 from wkennington/master.dhcpcd
...
nixos/dhcpcd: Add an explicit interfaces option
2014-08-29 01:09:22 +04:00
Paul Colomiets
adbb9ff796
dnsmasq: upgrade to 2.71, fixed dnsmasq module
...
* The module now has systemd config
* Add resolveLocalQueries option which sets up it as a dns server for
local host (including reasonable setup of resolvconf)
* Add "dnsmasq" user for running daemon
* Enabled dbus and dnssec support for the package
Conflicts:
nixos/modules/misc/ids.nix
2014-08-28 11:39:03 -07:00
aszlig
8a56a55bb4
nixos/manual: Use literalExample when feasible.
...
Should bring most of the examples into a better consistency regarding
syntactic representation in the manual.
Thanks to @devhell for reporting.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-27 23:41:15 +02:00
Emery Hemingway
e7597b12b8
privoxy: upstart to systemd conversion, actions file editing
...
fix missing actions and filters
2014-08-27 11:34:10 -04:00
Nathan Bijnens
ac90177cb1
Zookeeper
2014-08-27 13:01:30 +02:00
Eelco Dolstra
41788255ab
Manual: Start of module-specific documentation
2014-08-27 12:24:44 +02:00
Eelco Dolstra
005f78e739
Fix opening NixOS manual
...
http://hydra.nixos.org/build/13760576
2014-08-27 11:08:50 +02:00
Emery Hemingway
aedbfdff84
unbound: run in chroot
2014-08-26 21:24:09 -04:00
Rickard Nilsson
8c78986553
Some pkgs.lib -> lib fixes
2014-08-25 14:40:40 +02:00
Igor Pashev
cdd1785cd6
Fixed rewrite rules for Mediawiki
...
If Mediawiki was served from the root directory of the server
it was impossible to serve other directories.
Make sure that URLs defined in servedDirs are not rewritten.
Use case: serving local copy of MathJax
2014-08-25 11:55:57 +02:00
Jaka Hudoklin
a4ac9eb22e
nixos: add systemd service for getty on /dev/console
2014-08-25 03:29:07 +02:00
Eelco Dolstra
d73025a5fe
Enable systemd's mymachines NSS module
...
It makes every local container registered with machined resolvable.
2014-08-24 17:10:19 +02:00
William A. Kennington III
aa77fe0fb0
nixos/radvd: Convert to a systemd unit
...
Additionally, remove the automatic initialization of the ipv6 forwarding
sysctl as this should be handled by the end user. This really should not
be an issue as most people running radvd are likely forwarding ipv6
packets.
2014-08-24 03:12:55 -07:00
Rickard Nilsson
b1d225b645
Add NixOS module for the Riemann dashboard server
2014-08-23 17:40:22 +02:00
Rickard Nilsson
e9252cb35e
Add NixOS module for Riemann monitoring server.
2014-08-23 17:40:22 +02:00
Michael Raskin
9b13792075
Merge pull request #3656 from AndersonTorres/fluxbox
...
Fluxbox: new package (1.3.5)
2014-08-23 13:07:46 +04:00
Jaka Hudoklin
84ea03fa3f
nixos: add neo4j database module
2014-08-23 13:11:09 +04:00
Michael Raskin
dec865c88c
Merge pull request #3583 from ts468/thermald
...
Add thermald: Linux Thermal Daemon
2014-08-23 12:49:59 +04:00
Edward Tjörnhammar
1615be91ef
Add mlmmj package and nixos module.
2014-08-23 12:30:45 +04:00
Michael Raskin
c0da615c02
Merge pull request #3230 from robberer/module/httpd
...
httpd: disable logging when logFormat = "none"
2014-08-23 11:37:48 +04:00
Michael Raskin
38d9a1cf0e
Merge pull request #3240 from ehmry/siproxd
...
siproxd: initial service expression
2014-08-23 11:30:18 +04:00
Michael Raskin
0505eabc6d
Merge pull request #3087 from wkennington/master.sit
...
nixos/network-interfaces: Add sit interfaces
2014-08-23 11:15:41 +04:00
AndersonTorres
49fcac0d6b
Fluxbox: adding system support (as a module)
2014-08-21 07:03:37 -03:00
sfultong
c54a8ed1d0
Merge pull request #1 from sfultongv/sfultong-14.04
...
updating tomcat to version 7
2014-08-20 23:08:39 -04:00
Edward Tjörnhammar
f28d8c2dc4
CUPS system wide client configuration.
2014-08-20 18:48:42 +02:00
Emery Hemingway
af09d3ebd8
siproxd: initial service expression
2014-08-19 10:19:52 -04:00
宋文武
35945027bf
nixos/xfce: don't set a bloated GST_PLUGIN_PATH
2014-08-19 09:32:07 +08:00
Luca Bruno
3d0dc6a143
gnome3: add services.xserver.desktopManager.gnome3.sessionPath
...
Used to add GI_TYPELIB_PATH and LD_LIBRARY_PATH for gnome shell extensions
or other libraries and services.
Not a great solution but may be the start for further work. Let's make
some cool packages work for now.
2014-08-14 21:16:40 +02:00
William A. Kennington III
bc6979f7e1
nixos/dhcpcd: Don't configure sit devices
2014-08-14 14:06:56 -05:00
William A. Kennington III
a269acf480
nixos/dhcpcd: Use null instead of empty list to disable allowInterfaces
2014-08-14 14:05:55 -05:00
William A. Kennington III
320a82dd7f
nixos/dhcpcd: Add an explicit interfaces option
2014-08-14 14:05:55 -05:00
Thomas Strobel
1da35629cc
Cleanup: remove newlines.
2014-08-14 12:42:16 +02:00
Thomas Strobel
b63b8260b5
Add thermald: Linux Thermal Daemon
2014-08-14 02:21:31 +02:00
William A. Kennington III
d0c0c2f9ba
nixos/dhcpd: Wait until network interfaces are configured to start
2014-08-13 15:08:43 -05:00
William A. Kennington III
b3ddcfabd9
nixos/dhcpd: Convert to systemd from upstart
2014-08-13 15:08:43 -05:00
William A. Kennington III
24368beed8
nixos/dhcpd: Use dhcp user instead of nobody
2014-08-13 15:08:43 -05:00
William A. Kennington III
4fbf120e84
nixos/dhcpd: Add the ability to drop privileges
2014-08-13 15:08:08 -05:00
William A. Kennington III
56228e5614
nixos/dhcp: Modernize ddns-update-style
2014-08-13 15:08:08 -05:00
Harald van Dijk
67a5ec4efb
nixos/lighttpd: fix modules for gitweb
...
Setting "services.lighttpd.gitweb.enable" to true doesn't enable the
required lighttpd modules to actually make it work. The problem is that
"or" and "||" don't mean the same thing: "or" falls back to the second
operand if the first is not defined, whereas "||" is the normal logical
operator. When cfg.cgit.enable is defined, as false, the expressions
don't have the desired effect.
[Bjørn: modify commit message]
2014-08-12 21:16:01 +02:00
Vladimír Čunát
87c3c0e885
Merge master into #2129
...
Conflicts (easy, just UID shifted):
nixos/modules/misc/ids.nix
nixos/modules/module-list.nix
2014-08-12 19:24:08 +02:00
Matt Miemiec
8695c58648
Add the bspwm window manager to Nix.
2014-08-12 18:22:15 +02:00
Luca Bruno
1a29fcae69
gdm: Add very experimental display manager
2014-08-12 11:23:42 +02:00
Rickard Nilsson
66858833e3
mopidy: Add mopidy-scan service for scanning local media
2014-08-12 01:40:44 +02:00
Rickard Nilsson
7b5829c314
Add NixOS module for syslog-ng
2014-08-11 15:06:11 +02:00
Jaka Hudoklin
675d76b00c
nixos/znc: add option to add module packages to znc
...
Besides that add option for extra znc config and fix a lot of stuff
2014-08-09 19:35:59 +02:00
Eelco Dolstra
4668f37444
Fix NixOS evaluation on i686-linux
2014-08-09 17:19:09 +02:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Joel Taylor
d8cca3d624
fail2ban: systemd support
...
- upgrade fail2ban to 0.9
- override systemd to enable python support and include sqlite3 module
- make fail2ban enablable
2014-08-08 00:10:19 +02:00
System administrator
5355d3d30b
logrotate: use systemd instead of cron
2014-08-07 08:58:50 +02:00
William A. Kennington III
377454ff0e
nixos/unifi: Explain and simplify the bind mount configuration
2014-08-05 23:15:49 -05:00
William A. Kennington III
12ad29226c
nixos/unifi: Fix ordering of mount rules
2014-08-05 22:09:15 -05:00
William A. Kennington III
dfb596b49b
nixos/unifi: Add service module
2014-08-05 21:40:47 -05:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00