Frederik Rietdijk
31f22a5bb3
Merge staging-next into staging
2019-06-15 08:43:33 +02:00
Frederik Rietdijk
087b87758e
Merge master into staging-next
2019-06-15 08:17:58 +02:00
Samuel Dionne-Riel
861bbbcb3c
nixos/sshd: fixes validation for cross-compilation
...
See https://github.com/NixOS/nixpkgs/pull/62853
2019-06-15 00:56:42 -04:00
Samuel Dionne-Riel
8c14a6f641
Merge pull request #63135 from Ma27/captive-browser-regression
...
nixos/captive-browser: fix module
2019-06-14 21:29:26 -04:00
Florian Klink
e0818a1530
nixos/systemd: enable systemd-tmpfiles-setup and -clean for user sessions ( #62813 )
...
nixos/systemd: enable systemd-tmpfiles-setup and -clean for user sessions
2019-06-14 22:43:15 +02:00
Maximilian Bosch
d9f7bac91f
nixos/captive-browser: fix module
...
Fixes the broken metrics evaluation which was caused by a `trace`
warning in stdout which confused `jq` in `pkgs/top-level/metrics.nix`.
Also made the `bind-device` feature optional as suggested after the
merge.
2019-06-14 20:38:33 +02:00
Vladimír Čunát
788261a1a9
Merge branch 'master' into staging-next
...
Brings in Haskell rebuild.
Hydra nixpkgs: ?compare=1525186
2019-06-14 17:47:23 +02:00
aszlig
c26584f1e5
nixos: Fix build of manual
...
Manual build broken by 79f7f89442d9132c35b6417187cb1567eca2b910, which
is part of pull request #59179 (Fix Cassandra, improve config and
tests).
The issue was just a small error because of an unbalanced <literal/>
tag, so only a "/" was missing :-)
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @aanderse
2019-06-14 05:36:06 +02:00
Aaron Andersen
fadceeb075
Merge pull request #59179 from JohnAZoidberg/cassandra-module
...
Fix Cassandra, improve config and tests
2019-06-13 20:37:10 -04:00
Aaron Andersen
a49b546c92
nixos/httpd: remove unmaintained subservice (phabricator)
2019-06-13 17:12:13 -04:00
Aaron Andersen
e278ff48bc
nixos/phd: remove unmaintained service
2019-06-13 17:09:45 -04:00
Lasse Blaauwbroek
0515392ed3
Fix ddclient extraConfig
...
The the extraConfig variable is added below the domain variable in the
ddclient config file. The domain variable should always be last.
(cherry picked from commit ba0ba6dc7934a6b4cc5d4090739a3a1c839afe67)
2019-06-13 18:25:59 +02:00
Wout Mertens
7938c1613d
kernel.nix: boot.vesa implies nomodeset
...
Without nomodeset the console is reset to 80x25 after Grub
2019-06-13 17:58:08 +02:00
Maximilian Bosch
d1990cff8d
Merge pull request #58036 from volth/captive-browser
...
nixos/programs.captive-browser: init
2019-06-13 14:05:13 +02:00
Danylo Hlynskyi
e718eb6243
Merge pull request #62712 from danbst/module-conflict-naming
...
NixOS module system: improve one of error messages
2019-06-13 11:59:54 +03:00
Daniel Schaefer
03503121da
nixos/cassandra: Don't force SimpleSeedProvider
...
If the `seedAddresses` is not set, don't force `SimpleSeedProvider` to
be in `seed_provider`. This could cause problems in a multi-datacenter
deployment when a different seed provider is preferred.
2019-06-13 04:36:42 +02:00
Daniel Schaefer
79f7f89442
nixos/cassandra: Use docbook instead of markdown style
2019-06-13 04:36:41 +02:00
Daniel Schaefer
9ecd584785
nixos/cassandra: Add option for password file path
...
If you're on a multi user system you don't want to have the password in
the nix-store. With the new jmxRolesFile option you can specify your own
protected file instead.
2019-06-13 04:36:41 +02:00
Daniel Schaefer
35531f4016
nixos/cassandra: Allow setting JMX credentials
...
If we have the ability to enable remote JMX we should also support
setting credentials for that because they become required if you turn it
on.
2019-06-13 04:36:41 +02:00
Daniel Schaefer
c1991fb18d
nixos/cassandra: Add clusterName
2019-06-13 04:36:41 +02:00
Daniel Schaefer
f0031432ce
nixos/cassandra: Add nixos conf for Java env
2019-06-13 04:36:40 +02:00
Daniel Schaefer
746b82bd4a
nixos/cassandra: Allow setting of seed addresses
...
Allow for more intuitive specifying of seed node addresses with Nix
syntax.
2019-06-13 04:34:03 +02:00
Daniel Schaefer
a2aa01be0c
nixos/cassandra: Enable CQL server by default
...
Resolves #50954
2019-06-13 04:34:03 +02:00
Maximilian Bosch
401360e15b
Merge pull request #61923 from aanderse/gitea
...
nixos/gitea: make use of declarative features where applicable
2019-06-13 01:01:18 +02:00
Wael Nasreddine
da3ec20a72
Merge pull request #63035 from rvolosatovs/update/go
...
go: 1.12.5->1.12.6, 1.11.10->1.11.11
2019-06-12 08:50:39 -07:00
Eelco Dolstra
734b3e7758
Merge pull request #62966 from bjornfor/nixos-generate-config-bcache
...
nixos-generate-config: add support for bcache
2019-06-12 10:06:17 +02:00
Frederik Rietdijk
7953a65269
Merge staging-next into staging
2019-06-12 09:24:00 +02:00
Frederik Rietdijk
7184efb40a
Merge master into staging-next
2019-06-12 09:22:07 +02:00
Franz Pletz
9b2ee2c057
Merge pull request #62838 from mayflower/fix/cryptsetup-kernel-crypto
...
cryptsetup: enable kernel crypto api support again
2019-06-12 05:05:38 +00:00
Tobias Happ
003b42f332
nixos/dwm-status: add module
2019-06-12 00:15:10 +02:00
Robin Gloster
68c30f0d9b
Merge pull request #62153 from WilliButz/avahi-refactor
...
avahi: set service directory and refactor module
2019-06-11 14:04:33 +00:00
pacien
7cc0c50e39
nixos/cgit: mention filters in configText example
2019-06-11 15:27:56 +02:00
Jörg Thalheim
e829aeefa3
Merge pull request #62101 from michaelpj/imp/lenovo-throttled
...
throttled: fix for Intel CPU throttling issues
2019-06-11 11:10:52 +01:00
Lucas Savva
24e974b904
bind: Remove deprecated flag from rndc-confgen
...
Fixes bind.service startup issue after NixOS/nixpkgs#61619
2019-06-11 09:05:56 +02:00
worldofpeace
814c4c1b9d
Merge pull request #61366 from romildo/upd.deepin.dde-file-manager
...
deepin.dde-file-manager: init at 4.8.6.2
2019-06-11 02:00:43 -04:00
José Romildo Malaquias
057016a2c5
nixos/deepin: add dde-file-manager services
2019-06-11 01:57:16 -04:00
Matthew Bauer
02698c4a61
Merge pull request #59803 from volth/patch-316
...
nixos/netboot: import -> callPackage
2019-06-10 21:30:23 -04:00
Matthew Bauer
049884ba12
Merge pull request #62941 from woffs/openvpn-url
...
openvpn: fix static key mini howto url
2019-06-10 21:24:53 -04:00
Aaron Andersen
7145cf224c
nixos/gitea: replace deprecated usage of PermissionsStartOnly
...
see #53852
2019-06-10 20:32:35 -04:00
Aaron Andersen
9d251d8b21
nixos/gitea: define a gitea group to avoid "nogroup" ownership
2019-06-10 20:32:35 -04:00
Aaron Andersen
615f8b8982
nixos/gitea: utilize mysql|postgresql.ensureDatabases & ensureUsers to provision databases
2019-06-10 20:32:28 -04:00
Bjørn Forsman
4755811a12
nixos-generate-config: add support for bcache
...
Add "bcache" to boot.initrd.availableKernelModules if a bcache device is
detected.
This fixes a problem I've had one too many times: I install NixOS and
forget to add "bcache", resulting in an unbootable machine (until fixed
with Live CD). Now NixOS will do it for me.
2019-06-10 21:22:07 +02:00
Nikolay Amiantov
493bb6035a
networkmanager service: install strongswan configuration file only if enabled
2019-06-10 20:20:47 +03:00
Nikolay Amiantov
5be5991c80
networkmanager service: remove with pkgs
...
Avoid using `with` which isn't particularly needed.
2019-06-10 20:20:46 +03:00
Nikolay Amiantov
c3865335fb
auditd service: make more useful
...
Enable kernel audit and install userspace utilities by default.
2019-06-10 18:55:11 +03:00
Nikolay Amiantov
33b7e5f6c7
networkmanager service: fix simultaneous append and insert of nameservers
...
Before only one of them could work at the same time.
2019-06-10 18:54:32 +03:00
Nikolay Amiantov
68de116eb4
networkmanager service: override DNS when it's actually needed
...
Logic expression was incorrect before.
2019-06-10 18:54:27 +03:00
adisbladis
32b374f780
Merge pull request #62315 from adisbladis/pulseaudio/resample-method
...
nixos/pulseaudio: Set speex-float-5 as default resample-method
2019-06-10 15:05:44 +02:00
Frank Doepper
f7ef7bacb7
openvpn: fix static key mini howto url
2019-06-10 13:02:45 +02:00
Frederik Rietdijk
e58f0f6c99
Merge master into staging-next
2019-06-10 10:35:50 +02:00