Commit Graph

20723 Commits

Author SHA1 Message Date
Isaac van Bakel
f689b8a65f Add notifier configs to grafana provisioning
Similar to dashboards and datasources, notifiers in Grafana can also be
provisioned. This adds them to the Grafana service definition.
2021-03-03 03:59:39 -05:00
Bernardo Meurer
dddf7b7806
Merge pull request #114884 from LuigiPiucco/pressure-vessel
steam: continuation of #114024 with missing edits
2021-03-03 01:53:16 +00:00
rnhmjoj
24e45e308d
nixos/lxd: fixup of 4adcb006 2021-03-03 01:16:41 +01:00
Luigi Sartor Piucco
7362bccc82 nixos/steam: enable 64 bit DRI by default 2021-03-02 16:17:53 -03:00
Linus Heckemann
08fc5e317c
Merge pull request #111802 from twhitehead/init-symlinks
nixos/stage1: chroot stage 2 init exists check so symlink resolve
2021-03-02 13:32:26 +01:00
Kim Lindberger
8eea5d0fbd
Merge pull request #114592 from etu/php-minor-fixes
php: various fixes
2021-03-02 09:41:15 +01:00
Elis Hirwing
db439da3cd
nixos/tests/php: Select the right versions of the tests depending on version 2021-03-02 09:22:33 +01:00
Elis Hirwing
1216baaee1
nixos/httpd: Fix httpd module for php8 2021-03-02 09:22:32 +01:00
Michele Guerini Rocco
ccc4bbdbe6
Merge pull request #114772 from rnhmjoj/anbox-no-udev-settle
nixos/anbox: remove systemd-udev-settle
2021-03-02 08:04:08 +01:00
Robert Hensing
f0e20e0975 acme: Determine offline whether renewal is due 2021-03-01 23:41:52 +01:00
rnhmjoj
879fcdf778
nixos/anbox: remove systemd-udev-settle
The anbox session manager seems to start without issues when
systemd-udev-settle is masked or the dependency removed.
2021-03-01 19:29:32 +01:00
Kim Lindberger
e72375464b
Merge pull request #113635 from talyz/gitlab-improvements
nixos/gitlab: Clean config dir, switch to puma, split PreStart script and more
2021-03-01 13:37:53 +01:00
rnhmjoj
538312709e
nixos/tcsd: several improvements and fixes
- Actually run tcsd as tss/tss
- Install a udev rule to set /dev/tpm* permissions
- Remove systemd-udev-settle dependency, use dev-tpm0.device instead
- Use systemd-tmpfiles to set up the state directory
- Add documentation URI to tcsd.service

This module cannot be easily tested with a NixOS test due to the TPM
dependency. Technically, one could be emulated using swtpm[1], but this
is not packaged in Nixpkgs. If you computer has a real TPM you can do a
passthrough in Qemu, but this requires running the VM as root and of
course it's not determinstic:

    $ nix build -f nixos vm --arg configuration '
      {
        virtualisation.qemu.options = [
          "-tpmdev passthrough,id=tpm0,path=/dev/tpm0,cancel-path=/sys/class/tpm/tpm0/cancel"
          "-device tpm-tis,tpmdev=tpm0"
        ];
        users.users.root.hashedPassword = "";
        services.tcsd.enable = true;
      }'

After starting the VM, log in as root, you can check the service has
started with `systemctl status tcsd`.

[1]: https://github.com/stefanberger/swtpm
2021-02-28 19:54:19 +01:00
Arnout Engelen
0aeba64fb2
squashfs: use -no-hardlinks for reproducible squashfs images (#114454)
the nix store may contain hardlinks: derivations may output them
directly, or users may be using store optimization which automatically
hardlinks identical files in the nix store.

The presence of these links are intended to be a 'transparent'
optimization. However, when creating a squashfs image, the image
will be different depending on whether hard links were present
on the filesystem, leading to reproducibility problems.

By passing '-no-hardlinks' to mksquashfs the files are stored
as duplicates in the squashfs image. Since squashfs has support
for duplicate files this does not lead to a larger image.

For more details see
https://github.com/NixOS/nixpkgs/issues/114331
2021-02-28 18:03:50 +00:00
Anderson Torres
e753d4c226
Merge pull request #95019 from SFrijters/xsession-env-vars
nixos/x11: Respect XCOMPOSECACHE/XDG_DATA_HOME if set in xsession-wrapper
2021-02-28 13:08:34 -03:00
Michele Guerini Rocco
77cd85e8ee
Merge pull request #114648 from rnhmjoj/lxd-no-udev-settle
nixos/lxd: cleanup and misc fixes
2021-02-28 15:28:48 +01:00
rnhmjoj
b9dc818bd5
nixos/lxd: make start timeout configurable 2021-02-28 14:02:56 +01:00
rnhmjoj
4adcb00642
nixos/lxd: cleanup and misc fixes
- Actually use the zfsSupport option
- Add documentation URI to lxd.service
- Add lxd.socket to enable socket activatation
- Add proper dependencies and remove systemd-udev-settle from lxd.service
- Set up /var/lib/lxc/rootfs using systemd.tmpfiles
- Configure safe start and shutdown of lxd.service
- Configure restart on failures of lxd.service
2021-02-28 14:02:56 +01:00
Elis Hirwing
c6f0a1db39
nixos/tests/php: Declare php package used instead of just using default 2021-02-28 12:37:05 +01:00
Robert Schütz
336c114214 alerta: move to all-packages.nix and use buildPythonApplication 2021-02-28 12:25:52 +01:00
Robert Schütz
3fcd9361b5 alerta-server: move to all-packages.nix and use buildPythonApplication 2021-02-28 12:25:47 +01:00
Milan Svoboda
df3d560999 nixos/nix-gc: add persistent and randomizeDelaySec options 2021-02-28 04:21:21 -05:00
Michele Guerini Rocco
f3ae13d608
Merge pull request #114568 from rnhmjoj/acpid-no-udev-settle
nixos/acpid: clean up the module
2021-02-28 09:19:14 +01:00
Michael Weiss
18df480d9b gollum: Transfer maintainership to erictapen
I'm not using Gollum anymore while Justin still uses it and has also
written the NixOS module. So it makes perfect sense to pass it on :)
2021-02-27 21:39:16 +01:00
Robert Schütz
5cc881d0d8 imagemagick: make 7.0 default 2021-02-27 18:34:36 +01:00
Stefan Frijters
580cf02c19
nixos/x11: Be more defensive when removing XCOMPOSECACHE 2021-02-27 17:55:58 +01:00
Stefan Frijters
ee713d36bc
nixos/x11: Respect XCOMPOSECACHE/XDG_DATA_HOME if set 2021-02-27 17:55:48 +01:00
Stefan Frijters
37460768e2
nixos/x11: Source .xprofile earlier in xsession-wrapper
This allows users to set e.g. XCOMPOSECACHE before it's used.
2021-02-27 17:55:47 +01:00
rnhmjoj
8e016023f8
nixos/acpid: clean up the module
- Use --netlink to avoid systemd-udev-settle[1]

