Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281.
This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Robbin C
c75d1e761a
Change argument --port to --listen in nix-serve.nix
2015-11-13 21:25:50 +08:00
Pascal Wittmann
14ecf0c7fb
services.tlsdated: use google.com as default host
...
www.ptb.de returns incorrect dates.
2015-11-11 12:07:08 +01:00
Tomasz Kontusz
6681c66db8
networkmanager service: add unmanaged option
2015-11-10 12:20:55 +01:00
Alexei Robyn
91fe21c854
quassel service: Support multiple listen addresses, fixes #10924
2015-11-10 11:10:21 +01:00
William A. Kennington III
a26c8e9b83
Merge branch 'master.upstream' into staging.upstream
2015-11-07 15:51:51 -08:00
Domen Kožar
07405ee187
Merge pull request #9463 from khumba/nm-connection-sharing
...
Fix NetworkManager connection sharing
2015-11-06 11:16:50 +01:00
Domen Kožar
e695b245a9
Merge pull request #9805 from Mathnerd314/quassel-fix
...
quassel: Start after its databases
2015-11-06 11:14:54 +01:00
Franz Pletz
d89f269b26
chrony service: Members of group chrony can use chronyc
2015-11-03 15:07:18 +01:00
Franz Pletz
c459e269eb
chrony service: Integration with other ntp daemons
2015-11-03 15:07:18 +01:00
Tim Jäger
4591e72917
Fixed wrong documentation for Wake-On-LAN feature
2015-10-31 12:55:34 +01:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Domen Kožar
01b0355140
nm-openvpn: add user/group, closes #10689
...
(cherry picked from commit 551dad3ffd055d5df5de6878a74432d85ecbd114)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-10-29 09:59:08 +01:00
Peter Simons
84903a4846
nixos: use "example.net" host name in autossh documentation
2015-10-28 20:04:36 +01:00
Peter Simons
b8dd60aaa6
nixos: remove redundant services.autossh.enable option
...
The service is enabled automatically when 'session' is non-empty.
2015-10-28 19:50:06 +01:00
Peter Simons
be1fa3c9da
Merge pull request #10650 from grwlf/autossh-nixos
...
autossh.nix: AutoSSH service as a NixOS module
2015-10-28 11:31:51 +01:00
Sergey Mironov
d355ed81cb
autossh.nix: add the module, which run autossh sessions as systemd services
2015-10-28 00:23:13 +03:00
Domen Kožar
6fb7b9b664
networkmanager: don't check if subject is active (false in my X session)
...
(cherry picked from commit 4c2bbb248cf22ad3c3541ba7d38bbc3abb40c706)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-10-23 20:16:49 +02:00
Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
Hajo Möller
de9e05153d
service.asterisk: fix dir creation
2015-10-19 19:05:23 +02:00
William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Tobias Geerinckx-Rice
a65cf63f55
copy-com service: order after network-online.target
...
I doubt that ordering non-sysvinit services after network.target ever
makes sense. In this case, CopyConsole requires DNS lookups and fails
if these are not yet possible.
2015-10-13 21:02:01 +02:00
Vladimír Čunát
12487536d2
libgpgerror: split dev and info outputs
2015-10-13 20:19:00 +02:00
Vladimír Čunát
99e4371526
curl: split into multiple outputs
...
Also use pkgconfig to be safer and fix (some) referrers.
2015-10-13 20:18:48 +02:00
Thomas Strobel
c6b2365e9a
supplicant module: extended module for wpa_supplicant
...
Add new configuration options for wpa_supplicant and allow to
configure and start one wpa_supplicant per device.
2015-10-06 20:12:40 +02:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing
changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Vladimír Čunát
f361938b21
Merge staging into closure-size
...
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
lethalman
0474cb3c6d
Merge pull request #10078 from nmikhailov/nm_service
...
Enable setting extended NetworkManager hooks
2015-10-02 11:45:28 +02:00
Peter Simons
4578784820
nixos: add services.bind.extraConfig option
...
This option allows users to add arbitrary configuration statements into
the generated named.conf file.
2015-09-29 11:51:40 +02:00
ts468
6d5a742c2e
Merge pull request #10000 from ts468/upstream.vswitch
...
nixos networking: add vswitch option
2015-09-29 00:52:58 +02:00
Nikita Mikhailov
89b306a7ff
Enable setting extended NetworkManager hooks
2015-09-26 23:59:31 +06:00
Matej Cotman
ee7e17c6a7
Merge pull request #9984 from grwlf/syncthing
...
syncthing: update systemd service config according to upstream example
2015-09-26 18:38:20 +02:00
Thomas Strobel
59bc47c9ed
nixos networking: add vswitch option
...
Add a configuration option for Open vSwitch that is
similar to the option for the Linux kernel ethernet
bridge.
2015-09-25 11:55:27 +02:00
Eelco Dolstra
89e983786a
Manual: Remove store path references
2015-09-24 11:50:58 +02:00
Sergey Mironov
9f191abad1
syncthing: update systemd service config according to upstream example
...
The example service config were taken from the syncthing repo:
https://github.com/syncthing/syncthing/blob/master/etc/linux-systemd/system/syncthing@.service
2015-09-21 21:17:38 +00:00
lethalman
d6fd3c4270
Merge pull request #9317 from dfoxfranke/oidentd-ipv6
...
oidentd: listen on IPv6
2015-09-18 15:20:02 +02:00
Eric Sagnes
095bf185ec
connman: improved configuration support
2015-09-12 23:31:50 +09:00
Mathnerd314
91e6a8e5a2
quassel: Start after its databases
2015-09-11 15:42:35 -06:00
Thomas Strobel
684cd17ff5
dnschain nixos module: init
2015-09-10 18:11:40 +02:00
Thomas Strobel
8db7c14e56
namecoind nixos module: security enhancements
2015-09-10 18:11:40 +02:00
Luca Bruno
f4b7be4f04
nixos ntpd: allow passing extra flags
2015-09-10 10:58:13 +02:00
Peter Simons
64eb5527ba
nixos: remove the obsolete 'services.openvpn.enable' option
...
OpenVPN is enabled implicitly when configuring 'services.openvpn.servers', so the
"enable" option is meaningless since b2910df04e4ec3e707ad08074bd128dedf9b2c23.
Closes https://github.com/NixOS/nixpkgs/issues/9764 .
2015-09-10 10:38:38 +02:00
Arseniy Seroka
90a7bb69d0
Merge pull request #9711 from anderspapitto/bitlbee
...
plugin support for bitlbee, and facebook plugin
2015-09-09 03:03:53 +03:00
Anders Papitto
78f7a09e3a
bitlbee service: enable plugins
2015-09-08 14:24:50 -07:00
Thomas Strobel
cb4bea5f97
namecoind nixos module: fix environment variable
2015-09-08 22:37:10 +02:00
Thomas Strobel
b6fb760484
namecoind nixos module: init
2015-09-08 20:17:52 +02:00
Thomas Strobel
5e21271af0
dnsmasq nixos module: fix path in systemd service
2015-09-08 19:33:01 +02:00