JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
370,875 Commits 1 Branch 0 Tags 12 GiB
04b5d464ba
Commit Graph

26866 Commits

Author SHA1 Message Date
Michele Guerini Rocco
68a102a2e4
Merge pull request #168764 from rnhmjoj/pr-pdns-ncdns 
nixos/ncdns: listen on IPv6 by default
 2022-04-15 17:34:57 +02:00
Martin Weinelt
a7fc5aaa76 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-15 13:30:48 +02:00
Michele Guerini Rocco
09f816e976
Merge pull request #156401 from TLATER/tlater/gitea-hide-secrets 
nixos/gitea: Prevent secrets from being exposed at ExecStart time
 2022-04-15 10:26:12 +02:00
github-actions[bot]
eef7dee538
Merge master into staging-next 2022-04-15 06:01:16 +00:00
Will Dietz
dde5b0ca7a
python3Packages.fenics: fix build, pin to older boost (#166728) 
* python3Packages.fenics: fix build, pin to older boost

Looking at upstream, there are various issues with newer boost.
(At least some of them have been since fixed)

For now, fix the build by using a version of boost that works
with the current version.

Error here was complaining about `std::min_element`,
which is no longer available, apparently, due to newer boost
no longer (transitively) including <algorithm>.

This was added in C++17, so I'm not sure the cmake flag
specifying dolfin built with C++11 makes sense or is used.
Leaving for now :).

* nixos/tests/fenics: fix name of machine/node in script

Still fails for now.

* python3Packages.fenics: fix accidentally changed strings in subst

Looks like in migration to pkg-config this was erroneously
changed from `pkgconfig` (python package, and source string)
to `pkg-config` (nix package name, tool name).
(see 9bb3fccb5b)

Fixes the NixOS test.
 2022-04-14 19:37:20 -05:00
github-actions[bot]
1c0229dbfd
Merge staging-next into staging 2022-04-15 00:03:21 +00:00
Janne Heß
0efb6720a4
nixos/console: Fix attribute path to fix eval 2022-04-14 22:07:41 +01:00
Lassulus
15b5c29a41
Merge pull request #168600 from helsinki-systems/feat/systemd-stage-1-keymap 
nixos/stage-1-systemd: Add keymap support
 2022-04-14 21:50:52 +01:00
rnhmjoj
3bb46db14e
nixos/release-notes: document ncdns incompatible changes 2022-04-14 21:30:00 +02:00
rnhmjoj
a1cb6e5a88
nixos/tests/ncdns: fix test 
1. Add another wait_for_unit("pdns-recursor")
   (this is needed when DNSSEC is disabled)

2. Make everything IPv6
 2022-04-14 21:07:15 +02:00
rnhmjoj
d39a10daa8
nixos/ncdns: listen on IPv6 by default 2022-04-14 21:07:15 +02:00
github-actions[bot]
795332a20e
Merge staging-next into staging 2022-04-14 18:01:48 +00:00
Michele Guerini Rocco
e674ea6956
Merge pull request #168535 from rnhmjoj/pr-pdns-nixos 
nixos/pdns-recursor: update default values
 2022-04-14 18:02:29 +02:00
Janne Heß
289f38a65b
Merge pull request #168301 from helsinki-systems/feat/systemd-stage-1-mdadm 
nixos/stage-1-systemd: Add mdraid support (+ test)
 2022-04-14 17:56:36 +02:00
rnhmjoj
bad701b1d3
doc/release-notes: mention pdns-recursor options changes 2022-04-14 17:32:57 +02:00
rnhmjoj
fe27976534
nixos/tests/pdns-recursor: test a DNS query 2022-04-14 17:31:27 +02:00
rnhmjoj
fd480f55df
nixos/pdns-recursor: update default values 
1. Update the default values of several addresses-related settings
   that have been changed by upstream.

2. Make `dns.address` take multiple addresses. This is needed
   for dual stack, now working by default.
 2022-04-14 17:31:16 +02:00
Florian Klink
e97fc37e55
Merge pull request #161253 from flokli/kexec-boot 
nixos/installer: add kexec-boot
 2022-04-14 15:30:30 +02:00
Florian Klink
6ceedff331 nixosTests.kexec: fix tests with kexecBoot format 2022-04-14 15:15:33 +02:00
Alyssa Ross
b825f6db56 nixos/doc/md-to-db.sh: consistent pandoc version 
Until now, this script has used the version of pandoc from unstable.
This means that running the script on the same version of Nixpkgs
could produce different results, and meant that when Pandoc's output
was changed, random PRs were changing the whole manual when they ran
the script to regenerate docs[1][2].