- Run daemon in foreground which is preferred with systemd

- Add unit documentation

- Write ExecStart directly, no need for a script

[1]: 52bbd2b80b
2021-02-27 16:18:32 +01:00
Pavol Rusnak
01f1773e8e
trezord: don't trigger systemd-udev-settle 2021-02-27 12:35:04 +01:00
Matthew Bauer
c168e05c7e
Merge pull request #86239 from tathougies/patch-2
[nixos/prometheus] promTypes.filter.value -> promTypes.filter.values
2021-02-26 19:28:18 -06:00
Manuel Bärenz
17024be1d1
nixos/tests: add musescore 2021-02-26 20:26:02 -05:00
Florian Klink
0bdaff84e8
Merge pull request #113137 from lukegb/ceph
ceph: fix bluestore by using bundled rocksdb
2021-02-27 00:26:47 +01:00
Florian Klink
aed9171b1a
Merge pull request #111342 from veehaitch/systemd-networkd-options
nixos/networkd: add missing IPv6 options
2021-02-27 00:16:20 +01:00
Florian Klink
d52d0a1d73
Merge pull request #114464 from rnhmjoj/ksm
nixos/ksm: rewrite using systemd-tmpfiles
2021-02-26 22:43:59 +01:00
Florian Klink
43f83f9c45
Merge pull request #75866 from Sohalt/spnav
libspnav: init at 2.3.0
2021-02-26 22:21:21 +01:00
rnhmjoj
48052ca0dd
nixos/ksm: remove udev-settle dependency
The sysfs file /sys/kernel/mm/ksm/run seems to be available as soon as
the kernel has started, so no point in waiting for udev to "settle". If
for some reason it doesn't, we let the unit fail explicitly.
2021-02-26 22:10:10 +01:00
Florian Klink
1624ae8a96
Merge pull request #100433 from Patryk27/fixes/38509
nixos/containers: allow containers with long names to create private networks
2021-02-26 21:35:07 +01:00
talyz
ca725e7fcd
nixos/gitlab: Add gitlab.target
To make it easier to start and stop all GitLab services, introduce
`gitlab.target` which wants all services (meaning they will start with
it) and which all services are part of (meaning they will stop with
it).
2021-02-26 19:54:23 +01:00
talyz
f38c601b54
nixosTests.gitlab: Test pages and mailroom service start
Make sure that the `gitlab-pages` and `gitlab-mailroom` services at
least start.
2021-02-26 19:54:11 +01:00
talyz
9d4e76dd46
nixos/gitlab: Make gitlab.service's PreStart into two new services
Make the config initialization script run in gitlab.service's PreStart
section into two new services, `gitlab-config.service` and
`gitlab-db-config.service`. Other services can then depend on the
config scripts they need instead of unnecessarily depending on
`gitlab.service`. This makes the reason for the configured service
dependencies much clearer and should also reduce the restart time of
the `gitlab` service quite a lot, when triggered manually.

Also, set up stricter service dependencies, using `bindsTo`, to ensure
that if a service fails or is stopped, its dependants are also
stopped. For example, if we're using the `postgresql` service and it's
stopped, `gitlab.service` and `gitlab-sidekiq.service`, which depend on
it to function, should also be stopped.
2021-02-26 19:54:05 +01:00
Patryk Wychowaniec
336ef2de99
nixos/containers: allow containers with long names to create private networks
Launching a container with a private network requires creating a
dedicated networking interface for it; name of that interface is derived
from the container name itself - e.g. a container named `foo` gets
attached to an interface named `ve-foo`.

An interface name can span up to IFNAMSIZ characters, which means that a
container name must contain at most IFNAMSIZ - 3 - 1 = 11 characters;
it's a limit that we validate using a build-time assertion.

This limit has been upgraded with Linux 5.8, as it allows for an
interface to contain a so-called altname, which can be much longer,
while remaining treated as a first-class citizen.

Since altnames have been supported natively by systemd for a while now,
due diligence on our side ends with dropping the name-assertion on newer
kernels.

This commit closes #38509.

systemd/systemd#14467
systemd/systemd#17220
https://lwn.net/Articles/794289/
2021-02-26 17:48:49 +01:00
Patryk Wychowaniec
5f1345a303
nixos/containers: styling improvements 2021-02-26 17:44:14 +01:00
rnhmjoj
ed0a29c88d
nixos/test/ksm: add simple test 2021-02-26 13:06:18 +01:00
Frederik Rietdijk
c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
WORLDofPEACE
1546bea850
Merge pull request #111462 from jakobrs/msize
nixos/qemu-vm: add virtualisation.msize option
2021-02-25 21:06:27 -05:00
Daniel Nagy
930e3679f4 nixos/test/unbound: add tests for DNS over HTTPS 2021-02-25 18:37:57 -05:00
ilian
be9d37e2f0 nixos/steam: Add port forwarding options 2021-02-25 23:08:57 +01:00
WORLDofPEACE
9e84dc00b0 nixos/plymouth: use white nixos logo
This looks cohesive with the spinner in the bgrt theme.
2021-02-25 16:46:03 -05:00
WORLDofPEACE
6bd4f9a3c5 nixos/plymouth: use bgrt theme
The BGRT theme is probably a close as to "FlickerFree" we can
get without https://github.com/NixOS/nixpkgs/pull/74842.
It's more agnostic than the Breeze theme.

We also install all of themes provided by the packages, as it's possible
that one theme needs the ImageDir of another, and they're small files
anyways.

Lastly, how plymouth handles logo and header files is
a total mess, so hopefully when they have an actual release
we won't need to do all this symlinking.
2021-02-25 16:46:03 -05:00
WORLDofPEACE
726dd9804e nixos/plymouth: exit on missing theme
Much better to provide a helpful message than to
get an obscure sed message.
2021-02-25 16:46:03 -05:00
Tyson Whitehead
aed7c9a22a
stage-1: accept init symlinks at any level 2021-02-25 15:58:18 -05:00
Edmund Wu
f4208fe9f9 nixos/plymouth: use upstream defaults
https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/101
75204a2517/src/plymouthd.defaults
2021-02-25 15:18:49 -05:00
Anders Christiansen Sørby
a4cbbc027f
nixos/minetest-server: Fix port coercion
Fix coercion of minetest-server port.
2021-02-25 19:03:13 +01:00
Aaron Andersen
890327d751
Merge pull request #106698 from aanderse/nixos/clamav
nixos/clamav: add settings options to replace extraConfig options
2021-02-24 22:57:41 -05:00
Maximilian Bosch
797721423c
nixos/nextcloud: update nginx config
Please note that I didn't use the current nginx config from the
administration manual as this would've broken ACME challenges[1].

