Commit graph

11610 commits

Author SHA1 Message Date
Andreas Rammhold
51c3082119 nixos/prometheus: require one alertmanager configuration parameter
This commit adds an assertion that checks that either `configFile` or
`configuration` is configured for alertmanager. The alertmanager config
can not be an empty attributeset. The check executed with `amtool` fails
before the service even has the chance to start. We should probably not
allow a broken alertmanager configuration anyway.

This also introduces a test for alertmanager configuration that piggy
backs on the existing prometheus tests.
2018-11-23 19:45:17 +01:00
Andreas Rammhold
b1032db5a9 nixos/prometheus: check alertmanager configuration 2018-11-23 19:45:17 +01:00
Andreas Rammhold
d1ef00ebee nixos/prometheus: add package option to alertmanager 2018-11-23 19:45:17 +01:00
Florian Klink
6870eafe72 gitlab tests: enable recommendedProxySettings, test redirection works as it should
The nixos test is a bit misleading, as the given nginx configuration
would always cause gitlab to redirect to localhost, which is clearly not
what you want in a production setup.

Instead we now enable services.nginx.recommendedProxySettings,
curl against http://gitlab, and assure we get redirected to that same
hostname, too.
2018-11-23 19:44:45 +01:00
Jörg Thalheim
50daffc4b8
nixos/docker-image: add example usage 2018-11-23 15:40:10 +00:00
Franz Pletz
4470dd9902
Merge pull request #50948 from Ma27/fix-nixos-build-vms-eval
nixos-build-vms: fix eval
2018-11-23 14:10:30 +00:00
Maximilian Bosch
b36fa8ef91
nixos-build-vms: fix eval
Previously I got the following error message:

```
error: opening file '/home/ma27/Projects/nixpkgs/nixos/modules/installer/default.nix': No such file or directory
```