Here I've changed the manual to use a consistent version of pandoc —
the one from the latest release tag, which will avoid this problem in
future.  This will avoid this problem in future.  The only time we'll
need to worry about pandoc output changes is when we bump the version
used in this script.

I also considered using the version from the current Nixpkgs branch,
but decided against it as it's unlikely that e.g. the person bumping
Pandoc will remember to regenerate the manual.

[1]: https://github.com/NixOS/nixpkgs/pull/162550
[2]: https://github.com/NixOS/nixpkgs/pull/168535
 2022-04-14 12:57:51 +00:00
github-actions[bot]
999a16ca63
Merge staging-next into staging 2022-04-14 12:02:14 +00:00
Jacek Galowicz
6b414c5b66
Merge pull request #168609 from rnhmjoj/pr-test-driver 
nixos/test-driver: highlight driver log lines
 2022-04-14 13:09:36 +02:00
pennae
3e9855f8ac
Merge pull request #168328 from K900/fix-nix-ld-test 
tests/nix-ld: fix invocation
 2022-04-14 10:41:26 +00:00
Janne Heß
dda7e9e3ee
nixos/stage-1-systemd: Add mdraid support (+ test) 2022-04-14 11:39:57 +01:00
Janne Heß
0581d31bf9
Merge pull request #167393 from iblech/patch-docs-cc 
nixos-rebuild, switch-to-configuration: document and protect against cross compilation subtlety
 2022-04-14 12:30:39 +02:00
rnhmjoj
ca1b1f6dc0
nixos/test-driver: highlight driver log lines 
There is a whole lot of noise in a NixOS test log due to journal,
commands, and test driver messages all being mixing together.
With this commit the test driver messages are highlighted so you don't
have to squint too much to see where a subtest starts and ends or what
was the last command being run.