Also added a fix for Microsoft clients.

[1] https://github.com/nextcloud/documentation/pull/5825#issuecomment-783977761
2021-02-24 23:01:14 +01:00
Maximilian Bosch
b1f65920c3
nixos/nextcloud: add defaultPhoneRegion option for v21 2021-02-24 22:27:39 +01:00
Cole Helbling
1b37f66fc1 nixos/zrepl: init
zrepl is a ZFS backup and replication tool written in Go.
2021-02-24 11:56:02 -08:00
talyz
53d9ec83ff
nixos/gitlab: postgresql: Make PSQL a function, run as superUser
A function is more appropriate for this use. See
http://mywiki.wooledge.org/BashFAQ/050 for reference.

Also, we don't need to run the service as root: since we essentially
run all commands as `services.postgresql.superUser` anyway, the whole
service can just run as that user instead.
2021-02-24 18:32:31 +01:00
talyz
2b3800b9c7
nixos/gitlab: Change default SMTP port, enable postfix only if used
Change the default SMTP port to `25`, to better match the default
address `localhost`. This gets rid of some error outputs in the test,
where it fails to connect to localhost:465.

Also, don't enable postfix by default unless it's actually useful to
us.
2021-02-24 18:32:24 +01:00
talyz
f8ab43ef7b
nixos/gitlab: Switch from unicorn to puma
Puma is the new upstream default server since GitLab 13.
2021-02-24 18:31:30 +01:00
talyz
2ec397ff9f
nixos/gitlab: Clean up the config dir more thoroughly
This removes all the subdirectories in `config` on start.

From one version of GitLab to the next, the files in the `config`
directory changes. Since we're only overwriting the existing files
with ones from the repo, cruft sometimes gets left behind,
occationally causing issues.

Ideally, all configuration put in the `config` directory is declared
by NixOS options and we could just remove the whole directory on
start, but I'm not sure if that's the case. It would also require a
little bit of additional rework and testing. The subdirectories,
however, should seldom contain user configuration and the ones that
frequently does, `initializers`, is already removed on start.
2021-02-24 18:31:24 +01:00
Tim Steinbach
af2e9e5046 sbt: Replace VM test with installCheckPhase 2021-02-24 09:51:14 -05:00
Aaron Andersen
fbecdac147
Merge pull request #113487 from aanderse/nixos/galera
nixos/mysql: properly configure mariadb for galera recovery
2021-02-24 08:49:54 -05:00
adisbladis
779ed9ea77
Merge pull request #106983 from bachp/geth-service
nixos/geth: initial service
2021-02-23 20:54:06 +01:00
Bernardo Meurer
cdcaafc3fe
Merge pull request #114024 from LuigiPiucco/pressure-vessel
steam: fix proton versions with pressure-vessel
2021-02-23 19:20:12 +00:00
Pascal Bach
3ec9637a05 nixos/geth: initial service 2021-02-23 19:28:51 +01:00
freezeboy
10fa80fd30 nixos/tests: new test for plikd 2021-02-23 15:35:52 +01:00
freezeboy
fc2ae7d79e nixos/plikd: Add new service module 2021-02-23 15:35:16 +01:00
Anderson Torres
3ac8480383
Merge pull request #114048 from NeQuissimus/jq
jq: Replace VM test
2021-02-22 22:15:08 -03:00
Tim Steinbach
4fb9ba02e4
jq: Replace VM test 2021-02-22 18:51:28 -05:00
Florian Klink
f3af2df658
Merge pull request #111635 from xaverdh/hide-pid-broken
nixos/hidepid: remove module, it's broken
2021-02-23 00:20:29 +01:00
Florian Klink
47589ade46
Merge pull request #113804 from rnhmjoj/no-udev-settle-2
nixos/console: fix console setting reloading
2021-02-22 23:22:04 +01:00
Luigi Sartor Piucco
f9d9740e68 steam module: add proper steam.run as well 2021-02-22 14:35:45 -03:00
Luigi Sartor Piucco
e358a6f4fd steam: add drivers to bwrap 2021-02-22 14:35:44 -03:00
Tim Steinbach
cb72a93d2e sbt-extras: Convert VM test into installCheckPhase 2021-02-22 10:07:42 -05:00
github-actions[bot]
8b6e6ae050
Merge master into staging-next 2021-02-22 12:16:58 +00:00
Maximilian Bosch
f7011c70f3
nextcloud21: init at 21.0.0, set as default version
ChangeLog: https://nextcloud.com/changelog/#latest21

* Packaged 21.0.0, test-deployed it to my personal instance and tested
  the most basic functionality (`davfs2`-mount, {card,cal}dav sync, file
  management).

* Bumped the default version for unstable/21.05 to `nextcloud21`. Since
  `nextcloud20` was added after the release of 20.09 (and thus the
  default on 20.09 is still `nextcloud19`), it's now needed to upgrade
  across two majors.

  This is not a problem though since it's possible to upgrade to v20 on
  20.09 already and if not, the module will guard the administrator
  through the upgrade with eval warnings as it's the case since 20.03.

* Dropped `nextcloud17` attribute and marked `nextcloud18` as EOL.
2021-02-22 13:04:42 +01:00
Thomas Bereknyei
a9d88757eb bind: add required config to test 2021-02-22 02:17:24 -05:00
github-actions[bot]
d8f2a7bf5c
Merge master into staging-next 2021-02-22 00:37:52 +00:00
Robert Hensing
2c0bb4d969
Merge pull request #113944 from xoe-labs/da/fixup-sd-card-move
installer: fixup sd-card folder move from #110827
2021-02-21 23:27:02 +01:00
adisbladis
21ca496b1d
Merge pull request #113886 from davidak/traefik-oci-containers
traefik: update test to use virtualisation.oci-containers
2021-02-21 22:45:25 +01:00
David Arnold
6a3855af2b
Merge branch 'master' into da/fixup-sd-card-move 2021-02-21 16:39:38 -05:00
Jörg Thalheim
a9bf245393
Merge pull request #113772 from Mic92/pipewire
nixos/pipewire: only enable media-session if pipewire is enabled
2021-02-21 21:21:51 +00:00
David Arnold
6bfaed9b2c
installer: fixup sd-card folder move from #110827 2021-02-21 16:12:54 -05:00
WORLDofPEACE
0c3514f782
Merge pull request #99011 from andersk/plymouth-label
nixos/plymouth: Add label plugin and a font to the initrd
2021-02-21 15:44:54 -05:00
Anders Kaseorg
9d21f1dfab nixos/plymouth: Add label plugin and a font to the initrd
This allows Plymouth to show the “NixOS 21.03” label under the logo at
startup like it already does at shutdown.

