Silvan Mosberger
115cf2e2cf
Merge pull request #54339 from avdv/avoid-duplicate-luks-device
...
installer/tools: Avoid duplicate LUKS device entries in hw config
2019-01-22 15:23:09 +01:00
Silvan Mosberger
2f9ef8c563
Merge pull request #54051 from Ma27/optional-prometheus-source_labels
...
nixos/prometheus: make `source_labels` optional
2019-01-22 15:18:06 +01:00
Jörg Thalheim
859ce47b02
Merge pull request #53965 from mayflower/zfs-autoscrub-fix
...
nixos/zfs: autoscrub only after boot is complete
2019-01-22 10:48:17 +00:00
Florian Klink
0b4db9fa22
Merge pull request #54273 from flokli/ssh-known-hosts-example
...
programs.ssh.knownHosts: update example to be an attrset
2019-01-21 17:15:27 +01:00
Jan Tojnar
dd3626c036
Merge pull request #53695 from chpatrick/gnome-flashback-session
...
nixos/gnome3: add GNOME Flashback sessions option
2019-01-21 12:01:32 +01:00
Patrick Chilton
b25095bcda
nixos/gnome3: add GNOME Flashback sessions option
2019-01-21 11:17:49 +01:00
Wout Mertens
e445eabbe8
Merge pull request #41440 from wmertens/php-per-pool
...
phpfpm: allow configuring PHP package per-pool
2019-01-21 08:35:49 +01:00
Claudio Bley
352e06d3da
installer/tools: Avoid duplicate LUKS device entries in hw config
...
There are situations where several filesystems reside on a single encrypted LUKS
device (e.g. when using BTRFS subvolumes).
Simply generating a `boot.init.luks.devices.NAME.device` entry for each mounted
filesystem will result in an error later when evaluating the nix expression in
`hardware-configuration.nix`.
2019-01-19 22:02:49 +01:00
Samuel Dionne-Riel
50555a6d35
Merge pull request #54330 from samueldr/fix/disable-tests-shell-access
...
Revert "Add ssh backdoor to VM tests infrastructure."
2019-01-19 14:20:15 -05:00
Samuel Dionne-Riel
3aab228d09
Revert "Add ssh backdoor to VM tests infrastructure."
...
This reverts commit d6e3db44cf
.
See #53935 for explanations. In short, it may be causing issues with
tests on the build infrastructure.
2019-01-19 13:24:39 -05:00
worldofpeace
9d6fc7ad04
nixos/file-roller: init
2019-01-18 15:04:36 -05:00
Matthew Bauer
1ff9a93e1c
nixos/doc: bs=1000000 for dd args ( #54280 )
...
Not all dd implementations take ‘bs=1m’. Better to just list it out
fully to reduce potential for problems.
Fixes #54181 .
2019-01-18 19:19:00 +02:00
buffet
5c06a4a30c
Updated default DM
2019-01-18 18:11:00 +01:00
Florian Klink
4f11c06fac
programs.ssh.knownHosts: update example to be an attrset
...
We shouldn't encourage using a list here, but prefer the attrset.
Using a list here causes very unintuitive effects during merging.
2019-01-18 15:33:07 +01:00
step21
586bbd20e8
nixos/nixpkgs: virtualbox docs update ( #54247 )
2019-01-18 09:22:15 +00:00
Peter Hoeg
9f5b5fee9c
Merge pull request #48101 from peterhoeg/f/pykms_master
...
nixos pykms: run via DynamicUser
2019-01-18 15:52:12 +08:00
Peter Hoeg
eaa665e243
Merge pull request #53495 from peterhoeg/p/zm
...
zoneminder: init at 1.32.3 and add NixOS module
2019-01-18 15:49:28 +08:00
Jan Tojnar
23c1a234dc
Merge pull request #54124 from jtojnar/remove-packages-by-name
...
nixos/desktops: deduplicate removePackagesByName
2019-01-17 16:05:14 +01:00
Danylo Hlynskyi
23a13b562c
kernel config: add support for CONFIG_SQUASHFS_ZSTD ( #52967 )
...
Also, allow override `make-squashfs.nix` compression parameters.
2019-01-17 15:24:44 +02:00
Jörg Thalheim
a6b97bd1bb
Merge pull request #42183 from kisik21/master
...
nixos/stage-1, nixos/f2fs: added F2FS resizing
2019-01-17 07:42:32 +00:00
Jan Tojnar
bedc81fcb6
nixos/desktops: deduplicate removePackagesByName
...
GNOME, MATE and LxQt all use removePackagesByName. Let’s move it to a single
place, rename the attributes to meaningful name and add docs.
2019-01-17 07:13:25 +01:00
Maximilian Bosch
003132c2dd
nixos/prometheus: make source_labels
optional
...
It's possible to skip `source_labels` entirely, an example for this is
the blackbox exporter configuration:
https://github.com/prometheus/blackbox_exporter#prometheus-configuration
2019-01-16 14:01:43 +01:00
Vladyslav M
95a0e24381
Merge pull request #53952 from Ma27/improve-gitea-module
...
nixos/gitea: minor fixes
2019-01-15 23:55:16 +02:00
gnidorah
30ff54c348
way-cooler: 0.8.0 -> 0.8.1 ( #53220 )
2019-01-15 23:05:17 +02:00
Peter Hoeg
982354284d
zoneminder (nixos): add basic module
2019-01-15 21:27:45 +08:00
Peter Hoeg
9260623a18
zoneminder: add user for NixOS
2019-01-15 21:27:45 +08:00
Robert Hensing
db70173627
Revert "nixos/modules/misc/nixpkgs.nix: Use pure Nixpkgs function"
...
As a workaround for #51025 and
https://github.com/NixOS/nix/issues/1232
This reverts commit 5f894a67f5
.
2019-01-15 13:11:09 +01:00
Claudio Bley
4dbf45bc5e
programs/nano: Generate nanorc if syntaxHighlight
enabled
...
* prepend a newline to the `include` directive
* generate the nanorc by default, since `cfg.syntaxHighlight` is `true`
2019-01-14 23:27:04 +01:00
Linus Heckemann
783f2c84e8
nixos/zfs: autoscrub only after boot is complete
...
Fixes #53583
2019-01-14 21:00:20 +01:00
Franz Pletz
d947944d70
Merge pull request #53962 from elseym/sonarr
...
sonarr service: add more options to module
2019-01-14 19:33:58 +00:00
elseym
44e1aabd02
nzbget service: fix preStart script and add more options to module
2019-01-14 20:30:44 +01:00
elseym
31ad79f432
sonarr service: add more options to module
2019-01-14 20:30:10 +01:00
Maximilian Bosch
f90bd42c89
nixos/gitea: add git
to the service path
...
Otherwise commands like `git push` will fail if the machine doesn't have
git installed.
2019-01-14 16:04:02 +01:00
Maximilian Bosch
ad3a50e25b
nixos/gitea: add option to disable registration
...
Although this can be added to `extraOptions` I figured that it makes
sense to add an option to explicitly promote this feature in our
documentation since most of the self-hosted gitea instances won't be
intended for common use I guess.
Also added a notice that this should be added after the initial deploy
as you have to register yourself using that feature unless the install
wizard is used.
2019-01-14 16:04:02 +01:00
Franz Pletz
ca0639837c
Merge pull request #53871 from elseym/fix-container-extraveths
...
nixos/containers: explicitly set link up on host for extraVeths
2019-01-14 03:59:19 +00:00
Vladimír Čunát
9d16949d42
nixos manual: fix a typo that made it invalid XML
...
The problem was merge to master in the bfbadab4
commit.
2019-01-13 23:23:32 +01:00
Jörg Thalheim
bfbadab4a4
Merge pull request #53801 from Mic92/nixos-builders
...
nixos-rebuild: allow to override builders
2019-01-13 21:59:43 +00:00
Jan Tojnar
e35acd7f1c
gnome3: link nautilus-python paths to environment
2019-01-13 17:43:33 +01:00
Profpatsch
c8c53fcb11
modules/profiles/minimal: sound is disabled by default
...
The option is `false` by default since
e349ccc77f
, so we don’t need to mention
it explicitely in these minimal configs.
2019-01-13 13:47:36 +01:00
elseym
8a8bf886b5
nixos/containers: explicitly set link up on host for extraVeths
2019-01-13 11:27:39 +01:00
Vladimír Čunát
570d84a01e
Merge branch 'staging-next'
2019-01-13 00:39:38 +01:00
Silvan Mosberger
497e6f1705
Merge pull request #51661 from eonpatapon/testing-hosts
...
test: set machines fqdn in /etc/hosts
2019-01-12 20:41:13 +01:00
Frederik Rietdijk
9f827d66f5
Update nixos/doc/manual/man-nixos-rebuild.xml
...
Co-Authored-By: Mic92 <Mic92@users.noreply.github.com>
2019-01-12 18:26:00 +00:00
Frederik Rietdijk
f45195fb44
Update nixos/doc/manual/man-nixos-rebuild.xml
...
Co-Authored-By: Mic92 <Mic92@users.noreply.github.com>
2019-01-12 18:25:52 +00:00
Samuel Dionne-Riel
2646a64fbc
Merge pull request #53827 from samueldr/feature/data-in-logs
...
tests: Logs timing in tests
2019-01-12 12:54:56 -05:00
Samuel Dionne-Riel
3b68ddb6fe
Merge pull request #53828 from samueldr/feature/double-alarm-time
...
tests: Wait for shell for twice as long (10m)
2019-01-12 12:08:14 -05:00
Vladimír Čunát
bde8efe792
Merge branch 'master' into staging-next
...
A couple thousand rebuilds have accumulated on master.
2019-01-12 12:19:34 +01:00
Samuel Dionne-Riel
b28b37eb00
tests: Wait for shell for twice as long (10m)
...
See #49441 for an earlier attempt, which was subsequently reverted. I am
assuming that doubling the time will be sufficient if the machine is
overloaded since so many of the tests already pass at 5 minutes, while
still not holding back failures for needlessly long.
2019-01-11 22:40:19 -05:00
Samuel Dionne-Riel
5d93e2c01c
test-driver: Logs time taken for nests
2019-01-11 22:36:31 -05:00
Samuel Dionne-Riel
1fe0018df8
test-driver: Adds time it took to connect to guest in logs
...
This will make it possible to track whether the time is generous or not
when ran on hydra.
2019-01-11 22:36:31 -05:00