Probably related to 6c68fbd4e1.
2018-11-23 13:43:47 +01:00
Jörg Thalheim
d3aeed389c
Merge pull request #50641 from blaxill/firewallMerge
nixos/firewall: Always use global firewall.allowed rules
2018-11-23 11:42:16 +00:00
Ben Blaxill
308ab4ea25 Rename back to default and better release notes 2018-11-22 19:24:23 -05:00
Matthieu Coudron
35f74c3608 mininet: init at 2.3.0d4 (#41261)
Mininet (https://github.com/mininet/mininet) is a popular network emulator that
glues several components such as network namespaces, traffic control
commands into a set of python bindings. It is then "easy" to describe a
topology and run experiments on it.
2018-11-21 23:33:10 +00:00
Jörg Thalheim
769735d8a1
netdata: create missing /etc/netdata
Since netdata 1.11.0 updated in https://github.com/NixOS/nixpkgs/pull/50459
it needs to have a /etc/netdata directory, which we did not create by default.
fixes #50893
2018-11-21 23:00:04 +00:00
Ben Blaxill
b48c6d051b Add release notes 2018-11-21 17:08:12 -05:00
Matthew Bauer
75999d4e38
Merge pull request #41887 from gmarmstrong/fix/seahorse-update
nixos/seahorse: require gnome3.dconf
2018-11-21 15:15:32 -06:00
Eelco Dolstra
09cbfea2ed
Revert "resolvconf.conf: Remove forced NSCD service restart"
This reverts commit d8c16bc54a. It
breaks nscd invalidation when the network configuration changes.
2018-11-21 15:26:37 +01:00
Ben Blaxill
32779b4c74 Refactor out the set operations 2018-11-20 21:29:33 -05:00
Jörg Thalheim
4a38cfbeb6
Merge pull request #48772 from hhomar/gnupg-tty-fix
gnupg: Fix, set current tty in interactive shell
2018-11-21 01:55:16 +00:00
Thomas Tuegel
25b8d4bd42
Merge pull request #50472 from jfrankenau/fix-penultimate
nixos/fontconfig: fix enable option of penultimate
2018-11-20 19:20:43 -06:00
Craig Younkins
a629f967f7 Fix release notes XML para closing tag 2018-11-20 18:46:52 +00:00
Frederik Rietdijk
fd26e7be2a Merge master into staging-next 2018-11-20 11:47:26 +01:00
Pierre Bourdon
74598ca8d3 nixos.tests.keymap: use new name of the colemak/en-latin9 keymap
Commit f1987fb58f renamed colemak/en-latin9 to
colemak/colemak, but the keymap test wasn't adjusted to refer to the new path.
2018-11-20 04:11:39 +01:00
Samuel Dionne-Riel
a041dc8ab7
Merge pull request #50499 from delroth/syncthing-relay
syncthing-relay module: init
2018-11-20 01:40:23 +00:00
Linus Heckemann
388d36951c
Merge pull request #49735 from pvgoran/mysql-support-mysql57
nixos/mysql: support package=mysql57
2018-11-19 20:49:08 +01:00
Frederik Rietdijk
e343a85cfb Merge master into staging-next 2018-11-19 09:55:32 +01:00
Ben Blaxill
551d2f7ed2 nixos/firewall: Always use global firewall.allowed rules
Apply global firewall.allowed* rules separately from the
interface specific rules.
2018-11-18 22:50:01 -05:00
Pierre Bourdon
08f24cadaa syncthing-relay module: init 2018-11-19 01:09:54 +01:00
Renaud
7f84561cc3
Merge pull request #49631 from janikrabe/master
oidentd: 2.2.2 -> 2.3.1
2018-11-19 00:31:02 +01:00
Benno Fünfstück
773e8d07bc nixos/accountsservice: set XDG_DATA_DIRS correctly 2018-11-18 17:16:24 +01:00
Frederik Rietdijk
63c6875f26 Merge master into staging-next 2018-11-18 10:32:12 +01:00
Pavel Goran
21e9c35f5f nixos/mysql: support package=mysql57 2018-11-18 12:25:36 +07:00
Jörg Thalheim
1186d42a17
Merge pull request #50526 from symphorien/short-test-name
nixos/tests/installer.nix: shorten test name to fit length limit
2018-11-17 21:48:41 +00:00
Symphorien Gibol
2dbed7e726 nixos/tests/installer.nix: shorten test name to fit length limit
previously one of the tests would fail with

boot-after-install: starting vm
Path length (109) is longer than maximum supported length (108) and will be truncated at /nix/store/0ingn8cwwnl84i374hcl6nafsm2c5m2p-perl-5.28.0/lib/perl5/5.28.0/x86_64-linux-thread-multi/Socket.pm line 872, <__ANONIO__> line 268.
boot-after-install# qemu-system-x86_64: -monitor unix:./monitor: Failed to connect socket ./monitor: No such file or directory
error: QEMU died prematurely
QEMU died prematurely
vde_switch: EOF on stdin, cleaning up and exiting
cleaning up
builder for '/nix/store/zbpxwwxwy7f6z5z3kg4nf5mjqsywzjvx-vm-test-run-installer-filesystemEncryptedWithKeyfile.drv' failed with exit code 4

Shortening the test name fixes the issue.
2018-11-17 22:30:29 +01:00
Jörg Thalheim
31d2593ced
netdata: fix python plugins
fixes #33366
2018-11-17 15:38:15 +00:00
Jörg Thalheim
dfd77bc26f
Merge pull request #50459 from marsam/feature/netdata-darwin
netdata: 1.10.0 -> 1.11.0
2018-11-17 15:01:06 +00:00
Jörg Thalheim
a91a1eede5
Merge pull request #50495 from zimbatm/nixos-move-autoupgrade
nixos: move system.autoUpgrade
2018-11-17 13:08:27 +00:00
zimbatm
7b9a553e21
nixos: move system.autoUpgrade
This is not installer-specific
2018-11-17 14:05:30 +01:00
Vladimír Čunát
80738ed9dc
nixos gtk.iconCache.enable: default from xserver.enable
It's a quick approximation to unblock unstable channels after #48116.
This commit isn't ideal, as I suspect most wayland users won't have
xserver.enable, so they will lose the icon cache in case they had gtk
in system path (otherwise they didn't get cache anyway).

I considered using environment.noXlibs, but the nixos tests installing
headless systems do *not* get that option, so we would still be pulling
gtk in many cases where it's clearly not desired.  We need to design
this more carefully.
2018-11-17 11:18:10 +01:00
Silvan Mosberger
5c4ed80ad7
Merge pull request #49835 from Synthetica9/fix-49826
nixos-generate-config: fix for swapless kernels
2018-11-17 02:53:43 +01:00
zimbatm
b56191746e
nixos: doc typo and ws 2018-11-16 22:44:55 +01:00
Johannes Frankenau
eea86c9e71 nixos/fontconfig: fix enable option of penultimate 2018-11-16 21:33:53 +01:00
Samuel Dionne-Riel
07eaaf6c8b
Merge pull request #49838 from dasJ/mysql-datadir
nixos/mysql: Explicitly set datadir in my.cnf
2018-11-16 19:21:01 +00:00
Jörg Thalheim
348b7b8be9 nixos/netdata: own plugins must the looked up first
Otherwise netdata will not find python modules.
To make sure netdata still pick up our setuid version of apps.plugin
we rename the original executable.
2018-11-16 11:24:27 -05:00
Eelco Dolstra
304e14a198
Merge pull request #48588 from zimbatm/shared-codename
group the release info
2018-11-16 13:10:54 +01:00
Rob Vermaas
02b60418b1 Update GCE image for 18.09
(cherry picked from commit e0eb712136aa8cd786955e9109afbbf8ba42555c)
2018-11-16 11:43:42 +01:00
Eelco Dolstra
5835b2796e
Merge pull request #50440 from Mic92/nix-cores
nixos/nix-daemon: default to build with all cores available
2018-11-16 09:13:44 +01:00
Jörg Thalheim
ced57f7888
nixos/nix-daemon: default to build with all cores available
These days build systems are more robust w.r.t. to concurrency.
Most users will have at least two cores in their machines.
Therefore I suggest to increase the number of cores used for building.

fixes #50376
2018-11-16 02:05:30 +00:00
Ryan Mulligan
23dfa4e073 nixos/mysql: fix ensureUsers example formatting
closes #50441
2018-11-15 17:46:09 -08:00
zimbatm
2a838cb6d7
group the release info
this makes the codename globally accessible in the repo. The release is
not only for NixOS anymore.
2018-11-15 21:56:17 +01:00
Rafael García Gallego
8bf4fe85f1 selfoss (service): fix port in service config (#50411) 2018-11-15 19:22:20 +00:00
Nadrieril
99a8c45bdd
nixos/ckb: Add option to restrict access to the devices to a particular group
fixes #34064
2018-11-15 16:49:38 +00:00
Léo Gaspard
0483ce0eee
rss2email module: init
Also adding `system-sendmail` package for sharing the code with other
modules or packages needing it.
2018-11-15 23:44:16 +09:00
Silvan Mosberger
428eef67fd
Merge pull request #50393 from tazjin/fix/journaldriver-module-import
nixos/journaldriver: import module in top-level module list
2018-11-15 12:52:12 +01:00
Linus Heckemann
f73afe6ccf
Merge pull request #50356 from mayflower/gitlab-smtp-fix
gitlab: fix smtp setting
2018-11-15 12:13:18 +01:00
Vincent Ambo
d5ea09758d nixos/journaldriver: import module in top-level module list
Imports the `journaldriver` module into the top-level NixOS module
list to make it usable without extra work.

This went unnoticed in #42134 (mostly because my setup imports modules
explicitly from pinned versions).

Fixes #50390
2018-11-15 11:02:55 +01:00
Sarah Brofeldt
1b02e6a907 nixos/tests/all-tests.nix: Fix incron test path 2018-11-14 23:51:15 +01:00
Jörg Thalheim
0a8063442c
Merge pull request #50361 from Mic92/node-packages-springclean
nodePackages: springclean
2018-11-14 21:18:44 +00:00
Vladimír Čunát
e229065842
Merge #50280: xorg: init xf86-video-vboxvideo ...
Based on reports X wouldn't start out of the box and seems OK now.
In case there are still some problems, we can improve later.
I checked that nixos.tests.virtualbox.* still succeed.
2018-11-14 20:34:48 +01:00
Jörg Thalheim
552c223625
nodePackages.statsd: remove
The package/service is broken. Upstream is dead
2018-11-14 18:32:44 +00:00
Robin Gloster
74df0823f3
gitlab: fix smtp setting
fixes #50163
2018-11-14 18:58:45 +01:00
Matthew Bauer
0874ee8f05
Merge pull request #47684 from roberth/nixpkgs-nixosTest
Add pkgs.nixosTest
2018-11-14 11:20:46 -06:00
Daniel Peebles
9b7c57cdc8
Merge pull request #50348 from DzmitrySudnik/exhibitor-service-fix
exhibitor: fix paths for zookeeper shell scripts
2018-11-14 09:32:14 -05:00
Dzmitry Sudnik
5517661935 exhibitor: fix paths for zookeeper shell scripts to point to local folders 2018-11-14 09:30:01 -05:00
Linus Heckemann
231e671758
Merge pull request #49736 from nh2/glusterfs-service-simple-unit-no-forking
glusterfs service: Switch to simple unit instead of forking
2018-11-14 12:35:57 +01:00
Jörg Thalheim
6f607b806d
Merge pull request #49821 from DIzFer/profiles-documentation
Docs: Add chapter on Profiles
2018-11-14 11:32:12 +00:00
Ding Xiang Fei
ceececbd04 Merge branch 'master' of https://github.com/nixos/nixpkgs into tarball-closureinfo 2018-11-14 12:32:28 +08:00
Samuel Dionne-Riel
58c0c2574c
Merge pull request #49840 from markuskowa/fix-pgBackup
nixos/postgresqlBackup: set to umask to 0077
2018-11-14 01:40:38 +00:00
Silvan Mosberger
9c7f44e18b
Merge pull request #50321 from florianjacob/systemd-resolved
nixos/systemd-resolved: link networkd resolv.conf to dynamic stub resolver
2018-11-13 23:42:54 +01:00
Tobias Happ
4839403dd6 nixos/{lightdm,sddm,xpra}: remove enabling of logToFile 2018-11-13 21:52:37 +01:00
Florian Jacob
e80cdb2bac nixos/systemd-resolved: link resolv.conf to dynamic stub resolver
version as recommended by upstream (since systemd 236):
https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf
2018-11-13 19:21:02 +01:00
Renaud
56f508833a
Merge pull request #50226 from danieldk/handbrake-1.1.2
handbrake: 1.1.0 -> 1.1.2
2018-11-13 15:38:22 +01:00
Jörg Thalheim
e3ac65f4c1
Merge pull request #50186 from dingxiangfei2009/cloud-init-btrfs
Allow cloud-init to support creating btrfs partitions
2018-11-13 14:17:30 +00:00
Jörg Thalheim
a5c74762cb
nixos/cloud-init: add enable suffix to ext4/btrfs
Makes the optional more self-describing and allows future extensions
2018-11-13 10:28:40 +00:00
Robert Hensing
cdca66d7e8 Add pkgs.nixosTest 2018-11-13 10:43:05 +01:00
Robert Hensing
9871fe3564
Merge pull request #47346 from NixOS/roberth-patch-1
rabbitmq module: Update documentation
2018-11-13 10:03:38 +01:00
Robert Hensing
dd3aca2d0b
Merge pull request #49256 from roberth/nixos-nixpkgs-pkgs-use-overlays
NixOS: use overlays when nixpkgs.pkgs is set
2018-11-13 09:55:24 +01:00
Ding Xiang Fei
a965921af9 allow cloud-init to support creating btrfs partitions 2018-11-13 13:14:34 +08:00
Matthew Bauer
964d01a5ca
Merge pull request #48116 from romildo/fix.xdg-icons
gtk/icons: (re)build icon theme caches
2018-11-12 16:25:52 -06:00
José Romildo Malaquias
39a9b865b5 gtk: new service giving support to GTK+ applications 2018-11-12 19:55:30 -02:00
Vladimír Čunát
9108b24253
xorg: init xf86-video-vboxvideo at 1.0.0
... and switch to it by default in virtualbox guests
2018-11-12 20:29:14 +01:00
Frederik Rietdijk
daf3297cb4 Merge master into staging-next 2018-11-12 18:59:08 +01:00
Léo Gaspard
27a5427526
nixos-build-vms: fix syntax error
Introduced by 6c68fbd4e1
2018-11-13 00:40:07 +09:00
aszlig
12d7f9a640
nixos/tests/networking: Fix syntax error
Introduced by 6c68fbd4e1.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Ekleog
2018-11-12 16:18:58 +01:00
Daniël de Kok
40f41772aa tests: handbrake: test transcoding to MKV and MP4. 2018-11-12 08:19:58 +01:00
Léo Gaspard
2986ce16a8
meta.tests: rename into passthru.tests
Nix currently rejects derivations in `meta` values. This works around
that limitation by using `passthru` instead.

Closes https://github.com/NixOS/nixpkgs/issues/50230
2018-11-11 23:11:46 +09:00
Léo Gaspard
cae5598611
meta.tests: drop meta.needsVMSupport
Its job is already handled by `requiredSystemFeatures`
2018-11-11 23:11:46 +09:00
Léo Gaspard
aade4e577b
tests: disable some broken tests and/or restrict to x86_64 2018-11-11 23:11:46 +09:00
Léo Gaspard
83b27f60ce
tests: split into a separate all-tests.nix file
This will make the list much easier to re-use, eg. for `nixosTests`

The drawback is that this approaches makes the
```
nix-build release.nix -A tests.opensmtpd.x86_64-linux
```
command about twice as slow (3s to 6s): it now has to evaluate `nixpkgs`
once for each architecture, instead of just having the hardcoded list of
tests that allowed to say “ok just evaluate for x86_64-linux”.

On the other hand, complete evaluation of `release.nix` should be much
faster because we no longer import `nixpkgs` for each test: testing with
the following command went from 30s to 18s, and that's just for a few
tests.
```
time nix-instantiate --eval --strict nixos/release.nix -A tests.nat
```
I initially wanted to test on the whole `release.nix`, but there are too
many broken tests and it takes too long to eval them all, especially
compared to the fact that the current implementation breaks some setup.

Given developers can just `nix-build nixos/tests/my-test.nix`, it sounds
like an overall win.
2018-11-11 23:11:46 +09:00
Léo Gaspard
6c68fbd4e1
tests: refactor to carry the package set as an argument
This way, the package set will be possible to pass without re-importing
all the time
2018-11-11 23:11:45 +09:00
Edward Tjörnhammar
888d01da48
nixos/minetest fix: add missing uid/gid for minetest 2018-11-11 12:47:09 +01:00
Frederik Rietdijk
7863aae5b2 Merge master into staging-next 2018-11-11 08:59:44 +01:00
Silvan Mosberger
316ad96256
Merge pull request #50210 from aanderse/incron
nixos/incron: added nixos test to ensure expected behaviour
2018-11-11 03:37:10 +01:00
Aaron Andersen
24af0bc2b5 nixos/incron: added nixos test to ensure expected behaviour 2018-11-10 20:54:10 -05:00
Silvan Mosberger
e888a997d0
Merge pull request #49743 from nh2/glusterfs-4.0.0
glusterfs: 3.12.12 -> 4.0.0
2018-11-11 01:42:48 +01:00
Robert Hensing
b60dccbf4f NixOS: update config.nixpkgs.pkgs documentation 2018-11-10 23:21:21 +01:00
Jörg Thalheim
1d261945c7
Merge pull request #50113 from ryantm/monit
nixos/monit: change type of 'config' option to lines
2018-11-10 14:47:38 +00:00
Jörg Thalheim
4ec41a9a9e
Merge pull request #50115 from Ekleog/nextcloud-pgsql-unix
nextcloud module: document process for using with pgsql unix auth
2018-11-10 14:37:18 +00:00
Silvan Mosberger
9c984b06c4
Merge pull request #38514 from disassembler/grafana-reporter
grafana-reporter: init at 2.0.1
2018-11-10 15:15:21 +01:00
Silvan Mosberger
e468a1091b
Merge pull request #48687 from danielrutz/port-type
Add port type
2018-11-10 15:12:07 +01:00
Frederik Rietdijk
53d00c3351 Merge master into staging-next 2018-11-10 11:08:54 +01:00
Léo Gaspard
221e0fae38
nextcloud module: document process for using with pgsql unix auth 2018-11-10 12:30:54 +09:00
Silvan Mosberger
38b2520b96
Merge pull request #37365 from proteansec/pkgs/bacula
bacula: 5.2.13 -> 9.2.1
2018-11-10 04:23:28 +01:00