Fixes #59992.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-02-21 10:27:15 -08:00
github-actions[bot]
93b17c1b4d
Merge master into staging-next 2021-02-21 18:17:22 +00:00
Robert Hensing
92b1ef601c
Merge pull request #110827 from xoe-labs/da/sd-are-no-installation-devices
installer: split sd cards -> base for bespoke sd images
2021-02-21 18:34:47 +01:00
WORLDofPEACE
4287f5adfa
Merge pull request #100569 from andersk/gdm-plymouth
nixos/gdm: Conflict plymouth-quit, but more carefully
2021-02-21 11:03:18 -05:00
Guillaume Girol
aed173ff97
Merge pull request #113904 from ju1m/dnscrypt-proxy2
nixos/dnscrypt-proxy2: reallow @sync syscalls
2021-02-21 14:17:24 +00:00
Julien Moutinho
862481560c nixos/dnscrypt-proxy2: reallow @sync syscalls 2021-02-21 14:53:54 +01:00
Guillaume Girol
1d55adbce8
Merge pull request #113237 from jflanglois/fix-kmscon
nixos/services/kmscon: fix systemd configuration
2021-02-21 13:43:31 +00:00
Dominik Xaver Hörl
f7fce2c52f nixos/rl-2105: document removal of the hidepid module 2021-02-21 13:51:37 +01:00
Dominik Xaver Hörl
893d911b55 nixos/hidepid: drop the module as the hidepid mount option is broken
This has been in an unusable state since the switch to cgroups-v2.
See https://github.com/NixOS/nixpkgs/issues/73800 for details.
2021-02-21 13:51:37 +01:00
github-actions[bot]
cf22d5fee7
Merge master into staging-next 2021-02-21 12:19:43 +00:00
Florian Klink
e3d3643f1b nixos/release-notes/rl-2105.xml: fix typo 2021-02-21 13:14:55 +01:00
WORLDofPEACE
4efb432e72
Merge pull request #113850 from nbraud/rngd
nixos/rngd: Remove module entirely, leave an explanation
2021-02-21 07:11:04 -05:00
WORLDofPEACE
3c88820235 rl-2105: rngd 2021-02-21 07:09:13 -05:00
rnhmjoj
9be0529210
nixos/console: fix console setting reloading
It's a dull and boring day, it's cold outside and I'm stuck at home: let
me tell you the story of systemd-vconsole-setup.

In the beginnings of NixOS[1], systemd-vconsole-setup was a powerful
sysinit.target unit, installed and running at boot to set up fonts
keyboard layouts and even colors of the virtual consoles. If needed, the
service would also be restarted after a configuration change, consoles
were happy and everything was good, well, almost.

Since the service had no way to specify the dependency "ttys are ready",
modesetting could sometimes happen *after* systemd-vconsole-setup had
started, leaving the console in a broken state. So abbradar worked
around that by putting a systemd-udev-settle `After=`.

In the meanwhile, probably realizing their mistake, systemd added a
shiny udev rule to start the systemd-udev-settle at the right time[2].
However, the rule bypassed systemd by directly running the binary
`systemd-udev-settle`, and the service - though still installed - fell
into disuse.

Two years would pass before a good samaritan, seeing the poor jobless
systemd-udev-settle service, decided to give it the coup de grâs[3] by
unlisting it from the installed units.
This, combined with another bug, caused quite a commotion[4] in NixOS;
to see why remember the fact that `WantedBy=` in upstream units doesn't
work[5], so it had to be added manually in cc542110, but while systemd
removed it, the NixOS unit continued to install and restart the service,
making a lot of fuss when switching configuration.

After at least thee different tentative fixes, deedrah realised[6] what
the root cause was and fpletz put the final nail[7] in the coffin of
systemd-udev-settle. The service would never see the light of a boot
again, NixOS would not restart it all the time but thanks to udev
consoles would still get their pretty fonts and playful colors.

The En..

..no, wait! You should ask what came of systemd-udev-settle, first.
And why is the service even around if udev is doing all the work?

Udev-settle, like the deceitful snake that he is, laid hidden for years.
He looks innocuous doesn't it? A little hack. Only until it leaves his
den and a poor user[8] drops dead. Obviously, it serves no purpose, as
the service is not part of the boot process anymore, so let's remove it
for good!

About the service, it may not be useful at boot, but it can be started
to pick up changes in vconsole.conf and set the consoles accordingly.
But wait, this doesn't work anymore: the service is never started at
boot (remember f76d2aa6), so switch-to-configuration.pl will not restart
it. Fortunately it can be repaired: here I install a new unit which
does *nothing* on start, but restarts the real service when reloaded.
This perfectly reproduces the original behavior, hopefully without the
original bugs too.

The End?