Here's an excerpt from a highlighted log:

    machine # [    6.647826] dhcpcd[668]: eth0: adding default route via 10.0.2.2
    machine # I've had a great day!
    (finished: must succeed: curl -sfL https://example.com/how-are-you? | tee /dev/stderr, in 0.19 seconds)
    (finished: subtest: Privoxy can filter https requests, in 0.22 seconds)
    subtest: Blocks are working
    machine: waiting for TCP port 443
    machine # Connection to localhost (::1) 443 port [tcp/https] succeeded!
    (finished: waiting for TCP port 443, in 0.03 seconds)
    machine: must fail: curl -f https://example.com/ads 1>&2
    machine # [    6.730608] nscd[742]: 742 monitored file `/etc/resolv.conf` was written to
    machine # [    6.733071] privoxy[814]: 2022-04-14 09:41:01.695 7fa995c39640 Actions: +block{Fake ads} ...
    machine # curl: (22) The requested URL returned error: 403
    machine # [    6.753098] systemd[1]: Stopping Name Service Cache Daemon...
    machine # [    6.755632] systemd[1]: nscd.service: Deactivated successfully.
    machine # [    6.757069] systemd[1]: Stopped Name Service Cache Daemon.
    (finished: must fail: curl -f https://example.com/ads 1>&2, in 0.07 seconds)
    machine: must succeed: curl -f https://example.com/PRIVOXY-FORCE/ads 1>&2
    machine # [    6.765099] systemd[1]: Starting Name Service Cache Daemon...
    machine # [    6.781519] nscd[925]: 925 monitoring file `/etc/passwd` (1)
    machine # [    6.844105] systemd[1]: Reached target Network is Online.
    machine # [    6.848860] privoxy[814]: 2022-04-14 09:41:01.805 7fa995c39640 Actions: +block{Fake ads} ...
    machine # [    6.856068] nscd[925]: 925 monitoring file `/etc/nsswitch.conf` (8)
    machine # [    6.858229] systemd[1]: Reached target Multi-User System.
    machine # [    6.858934] nscd[925]: 925 monitoring directory `/etc` (2)
    machine # [    6.861315] systemd[1]: Startup finished in 2.374s (kernel) + 4.451s (userspace) = 6.826s.
    machine # Hot Nixpkgs PRs in your area. Click here!
    machine # [    6.873055] nscd[925]: 925 monitoring directory `/etc` (2)
    machine # [    6.874489] nscd[925]: 925 monitoring file `/etc/nsswitch.conf` (8)
    machine # [    6.875599] nscd[925]: 925 monitoring directory `/etc` (2)
    (finished: must succeed: curl -f https://example.com/PRIVOXY-FORCE/ads 1>&2, in 0.12 seconds)
    (finished: subtest: Blocks are working, in 0.22 seconds)
    subtest: Temporary certificates are cleaned
    machine: must succeed: test $(ls /run/privoxy/certs | wc -l) -gt 0
    (finished: must succeed: test $(ls /run/privoxy/certs | wc -l) -gt 0, in 0.02 seconds)
    machine: must succeed: date -s "$(date --date '12 days')"
    (finished: must succeed: date -s "$(date --date '12 days')", in 0.02 seconds)
    machine # [    6.959589] systemd[1]: Started Logrotate Service.
    machine # [    6.966685] systemd[1]: Starting Cleanup of Temporary Directories...
    machine # [    6.974783] systemd[1]: logrotate.service: Deactivated successfully.
    machine # [    7.004493] systemd[1]: systemd-tmpfiles-clean.service: Deactivated successfully.
    machine # [    7.005457] systemd[1]: Finished Cleanup of Temporary Directories.
    machine: must succeed: test $(ls /run/privoxy/certs | wc -l) -eq 0
    (finished: must succeed: test $(ls /run/privoxy/certs | wc -l) -eq 0, in 0.01 seconds)
    (finished: subtest: Temporary certificates are cleaned, in 0.15 seconds)
    (finished: run the VM test script, in 7.44 seconds)
    test script finished in 7.48s
    cleanup
    kill machine (pid 8)
 2022-04-14 11:54:21 +02:00
Janne Heß
6d6c1c341c
nixos/stage-1-systemd: Add keymap support 
Makes my life a lot easier with my non-american keyboard layout
 2022-04-14 10:25:04 +01:00
Lassulus
7392416a53
Merge pull request #168302 from helsinki-systems/feat/systemd-stage-1-lvm 
nixos/stage-1-systemd: Add LVM2 support (+ test)
 2022-04-14 09:52:24 +01:00
Janne Heß
cb1624c130
Merge pull request #168477 from helsinki-systems/feat/systemd-stage-1-hibernation 
nixos/stage-1-systemd: Implement and test hibernation
 2022-04-14 10:15:28 +02:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging 
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
 2022-04-14 09:53:21 +02:00
Pascal Bach
1a70fa8acb
Merge pull request #137939 from kfiz/update-mongodb-44/50 
Update mongodb to 4.4/5.0
 2022-04-14 09:25:20 +02:00
Jan Tojnar
5db9253633 nixos/desktop-managers: Fix eval 
nixos/lib/utils.nix is actually passed as `utils` argument to modules
so https://github.com/NixOS/nixpkgs/pull/168194 broke the eval.

Fixes: https://github.com/NixOS/nixpkgs/issues/168569
 2022-04-14 06:53:08 +02:00
Janne Heß
aeb75b3b69
nixos/stage-1-systemd: Implement hibernation + test 2022-04-13 23:02:13 +01:00
Janne Heß
ffb320378b
nixos/stage-1-systemd: Fix booting grub tests 2022-04-13 23:02:10 +01:00
Janne Heß
2633e82e1a
nixos/stage-1-systemd: Add LVM2 support 2022-04-13 23:00:19 +01:00
Silvan Mosberger
bf123996f9 nixos/syncplay: Switch to version without GUI 2022-04-13 23:58:51 +02:00
Jan Tojnar
7eb14b532a nixos/gnome: set default wallpaper for dark mode as well 
GNOME 42 needs two wallpaper pictures – for the default (light)
colour scheme and for the dark one. Because we are clearing out
the paths in `gsettings-desktop-schemas` to prevent closure
from bloating, we need to set them in the NixOS module.

Since the wallpaper for the default colour scheme is dark,
will relegate it to the dark colour scheme and switch
to a light blue variant for the default colour scheme.
That one has inverted roundel for the NixOS logo but
it is the only light-ish background that has the logo
of the same size and placing as the dark wallpaper.
 2022-04-13 21:29:51 +02:00
Thiago Kenji Okada
3a570f57a1
Merge pull request #167775 from otavio/topic/improve-shellhub-module 
nixos: shellhub-agent: support more options
 2022-04-13 19:56:14 +01:00
Thiago Kenji Okada
f1d21bed4d
Merge pull request #168196 from lucasew/fix/xfce-screensaver 
nixos/xfce4: option to disable xfce4-screensaver
 2022-04-13 14:35:49 +01:00
Sandro Jäckel
cae8d1a2ed
git: only hardcode path to ssh binary on full build 
Requirement for #146702
 2022-04-13 15:18:50 +02:00
lucasew
e76aa74c28 nixos/xfce: option to disable xfce4-screensaver 
Signed-off-by: lucasew <lucas59356@gmail.com>
 2022-04-13 09:13:03 -03:00
Silvan Mosberger
398973f7eb
Merge pull request #168292 from whentze/cockroach-module-improvements 
nixos/cockroachdb: add `extraArgs` and properly escape systemd exec args
 2022-04-13 13:48:17 +02:00
Florian Klink
8ea2f75b72 nixos/kexec-boot: use dirname of script to resolve bzImage and initrd.gz 
This will allow invoking the `kexec-boot` script without `cd`-ing into
its folder first.
 2022-04-13 13:26:04 +02:00
Florian Klink
f0178e45eb nixosTests.kexec: extend with kexecBoot attribute 
Add a node2, which imports the kexec-boot.nix profile.

Ensure node2 successfully boots up, then invoke the kexec-boot script
from it on node1.
 2022-04-13 13:26:02 +02:00
Florian Klink
366c8be2ad nixos/installer: add kexec-boot 
This module exposes a config.system.build.kexecBoot attribute,
which returns a directory with kernel, initrd and a shell script
running the necessary kexec commands.

It's meant to be scp'ed to a machine with working ssh and kexec binary
installed.

This is useful for (cloud) providers where you can't boot a custom image, but
get some Debian or Ubuntu installation.
 2022-04-13 13:25:22 +02:00
Sandro
a39694b41f
Merge pull request #168194 from SuperSandro2000/xserver-excludePackages 
Xserver exclude packages
 2022-04-13 11:37:32 +02:00
Sandro
d8cec85ca6
Merge pull request #140607 from jkarlson/terminfo 2022-04-13 11:15:23 +02:00
Emil Karlson
a03b332b81 nixos/terminfo: add enableAllTerminfo option 
Add an option to install all .terminfo packages, normally this should
add no runtime bloat, if caches are used.
 2022-04-13 10:04:31 +03:00
Martin Weinelt
2731137d12
Merge pull request #168288 from erikarvstedt/paperless-ngx 2022-04-12 22:10:52 +02:00
Lassulus
65cc198539
Merge pull request #167349 from helsinki-systems/feat/udev-systemd-stage-1 
nixos/udev: Add systemd stage 1 support
 2022-04-12 21:02:52 +01:00
Linus Heckemann
0acfc5ed6e
Merge pull request #167323 from alyssais/mailman-ext_dir 
nixos/mailman: remove obsolete setting
 2022-04-12 21:27:27 +02:00
Janne Heß
7024b4e5e3
nixos/udev: Put all initrd options into a namespace 2022-04-12 20:06:13 +01:00
Erik Arvstedt
0977227b86
nixos/paperless-ng: rename to paperless, use paperless-ngx package 
Use this opportunity to rename `paperless-(ng)-server` to `paperless-scheduler`.
This follows the naming scheme in the paperless repo and docs.
 2022-04-12 18:15:44 +02:00
Erik Arvstedt
46c3331384
nixos/paperless-ng: simplify redis logic 
- Rename `hasCustomRedis` -> `enableRedis`
- Extract var `redisServer`
 2022-04-12 18:06:34 +02:00
talyz
ed30d3b02f
keycloak: Switch to the new Quarkus version of Keycloak 
With version 17 of Keycloak, the Wildfly based distribution was
deprecated in favor of the one based on Quarkus. The difference in
configuration is massive and to accommodate it, both the package and
module had to be rewritten.
 2022-04-12 13:42:54 +02:00
Florian Klink
9ff1ab4037 nixos/doc: add notes on additional drivers or firmware 
This describes how to build your own installer medium with some custom
firmware/drivers, using an Intel MacBook as an example - on which WiFi
doesn't work out of the box, due to it being nonfree.

Fixes #15162.

Co-authored-by: Lucas Hoffmann <lucc@users.noreply.github.com>
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2022-04-12 12:43:50 +02:00
Kim Lindberger
9d12de1ab7
Merge pull request #165481 from talyz/discourse-2.9.0.beta3 
discourse: 2.9.0.beta1 -> 2.9.0.beta3
 2022-04-12 10:38:16 +02:00
Wanja Hentze
dccd5a44d1
nixos/cockroachdb: use escapeSystemdExecArgs for ExecStart args 
Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>
 2022-04-12 10:34:56 +02:00
Wanja Hentze
d215163ff9
nixos/cockroachdb: add extraArgs option 
There are a bunch of args to `cockroach start` that simply can not be set
given the current set of options, so this escape hatch enables them.
 2022-04-12 10:34:55 +02:00
Lassulus
807b226542
Merge pull request #162777 from amarshall/prom-deprecated-opt 
nixos/prometheus: Remove upstream-deprecated alertManagerTimeout
 2022-04-12 09:07:51 +01:00
Andrew Marshall
3bbfc7849e nixos/prometheus: Remove upstream-deprecated alertManagerTimeout 
When started, Prometheus prints:

> The flag --alertmanager.timeout has no effect and will be removed in
> the future.

See also
2316062d4e
 2022-04-11 23:37:33 -04:00
Lassulus
c0139fe5c3
Merge pull request #167168 from helsinki-systems/feat/systemd-stage-1-proper-handover 
nixos/stage-1-systemd: Handover between the systemds directly
 2022-04-11 22:26:11 +01:00
K900
b261dee857 tests/nix-ld: fix invocation 2022-04-12 00:03:53 +03:00
Erik Arvstedt
69319ee4a6
nixos/paperless-ng: fix /proc access for service 
This allows django-q to set the number of workers according to the CPU
core count and to show memory stats via `manage.py qmonitor`.
This also fixes a non-critical psutil error in paperless-ng-server.
 2022-04-11 22:46:44 +02:00
Erik Arvstedt
308c4bf0f7
nixos/paperless-ng: minor improvments 
Service:
- Fix misleading comment:
  We could in fact implement password copying as a preStart script by
  amending BindReadOnlyPaths, but adding an extra service is simpler.

Test:
- Add more detailed subtest names
- Simplify date check
 2022-04-11 22:46:43 +02:00
Izorkin
e87240e216 nixos/nginx: add extraParameters to http3 protocol 2022-04-11 22:33:12 +02:00
Izorkin
c508da303b nixos/nginx: add reuseport option 2022-04-11 22:33:12 +02:00
Izorkin
660a36f173 nixos/nginx: fix http3 configuration 2022-04-11 22:33:12 +02:00
Janne Heß
3df2691e6b
nixos/stage-1-systemd: Handover between the systemds directly 2022-04-11 20:04:33 +01:00
Janne Heß
fb44ecd129
nixos/udev: Add systemd stage 1 support 2022-04-11 19:43:26 +01:00
Sandro Jäckel
28539842d8
nixos/utils: move removePackagesByName to here from gnome 2022-04-11 15:42:49 +02:00
Lassulus
ace8357011
Merge pull request #143878 from Izorkin/init-nifi 
nifi: init at 1.16.0
 2022-04-11 14:08:29 +01:00
Alyssa Ross
46a3a7b9a2 nixos/udev: remove rule for kqemu 
kqemu was removed from Nixpkgs in 2013 in 181dc4032d ("Remove the old
KQEMU accelerator module"), so it should be safe to drop this rule
now.
 2022-04-11 12:17:03 +00:00
Erik Arvstedt
63528cb1a6
nixos/systemd: remove duplicate definition of systemd.user.timers 
It's already defined in `systemd/user.nix`.
This is a leftover from commit b6d50528dd
where all `systemd.user` settings were moved to `systemd/user.nix`.
 2022-04-11 13:01:40 +02:00
Janne Heß
adab6ce552
nixos/systemd-stage-1: Minor fixups 
- Fix the name of the env
- Add the correct kmod to the initrd
- Add `less` to make journalctl usable
- Fix SYSTEMD_SULOGIN_FORCe for rescue.target
- Add some missing binaries
 2022-04-11 11:13:01 +01:00
Robert Hensing
4d464cf889
Merge pull request #168030 from samhug/qemu-vm 
nixos/qemu-vm: sanitize generated environment variable name
 2022-04-11 10:45:32 +02:00
Luke Granger-Brown
4ea239aa70
Merge pull request #163958 from lukegb/networkd-main 
nixos/networkd: configure /etc/systemd/networkd.conf
 2022-04-11 02:01:19 +01:00
Luke Granger-Brown
f47caf769b nixos/networkd: configure /etc/systemd/networkd.conf 
The networkd.conf file controls a variety of interesting settings
which don't seem to be configurable at the moment, including
adding names to route tables (for networkd only, although this commit
also exports them into iproute2 for convenience's sake), and
the speed metering functionality built into networkd.

Importantly, however, this also allows disabling the systemd
functionality where it likes to delete all the routes and routing rules
that haven't been configured through networkd whenever something causes
it to perform a reconfiguration.
 2022-04-11 00:28:33 +00:00
Luke Granger-Brown
1be4ba01ac
Merge pull request #164025 from lukegb/pam-ussh 
pam-ussh: init at unstable-20210615
 2022-04-11 01:25:45 +01:00
Sandro Jäckel
28e936ba64
nixos/xserver: add excludePackages option 
to remove packages environment.systemPackages
 2022-04-11 01:12:04 +02:00
pennae
3acf560427
Merge pull request #165883 from alyaeanyx/openconnect-module 
nixos/openconnect: Add NixOS module for declarative OpenConnect VPNs
 2022-04-10 21:30:26 +00:00
github-actions[bot]
bf63dd7434
Merge staging-next into staging 2022-04-10 18:01:38 +00:00
Lassulus
f0848eeb05
Merge pull request #167316 from helsinki-systems/feat/opportunistic-kvm 
nixos/lib/qemu-common: Opportunistically use KVM
 2022-04-10 18:54:59 +01:00
Izorkin
63ef6aebef
nixos/tests: add nifi test 2022-04-10 20:48:43 +03:00
Izorkin
07962ac6f1
nixos/nifi: add release notes 2022-04-10 20:42:00 +03:00
Izorkin
d706301b0c
nixos/nifi: init service 2022-04-10 20:42:00 +03:00
Otavio Salvador
fcb69a8583 nixos/shellhub-agent: use package internally, avoiding it in PATH 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 2022-04-10 13:32:10 -03:00
Otavio Salvador
d7a0f56c6a nixos/shellhub-agent: avoid code duplication for environment 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 2022-04-10 13:32:10 -03:00
Otavio Salvador
bd3b046ac8 nixos/shellhub-agent: use mkPackageOption to simplify code 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 2022-04-10 13:32:10 -03:00
Otavio Salvador
8c4bc7f62c nixos/shellhub-agent: allow setting the preferredHostname 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 2022-04-10 13:32:10 -03:00
Vladimír Čunát
5e845236f2
Merge branch 'staging-next' into staging 2022-04-10 17:11:36 +02:00
alyaeanyx
e4c93fb04c
nixos/openconnect: add hardening flags 2022-04-10 14:19:22 +02:00
Lassulus
8b9c6a1b04
Merge pull request #115391 from kfollesdal/autoresize-azure 
nixos/virtualisation/azure-common: add auto resize of os disk
 2022-04-10 11:25:22 +01:00
Lassulus
c274af4b7b
Merge pull request #166509 from jtojnar/man-opt-nodup 
nixos/man: prevent duplication of options
 2022-04-10 11:09:12 +01:00
Lassulus
df7337ebb4
Merge pull request #166456 from mweinelt/isc-dhcp 
dhcp: 4.4.2-P1 -> 4.4.3 and make client & relay support optional
 2022-04-10 11:05:29 +01:00
Lassulus
adc7fbbcdf
Merge pull request #164531 from jtojnar/networkmanager 
nixos/networkmanager: Allow overriding installed plug-ins
 2022-04-10 11:03:36 +01:00
github-actions[bot]
28c6c88d42
Merge staging-next into staging 2022-04-10 00:02:52 +00:00
Otavio Salvador
6729653309 nixos/shellhub-agent: allow setting the keepAliveInterval 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 2022-04-09 20:11:12 -03:00
Otavio Salvador
60158bfc22 nixos/shellhub-agent: use new configuration variables 
The old variables still work but will eventually stop to be supported so
move to the new ones.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 2022-04-09 20:11:12 -03:00
Otavio Salvador
a62471fc65 nixos/shellhub-agent: use mkEnableOption to simplify code 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 2022-04-09 20:11:12 -03:00