[1]: cc54211069
[2]: f6ba8671d8 (diff-84849fddcef81458f69725dc18c6614aade5c4f41a032b6908ebcf1ee6740636)
[3]: 8125e8d38e
[4]: https://web.archive.org/web/20180603130107/https://github.com/NixOS/nixpkgs/issues/22470
[5]: https://github.com/NixOS/nixpkgs/issues/81138
[6]: https://web.archive.org/web/20180603130107/https://github.com/NixOS/nixpkgs/issues/22470#issuecomment-330930456
[7]: f76d2aa6e3
[8]: https://github.com/NixOS/nixpkgs/issues/107341
2021-02-21 10:27:34 +01:00
davidak
193bf09ef7 traefik: update test to use virtualisation.oci-containers 2021-02-21 09:16:04 +01:00
github-actions[bot]
2c8fa86436
Merge master into staging-next 2021-02-21 06:16:32 +00:00
davidak
01148a5ba7
Merge pull request #111642 from turion/dev_test_keepassxc
nixos/tests: add keepassxc
2021-02-21 03:12:07 +01:00
github-actions[bot]
dc31fd042c
Merge master into staging-next 2021-02-21 00:38:49 +00:00
nicoo
16b6c4b2d7 nixos/manual/virtualbox-guest: Remove mentions of rngd 2021-02-21 01:37:18 +01:00
nicoo
d7c15d0eec nixos/hyperv-guest: rngd was removed, no need to disable it 2021-02-21 01:34:56 +01:00
nicoo
c8dcbfc047 nixos/swap: Remove dependency on rngd (module removed) 2021-02-21 01:33:50 +01:00
nicoo
39383a8494 nixos/rngd: Remove module entirely, leave an explaination
Per @shlevy's request on #96092.
2021-02-21 01:32:50 +01:00
Florian Klink
d0be6dcd70
Merge pull request #110784 from talyz/gce-fetch-ssh-keys
google-compute-config: Reintroduce fetch-ssh-keys
2021-02-20 22:19:53 +01:00
Michele Guerini Rocco
19d715c573
Merge pull request #107382 from rnhmjoj/no-udev-settle
nixos/{networkd,dhcpcd}: remove udev-settle hack
2021-02-20 20:49:19 +01:00
Vladimír Čunát
008a2b2949
Merge #112674: nixos/tests/networking: fix DHCP race 2021-02-20 20:23:38 +01:00
Jörg Thalheim
f3918b4bc3
nixos/pipewire: only enable media-session if pipewire is enabled 2021-02-20 13:42:18 +01:00
github-actions[bot]
4c0670dace
Merge staging-next into staging 2021-02-20 06:17:59 +00:00
Sandro
38769f8a26
Merge pull request #113715 from vojta001/miniflux-docs
miniflux: fix link to docs
2021-02-20 06:09:00 +01:00
github-actions[bot]
abe7db36a4
Merge staging-next into staging 2021-02-20 00:36:40 +00:00
Aaron Andersen
cb2bce709f
Merge pull request #83479 from matt-snider/nixos/etesync-dav
nixos/etesync-dav: init module
2021-02-19 19:02:37 -05:00
David Arnold
68afbf9d63 installer: add deprecation warning about sd-card file move 2021-02-19 19:00:19 -05:00
David Arnold
1009c09b4f installer: amend release with sd-card file move 2021-02-19 19:00:19 -05:00
David Arnold
481f68f1a5 installer: add back-compat files for sd-card image folder move 2021-02-19 19:00:19 -05:00
David Arnold
3c744bf68d installer: split sd-card into installer & base for bespoke image 2021-02-19 19:00:19 -05:00
David Arnold
3323b0ff0d
installer: move ./cd-dvd/sd-card* -> ./sd-card/ 2021-02-19 18:56:23 -05:00
Rémy Grünblatt
8f84dab8a1 galene: 0.2 -> 0.3 and bugfix of the associated module 2021-02-19 21:26:08 +01:00
Florian Klink
68496cb927
Merge pull request #113570 from xaverdh/remove-systemConfig
Remove system config kernel parameter
2021-02-19 20:43:07 +01:00
Vojtěch Káně
d51ec7e83d miniflux: fix link to docs 2021-02-19 20:14:14 +01:00
Jan Tojnar
8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
Guillaume Girol
56923181e9
Merge pull request #107402 from ctem/fix/luksroot-master
boot.initrd.luks: add reusePassphrases support for YubiKey 2FA
2021-02-19 15:42:45 +00:00
talyz
95f96de78e
gce/fetch-ssh-keys: Put script in separate file, use PrivateTmp...
...check the script with shfmt and shellcheck + some other minor
refactoring.
2021-02-19 15:17:12 +01:00
Sandro
4b694d5e3d
Merge pull request #113674 from SuperSandro2000/fix-collection16 2021-02-19 13:27:03 +01:00
rnhmjoj
d683d26d89
nixos/release-notes: warn on interface renaming 2021-02-19 09:26:14 +01:00
rnhmjoj
aafaf3ba97
nixos/docs: add section on renaming interfaces 2021-02-19 09:26:14 +01:00
rnhmjoj
7384c81e98
nixos/tests/networking: test interface renaming 2021-02-19 09:26:14 +01:00
rnhmjoj
8e59a682a5
nixos/udev: add option to install rules in initrd
Note: this moves the example rule used to rename network interfaces in
the new udev.initrdRules option, which is required since 115cdd1c.
2021-02-19 09:26:13 +01:00
zowoq
3dab057264 Merge staging-next into staging 2021-02-19 10:47:46 +10:00
Sandro Jäckel
c75d7d2f8c
nixos/grub: fix editor check 2021-02-18 22:25:57 +01:00
rnhmjoj
65325292da
nixos/stage-1: install networkd link files
Renaming an interface must be done in stage-1: otherwise udev will
report the interface as ready and network daemons (networkd, dhcpcd,
etc.) will bring it up. Once up the interface can't be changed and the
renaming will fail.

Note: link files are read directly by udev, so they can be used even
without networkd enabled.
2021-02-18 22:07:00 +01:00
rnhmjoj
15d6eacb15
nixos/{networkd,dhcpcd}: remove udev-settle hack
systemd-udev-settle is a terrible hack[1] and should never[2] ever[3]
used, seriously it's very bad. It was used as a stop-gap solution for
issue #39069, but thanks to PR #79532 it can be removed now.

[1]: https://github.com/systemd/systemd/issues/7293#issuecomment-592941764
[2]: https://github.com/NixOS/nixpkgs/issues/73095
[3]: https://github.com/NixOS/nixpkgs/issues/107341
2021-02-18 22:07:00 +01:00
Dominik Xaver Hörl
0e8d7f9b3d nixos/install-grub: normalize whitespace 2021-02-18 20:51:34 +01:00
Maximilian Bosch
2ec9a72b80
Merge pull request #113584 from sternenseemann/openldap-tests
nixos/tests/openldap: fix evaluation when auto-called
2021-02-18 20:49:14 +01:00
Chuck
83de9e2d12 prometheus-systemd-exporter: Init at 0.4.0 2021-02-18 09:56:45 -08:00
Daniël de Kok
6e10cf2c1c
Merge pull request #108045 from mmilata/moinmoin-module-fix
nixos/moinmoin: fix module by switching to eventlet worker
2021-02-18 16:13:22 +01:00
Peter Hoeg
c382780e9b nixos/bluetooth: fix more stupidity on my part
Say this 10 times so I don't forget:

 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.
 - just because something has been tested and confirmed working, doesn't
   mean that a trivial change can go in without testing simply because
   it looks OK. test, test, test.

I'm sorry guys.
2021-02-18 14:54:19 +00:00
sohalt
725966b870 nixos/spacenavd: init 2021-02-18 15:08:20 +01:00
sternenseemann
281a2401b2 nixos/tests/openldap: make openldap test auto-callable
The NixOS manual documents that you can invoke every tests using

    nix-build path/to/nixos/tests/test.nix

which was not the case for openldap since it is not autocallable, but
requires pkgs and system as arguments. Usually, make-test-pythons.nix
takes care of this if it is imported at the top-level, but since
openldap.nix contains multiple tests, this was not the case.

This is however easily fixed by:

* Adding default values for the pkgs and system arguments based on the
  definition in make-test-python.nix
* Passing pkgs and system explicitly to make-test-python.nix to ensure
  the pkgs and system values passed from all-tests.nix are used.
2021-02-18 13:04:08 +01:00
Dominik Xaver Hörl
3629c74c10 nixos/rl-2105: document removal of systemConfig parameter 2021-02-18 12:48:08 +01:00
Dominik Xaver Hörl
61d746a7d3 nixos: don't set systemConfig for stage-2
Since c4f910f550, this is no longer
needed, because stage-2 is already generated with the path hard wired anyway.
2021-02-18 12:48:08 +01:00
Arian van Putten
5276ebb5ee nixos: Get rid of systemConfig kernel parameter
It was introduced in c10fe14 but removed in c4f910f.

It remained such that people with older generations in their boot
entries could still boot those. Given that the parameter hasn't had any
use in quite some years, it seems safe to remove now.

Fixes #60184
2021-02-18 12:48:08 +01:00
Jacek Galowicz
bc7a369c68
Merge pull request #112961 from r-burns/nixos-test-grub
nixosTests.installer: fix non-zfs grub tests
2021-02-18 11:58:57 +01:00
Ryan Burns
5406db08bf nixosTests.installer: increase EFI partition size
Needed for simpleUefiGrub test to pass on aarch64
Runs out of space otherwise
2021-02-18 01:58:25 -08:00
Sandro Jäckel
754a8db42d
nixos/printing: remove google cloud print 2021-02-18 02:21:38 +01:00
Aaron Andersen
4b9262786d nixos/mysql: properly configure mariadb for galera recovery 2021-02-17 15:50:20 -05:00
github-actions[bot]
9d6726a2e3
Merge staging-next into staging 2021-02-17 18:14:09 +00:00
github-actions[bot]
afcea01614
Merge master into staging-next 2021-02-17 18:14:04 +00:00
Eelco Dolstra
dd63561bcb Remove ripgrep test
VM tests are expensive (and prone to random failures) so they should
only be used for things that can only be tested in a VM, not for
things that could be tested in a regular checkPhase or derivation.
2021-02-17 17:57:09 +01:00
Maximilian Bosch
910e103fcb
Merge pull request #113323 from witchof0x20/nextcloud_redirect_fix
nixos/nextcloud: DAV .well-known redirect fix
2021-02-17 17:23:35 +01:00
Francesco Gazzetta
d56f72178e nixos/mlmmj: use appropriate postfix options
instead of extra*

should make the module more interoperable with others
2021-02-17 16:00:59 +00:00
Francesco Gazzetta
7596e7a495 nixos/mlmmj: add more list headers
since we already add a couple of default headers, it makes sense to have
a sensible default and add the unsubscribe header and friends
2021-02-17 15:59:06 +00:00
Justin Humm
40f60919ab nixos/mastodon: fix group membership for nginx
4255954d97 set the StateDirectory to 0750,
but nginx wasn't in the Mastodon group. This commit also deletes a line,
that probably was intended to serve this purpose, but makes no sense.
Why should the Mastodon user be added as an extraGroup to the nginx
user?
2021-02-17 15:16:14 +01:00
github-actions[bot]
41b30ed9a6
Merge staging-next into staging 2021-02-17 12:20:08 +00:00
github-actions[bot]
f68cf6f574
Merge master into staging-next 2021-02-17 12:20:00 +00:00
Matt Snider
58058515a3
nixos/etesync-dav: init module 2021-02-17 10:43:08 +01:00
ilian
29a6c9b9a3 nixos/hypervGuest: add Microsoft Synthetic Keyboard driver
Ensure that the HyperV keyboard driver is available in the early
stages of the boot process. This allows the user to enter a disk
encryption passphrase or repair a boot problem in an interactive
shell.
2021-02-17 08:01:34 +00:00
Jörg Thalheim
9783fa9554
Merge pull request #110615 from jansol/pipewire 2021-02-17 07:41:27 +00:00
github-actions[bot]
cd9df16806
Merge staging-next into staging 2021-02-17 06:14:55 +00:00
github-actions[bot]
3ed237717a
Merge master into staging-next 2021-02-17 06:14:47 +00:00
Peter Hoeg
bf11a28bd3 nixos/bluetooth: hotfix for stupidity 2021-02-17 05:58:08 +00:00
Peter Hoeg
1a4c039432 nixos/bluetooth: add support for disabling plugins 2021-02-17 02:40:59 +00:00
github-actions[bot]
3e0ef2752a
Merge staging-next into staging 2021-02-17 00:36:34 +00:00
github-actions[bot]
79b7a67b55
Merge master into staging-next 2021-02-17 00:36:31 +00:00
WORLDofPEACE
8a2bd1342e
Merge pull request #113064 from worldofpeace/fix-108124
nixos/tools: make desktopConfiguation types.listOf types.lines
2021-02-16 15:16:53 -05:00
github-actions[bot]
c0f4dcb71d
Merge staging-next into staging 2021-02-16 18:17:00 +00:00
github-actions[bot]
287495a7aa
Merge master into staging-next 2021-02-16 18:16:57 +00:00
Jade
f83d4f86d5
Nextcloud redirect fix 2021-02-16 11:58:38 -05:00
Izorkin
96f0c2c191 mastodon, nixos/mastodon: use the same nodejs package in package and module 2021-02-16 17:57:31 +01:00
Julien Langlois
f3828c53c9
nixos/services/kmscon: fix systemd configuration
This fixes https://github.com/NixOS/nixpkgs/issues/112616
2021-02-15 16:58:54 -05:00
Matej Urbas
a6766bee7b virtualization/amazon-init: enable option 2021-02-15 18:44:34 +00:00
github-actions[bot]
e88fb2d10c
Merge staging-next into staging 2021-02-15 18:17:10 +00:00
github-actions[bot]
0ca7d945c2
Merge master into staging-next 2021-02-15 18:17:06 +00:00
Maximilian Bosch
274109a8d6
Merge pull request #113108 from Ma27/nextcloud-acme
nixos/nextcloud: fix regex to not return 404 on ACME challenges
2021-02-15 18:53:35 +01:00
Maximilian Bosch
31864de85d
Merge pull request #113187 from Ma27/nextcloud-dav
nixos/nextcloud: redirect /.well-known/*dav to https url
2021-02-15 18:53:19 +01:00
Leonard Pollak
a9a100adf6 nixos/ceph: fix ceph.client.extraOptions type 2021-02-15 14:56:26 +01:00
github-actions[bot]
a1d9d57051
Merge staging-next into staging 2021-02-15 12:20:16 +00:00
github-actions[bot]
cd518a718b
Merge master into staging-next 2021-02-15 12:20:12 +00:00
Lassulus
2489d95c1c
Merge pull request #110627 from 4z3/use-real-user-name-for-per-user-packages
nixos/users: use proper name for per-user packages
2021-02-15 12:45:24 +01:00
Izorkin
e3a7270e3d nixos/mastodon: fix mastodon-init-db script 2021-02-15 11:43:03 +01:00
Izorkin
4255954d97 nixos/mastodon: optimize permissions 2021-02-15 11:43:03 +01:00
Izorkin
424e7b0f5d nixos/mastodon: use unix socket to default 2021-02-15 11:43:03 +01:00
Izorkin
f1adea1a94 nixos/mastodon: add option trustedProxy 2021-02-15 11:43:03 +01:00
Maximilian Bosch
f89652a23e
nixos/nextcloud: redirect /.well-known/*dav to https url
Fixes #113155
2021-02-15 11:03:12 +01:00
github-actions[bot]
018f748b81
Merge staging-next into staging 2021-02-15 00:37:07 +00:00
github-actions[bot]
0630986bf7
Merge master into staging-next 2021-02-15 00:37:03 +00:00
Jan Solanti
3d69688289 pipewire: rename pwms to media-session 2021-02-14 23:54:23 +02:00
Jan Solanti
b9b9fff6d6 pipewire: use strictly upstream defaults 2021-02-14 23:54:17 +02:00
Aaron Andersen
796e3d6ff6
Merge pull request #111695 from jansol/xow
xow: fix service
2021-02-14 13:32:55 -05:00
github-actions[bot]
056f697397
Merge staging-next into staging 2021-02-14 18:16:17 +00:00
github-actions[bot]
4f3b8e7b41
Merge master into staging-next 2021-02-14 18:16:14 +00:00
Luke Granger-Brown
bfc11c643d nixos/tests/ceph-single-node-bluestore: init
The current Ceph tests use the old method for OSDs to store data on
disks, known as Filestore. This means there are no tests for the
Bluestore functionality that run on install, which means that things
like RocksDB being broken can slip through and break the Bluestore
functionality in a subtle and difficult to debug manner.

Add a test to check that Bluestore works, at least on a single node.
2021-02-14 18:05:57 +00:00
Jean-Paul Calderone
9338023577
Fix typo in the GitLab smtp auth options docs 2021-02-14 09:55:54 -05:00
Maciej Krüger
8429831b67
Merge pull request #112746 from mkg20001/qemu-extra-disks 2021-02-14 13:20:44 +01:00
Maciej Krüger
59eb6d3ee3
nixosTests.*: update to use virtualisation.fileSystems 2021-02-14 12:23:50 +01:00
Maximilian Bosch
055b7e2a5d
nixos/nextcloud: fix regex to not return 404 on ACME challenges
Fixes #113027
2021-02-14 12:23:16 +01:00
github-actions[bot]
45fadd9b7f
Merge staging-next into staging 2021-02-14 00:37:59 +00:00
github-actions[bot]
8d8fe35281
Merge master into staging-next 2021-02-14 00:37:56 +00:00
pasqui23
04ef00987a
nixos/switcheroo-control: add to modules-list.nix (#113052) 2021-02-14 01:06:01 +01:00
WORLDofPEACE
452f7e14d4 nixos/tools: generate an xserver config
The desktop configuration won't enable xserver.
If there's multiple desktops enabled they will now evaluate properly.
2021-02-13 18:46:01 -05:00
WORLDofPEACE
94f0210e60 nixos/tools: make desktopConfiguation types.listOf types.lines
This fixes #108124.
2021-02-13 18:45:27 -05:00
Martin Weinelt
286f8cdbfc Merge branch 'master' into staging-next 2021-02-14 00:40:47 +01:00
zowoq
37f1ed7ca4 nixos/podman: install systemd files
- install podman service and socket
- install podman tmpfile
2021-02-14 06:57:39 +10:00
github-actions[bot]
d10b7b45fb
Merge staging-next into staging 2021-02-13 18:16:03 +00:00
github-actions[bot]
1c7975a26f
Merge master into staging-next 2021-02-13 18:15:59 +00:00
Ninjatrappeur
2f80425e6e
Merge pull request #112801 from erosennin/prosody-tests
nixos/prosody: fix broken tests
2021-02-13 15:22:48 +01:00
Milan
3b77e7c967
nixos/jitsi-videobridge: add apis option (#112960)
The `--apis=` command line parameter passed to Jitsi Videobridge is
required to monitor a Jitsi Meet instance for example via the prometheus
exporter [jitsiexporter](https://git.xsfx.dev/prometheus/jitsiexporter).
2021-02-13 15:04:58 +01:00
github-actions[bot]
37c77840b8
Merge staging-next into staging 2021-02-13 12:19:41 +00:00
github-actions[bot]
257f90a43f
Merge master into staging-next 2021-02-13 12:19:38 +00:00
Jörg Thalheim
c875e8e673
Merge pull request #107394 from yorickvP/beam-nox 2021-02-13 09:01:06 +00:00
github-actions[bot]
1e189fbb9e
Merge staging-next into staging 2021-02-13 06:16:37 +00:00
github-actions[bot]
318f95e4c2
Merge master into staging-next 2021-02-13 06:16:33 +00:00
aszlig
2d5a31a3ef
Merge pull request #112819 (mkIf in systemd units)
@thelegy writes:

  unitOption is only used inside of attrsOf wich is perfectly capable of
  handling the attrsets from mkIf, though the checkUnitConfig test
  forbids it.

  This commit weakens that restriction to allow the usage of mkIf inside
  of systemd.services.<name>.serviceConfig.<something> etc.

While I personally don't like that we can't easily use
pushDownProperties from the module system and need to rely on internals,
we *already* use internals for the mkOverride case, so adding another
case for mkIf doesn't add a hard-to-find indirection.

I'm merging this, since this fixes a valid use case and it shouldn't
make refactoring worse than before.
2021-02-13 05:24:11 +01:00
Ryan Burns
5828d54356 nixosTests.installer: fix non-zfs grub tests
Now that grub2 is built without zfs support when possible, this is a
separate store path which may need to be made available to the installer.
2021-02-12 19:39:17 -08:00
github-actions[bot]
c4d734932d
Merge staging-next into staging 2021-02-13 00:36:15 +00:00
github-actions[bot]
1d62dc37db
Merge master into staging-next 2021-02-13 00:36:11 +00:00
Luke Granger-Brown
cfed3b8b22 treewide: update 21.03 to 21.05
The NixOS 21.03 release has been delayed to 21.05. See NixOS/rfcs#80.

There are two instances of 21.03 which have been left as is, since they
are in stateVersion comparisons. This will ensure that existing user
configurations which refer to 21.03 will continue to work.
2021-02-12 14:12:48 -08:00
erictapen
b2dbb4f50e
nixos/mastodon: set environment for mastodon-init-dirs (#112917)
mastodon-init-dirs should have the same environment as the other
services, as it also calls rake. Especially RAILS_ENV was missing.
2021-02-12 20:31:44 +01:00
github-actions[bot]
0667f269fc
Merge staging-next into staging 2021-02-12 18:16:50 +00:00
github-actions[bot]
b23b455f9a
Merge master into staging-next 2021-02-12 18:16:46 +00:00
Milan Pässler
4d6bfa473a
nixos/mastodon: init
Co-authored-by: Happy River <happyriver93@runbox.com>
Co-authored-by: ash lea <ashkitten@users.noreply.github.com>
Co-authored-by: Justin Humm <justin.humm@posteo.de>
2021-02-12 15:37:15 +00:00
github-actions[bot]
53c1035b44
Merge staging-next into staging 2021-02-12 12:20:24 +00:00
github-actions[bot]
15db604744
Merge master into staging-next 2021-02-12 12:20:20 +00:00
Florian Klink
53a0c2878b
Merge pull request #111786 from flokli/systemd-247.3
systemd: 247.2 -> 247.3
2021-02-12 12:52:49 +01:00
Michael Raskin
27f172ebd1
Merge pull request #112019 from 7c6f434c/fix-service-runner
nixos/service-runner: fix evaluation
2021-02-12 08:50:52 +00:00
Peter Hoeg
04e9e9e510 nixos/captive-browser: make it work without a fixed interface
nixpkgs-fmt makes this a lot noisier than it has to be
2021-02-12 14:35:51 +08:00
github-actions[bot]
1551e9d6ee
Merge master into staging-next 2021-02-12 06:16:24 +00:00
Andrey Golovizin
3fd5a41676 nixos/prosody: fix broken tests 2021-02-12 06:54:20 +01:00
Mario Rodas
ffedd32f9f
Merge pull request #108511 from nagy/apache-lua-path-fix
nixos/httpd: fix lua paths
2021-02-11 20:04:42 -05:00
github-actions[bot]
344456f66a
Merge master into staging-next 2021-02-12 00:36:19 +00:00
Kevin Cox
4a22f8aa88
Merge pull request #112660 from turion/dev_test_vscodium
tests/vscodium: Fix race condition
2021-02-11 17:49:14 -05:00
V
0268691925 nixos/localtime: make localtimed a system user
Currently, a user is created in the 1000-29999 range. This is incorrect,
as localtimed is a system service and not a user.
2021-02-11 22:36:37 +01:00
Jan Beinke
97718a3584
nixos/systemd-lib: allow mkIf in unitOption
`unitOption` is only used inside of `attrsOf` wich is perfectly capable of
handling the attrsets from `mkIf`, though the checkUnitConfig test
forbids it. This commit weakens that restriction to allow the usage of
`mkIf` inside of `systemd.services.<name>.serviceConfig.<something>`
etc.
2021-02-11 22:18:21 +01:00
Louis Blin
458fafa8fc nixos/prometheus-exporters/artifactory: init at 1.9.0
Adds a Prometheus exporter to scrape metrics from the API of JFrog
Artifactory instances.
2021-02-11 15:56:58 +00:00
Daniel Nagy
7c121e60c5
nixos/httpd: fix lua paths
Account for the fact that, when creating a lua package without the
"withPackages" helper, we dont get an extra "lua" attribute in the
package.

Therefore we need to distinguish between the "withPackages" case and the
direct ( or "empty" ) lua package.

For example with this nixos config:

```nix
{
  services.httpd = {
      enable = true;
      package = pkgs.apacheHttpd.override {
        luaSupport = true;
        lua5 = pkgs.lua5_3.withPackages (ps: with ps; [ luafilesystem ] );
      };
    };
}
```

Here we say that we want to have apache to use a lua, packaged with the
`luafilesystem` module so that we can `require` that in scripts to
render http responses. There, the set that gets assigned to `lua5 ` does
not have a `luaversion` attribute, rather it has a `lua` attribute
wherein lies a `luaversion` attribute. If we dont package additional
modules, then we dont have that `lua` attribute in between and rather
directly have to use `luaversion` directly.
2021-02-11 11:56:06 +01:00
Maciej Krüger
45b8e83128
qemu-vm: add virtualisation.fileSystems to allow extra vm mounts 2021-02-11 11:02:45 +01:00
github-actions[bot]
5f9df37683
Merge master into staging-next 2021-02-11 00:36:09 +00:00
Ingo Blechschmidt
b481663125 nixos/whitebophir: expose new option provided by whitebophir 1.8.0 2021-02-10 23:33:02 +01:00
Linus Heckemann
e4cf0e7a45
Merge pull request #109345 from cole-h/zfs-closure
Shrink the ZFS closure by making mail support optional
2021-02-10 23:04:24 +01:00
Andrey Golovizin
1f3c9fd0ef nixos/tests/networking: fix DHCP range
Exclude static 192.168.*.2 addresses from the dynamic address range to
prevent different interfaces from getting the same address.

Seems like configuring a fixed IPv4 address does not automatically
exclude it from the dynamic address range.

Should fix occasional failures of
nixos.tests.networking.scripted.macvlan and possibly other networking
tests relying on DHCP.
2021-02-10 20:33:49 +01:00
github-actions[bot]
7d94bb26bb
Merge master into staging-next 2021-02-10 18:16:36 +00:00
Manuel Bärenz
037d0489ca tests/vscodium: Fix race condition 2021-02-10 16:38:13 +01:00
Finn Behrens
92859ff489 nixos/prometheus-flow-exporter: init module 2021-02-10 14:29:05 +01:00
github-actions[bot]
bb5521a62c
Merge master into staging-next 2021-02-10 12:20:06 +00:00
Robert Hensing
696294ea9f Improve todo 2021-02-10 10:36:00 +01:00
Robert Hensing
460ba46a4a nixos/hercules-ci-agent: Add myself to meta.maintainers 2021-02-10 09:50:27 +01:00