3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

17717 commits

Author SHA1 Message Date
Daniel Nagy 06962df4d2
nixos/murmur: use port type 2021-06-18 17:30:33 +02:00
Daniel Nagy 50ba0ac3d6
nixos/dockerRegistry: use port type 2021-06-18 17:30:11 +02:00
Daniel Nagy a8808784e5
nixos/leaps: use port type 2021-06-18 17:29:44 +02:00
Daniel Nagy 50af10e205
nixos/gpsd: use port type 2021-06-18 17:29:24 +02:00
Daniel Nagy 864dabf232
nixos/paperless: use port type 2021-06-18 17:29:15 +02:00
Daniel Nagy bc87386ac1
nixos/redmine: use port type 2021-06-18 17:29:05 +02:00
Daniel Nagy 7d1363d0cb
nixos/nar-serve: use port type 2021-06-18 17:28:54 +02:00
Daniel Nagy 73896b0634
nixos/nix-serve: use port type 2021-06-18 17:28:35 +02:00
Daniel Nagy 4161c37628
nixos/ttyd: use port type 2021-06-18 17:28:17 +02:00
Daniel Nagy d566bd2ddc
nixos/namecoind: use port type 2021-06-18 17:27:42 +02:00
Daniel Nagy 044d996906
nixos/grafana: use port type 2021-06-18 17:27:31 +02:00
Daniel Nagy c726455687
nixos/octoprint: use port type 2021-06-18 17:27:16 +02:00
Daniel Nagy ab5d317d51
nixos/gitea: use port type 2021-06-18 17:27:06 +02:00
Daniel Nagy 4037c974f5
nixos/mysql: use port type 2021-06-18 17:26:55 +02:00
Daniel Nagy d65f16bc02
nixos/rabbitmq: use port type 2021-06-18 17:26:27 +02:00
Niklas Hambüchen 65d3180336 services.xorg.config: Extend docs 2021-06-17 04:08:21 +02:00
Niklas Hambüchen 685e8ff7dd xserver: Generate readable config indentation 2021-06-17 03:34:40 +02:00
Martin Weinelt 36659d1efa
nixos/home-assistant: update hardening
This makes access to serial devices contingent on using certain
components and restricts the default setup even further.
2021-06-16 21:31:24 +02:00
github-actions[bot] 8b9fa8d446
Merge staging-next into staging 2021-06-16 18:04:48 +00:00
Jan Tojnar e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Sandro 22a29f491a
Merge pull request #124566 from mweinelt/synapse-jemalloc 2021-06-16 17:52:56 +02:00
talyz b4c069b147
nixos/fail2ban: Remove reloadIfChanged = true
This makes the service fail when upgrading the package, so let's
properly restart it instead.
2021-06-16 13:52:46 +02:00
Erik Skytthe d1b4158155
nixos/grafana: Change services.grafana.provision.datasources.*.type to be open (#126831) 2021-06-16 11:12:51 +02:00
markuskowa 5ad54b5bc9
Merge pull request #126785 from oxzi/ucarp-1.5.2
ucarp: init at 1.5.2 / nixos/ucarp: init / nixos/test/ucarp: init
2021-06-16 10:54:23 +02:00
Sandro b8958bbfa6
Merge pull request #126874 from legendofmiracles/espanso-cleanup
espanso: add runtime dependencies correctly, nixos/espanso remove path hack
2021-06-16 03:01:18 +02:00
Martin Weinelt 60c62214f5
nixos/solanum: implement reload and allow config changes
Reload only works with a static configuration path as there is no way to
pass the dynamically generated config path to a running solanum
instance, therefore we symlink the configuration to
/etc/solanum/ircd.conf.

But that will prevent reloads of the ircd, because the systemd unit
wouldn't change when the configuration changes. That is why we add the
actual location of the config file to restartTriggers and enable
reloadIfChanged, so changes will not restart, but reload on changes.
2021-06-16 00:19:35 +02:00
Robert Hensing c2c47cc85b
Merge pull request #126922 from hercules-ci/ssh-keys-example
nixos/ssh: Add an example of verbatim keys
2021-06-15 21:38:19 +02:00
Alvar Penning 8673a40eda nixos/ucarp: init 2021-06-15 18:13:31 +02:00
Martin Weinelt fb49094c3f
nixos/home-assistant: NixOS is an unsupported installation method
Trying to steer NixOS users away from reporting bugs to the upstream,
when they don't have the capacity to support bugs that could be the
result of our downstreaming setup.
2021-06-15 15:31:01 +02:00
Sandro 2b49e4e735
Merge pull request #107728 from nessdoor/master 2021-06-15 14:40:21 +02:00
Robert Hensing dab747106e nixos/ssh: Document authorizedKeysFiles properly 2021-06-15 12:23:09 +02:00
Robert Hensing 8352cc9a23 nixos/ssh: Add an example of verbatim keys
This confused someone on SO.
2021-06-15 11:51:41 +02:00
Pamplemousse 4265efef54 nixos/modules/jenkins: Add option to add CLI
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2021-06-14 20:16:20 -07:00
Bernardo Meurer 2d29f4f2e7
Merge pull request #112971 from lovesegfault/roon-bridge
roon-bridge: init at 1.8-795
2021-06-14 19:57:20 -07:00
Aamaruvi Yogamani 358aa90e30
nixos/auto-cpufreq: fix service wantedBy 2021-06-14 20:01:26 -04:00
legendofmiracles 3e7ec42d68
espanso: add runtime dependencies correctly, nixos/espanso remove path hack 2021-06-14 13:09:57 -06:00
github-actions[bot] dbed958bf2
Merge staging-next into staging 2021-06-14 12:04:44 +00:00
Profpatsch 799cdbd834 tailscale: add interfaceName option
tailscale allows to specify the interface name.
The upstream systemd unit does not expose it directly however, only
via the `FLAGS` environment variable.

I can’t be 100% sure that the escaping is correct, but this is as good
as we can do for now, unless upstream changes their unit file.
2021-06-14 11:25:08 +02:00
Kim Lindberger 26706834a5
Merge pull request #86967 from jakobrs/more-general-fsbefore
nixos/lib/utils: Add `fileSystems.<name>.depends` option and generalise fsBefore (fixes #86955)
2021-06-14 10:50:07 +02:00
github-actions[bot] 9a860729b2
Merge staging-next into staging 2021-06-14 00:08:51 +00:00
Jasper Woudenberg 04d20258ea system76-power: init at 1.1.16 2021-06-13 22:11:42 +02:00
Robert Hensing ab11d2114e
Merge pull request #126680 from roberth/empty
emptyFile, emptyDirectory: init
2021-06-13 20:45:21 +02:00
Bernardo Meurer c8f95fd174
nixos.roon-bridge: init 2021-06-13 03:38:42 -07:00
github-actions[bot] de8250217d
Merge staging-next into staging 2021-06-13 00:10:27 +00:00
Sandro 3d6416cc20
nixos/synergy: add encryption support to server (#125002)
Co-authored-by: Joshua Trees <me@jtrees.io>
2021-06-12 21:35:04 +02:00
github-actions[bot] 9309a23dd3
Merge staging-next into staging 2021-06-12 18:04:58 +00:00
Michele Guerini Rocco ff4f74259a
Merge pull request #126658 from ncfavier/patch-2
nixos/console: allow console.font to be a path
2021-06-12 18:47:18 +02:00
Robert Hensing d48591123f nixos/apache-httpd: Use pkgs.emptyDirectory 2021-06-12 17:28:42 +02:00
Naïm Favier 39bc736382
nixos/console: allow console.font to be a path
As for console.keyMap, all uses of this option are compatible with paths. This allows doing things like `console.font = pkgs.runCommand ...`.
2021-06-12 13:24:32 +02:00
github-actions[bot] 8f3ead7190
Merge staging-next into staging 2021-06-11 18:05:09 +00:00
misuzu ad502ab5c5 nixos/sourcehut: automatically build and import qemu image for docker 2021-06-11 11:48:49 -04:00
Domen Kožar 2072bba95d
Merge pull request #125311 from jansol/pipewire
pipewire: 0.3.27 -> 0.3.30
2021-06-11 16:48:52 +02:00
Joshua Trees 706ce9e230 nixos/synergy: add encryption support
Make it possible to use the Synergy server with TLS encryption without
resorting to the GUI.
2021-06-11 14:52:34 +02:00
github-actions[bot] 8e50248719
Merge staging-next into staging 2021-06-11 12:04:41 +00:00
Maciej Krüger 3f062397a5
x2goserver: fix rename whole module 2021-06-11 09:07:23 +02:00
Maciej Krüger 6dbeea0b40
nixos/x2goserver: put into networking, like xrdp 2021-06-11 08:13:49 +02:00
Maciej Krüger 03071fd5e3
nixos/xrdp: add openFirewall option 2021-06-11 08:13:48 +02:00
github-actions[bot] 4f3594e9d3
Merge staging-next into staging 2021-06-11 06:04:28 +00:00
Anderson Torres 0b37436b8d
Merge pull request #126439 from Artturin/add-corectrl-module
nixos/corectrl: init module
2021-06-11 01:19:38 -03:00
Alyssa Ross 926765c5e3
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/servers/http/apache-httpd/2.4.nix
2021-06-11 02:05:00 +00:00
Artturin 9f396c9584 nixos/corectrl: init module 2021-06-11 03:00:29 +03:00
Zhaofeng Li 544bf2c29b nixos/phosh: Enable OpenGL by default 2021-06-10 23:43:40 +00:00
Milan Pässler 55cd291bbd pleroma-otp: remove 2021-06-10 22:53:00 +02:00
Jan Tojnar ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
Maciej Krüger c0c34eb757
Merge pull request #125619 from mkg20001/bulky 2021-06-10 08:51:44 +00:00
Vladimír Čunát 2ee781417e
nixos/*: replace alsa* aliases
The attributes got renamed in PR #126440 and in some places this caused
evaluation errors, e.g. the tarball job was saying (locally)
> attribute 'alsaUtils' missing, at /build/source/nixos/modules/services/audio/alsa.nix:6:4
and I suspect that trunk-combined jobset's failure to evaluate was also caused.
2021-06-10 09:46:55 +02:00
Maciej Krüger e108e51d25
nixos/desktop-managers/cinnamon: add bulky as default app 2021-06-10 09:38:47 +02:00
Robin Gloster 5a29c4d3bf
Merge pull request #126426 from rnhmjoj/gale
nixos/gale: remove
2021-06-09 20:25:49 -05:00
rnhmjoj 336130a90f
nixos/gale: remove
This should have been removed along the package in 3f7d959.
2021-06-10 02:33:10 +02:00
Zhaofeng Li 104e512cab phosh: 0.10.2 -> 0.11.0
Fixes #123735.
2021-06-09 21:27:12 +00:00
Maciej Krüger f4ddc02b0e
nixos/gitlab: add container registry 2021-06-09 23:19:25 +02:00
github-actions[bot] cf8441dd85
Merge staging-next into staging 2021-06-09 18:14:53 +00:00
Jan Solanti c702cc4321 pipewire: 0.3.27 -> 0.3.30 2021-06-09 19:46:51 +03:00
talyz 8f16b16291
gitlab: Make sure the FOSS version isn't identified as EE 2021-06-09 17:50:45 +02:00
Sandro c6a306d19e
Merge pull request #125810 from ElXreno/package-bees-0.6.5 2021-06-09 12:47:33 +02:00
github-actions[bot] 8e3729484b
Merge staging-next into staging 2021-06-09 06:09:58 +00:00
Natan Lao 4d8569b173 nixos/nvidia: fix hardware.nvidia.package example 2021-06-08 19:40:27 -07:00
Julien Moutinho b62a093a58 sanoid: fix sanoid.conf generation 2021-06-09 03:25:04 +02:00
github-actions[bot] e22f393eba
Merge staging-next into staging 2021-06-09 00:09:09 +00:00
Aaron Andersen a0a11fd22c zabbixAgent: add bash to $PATH 2021-06-08 19:42:39 -04:00
Jenny 7bf7d9f8a7
nixos/pam_mount: add support for FUSE-filesystems (#126069) 2021-06-08 22:06:28 +02:00
Maciej Krüger 7135ac0e00
nixos/gitlab: add extraEnv option
This allows users to define custom environment variables for gitlab, 
without having to modify the service file directly
2021-06-08 21:29:18 +02:00
github-actions[bot] e40e33d9d8
Merge staging-next into staging 2021-06-08 18:16:30 +00:00
jakobrs ea34fe21e1 treewide: Use fileSystems.<name>.depends option where necessary 2021-06-08 18:52:02 +02:00
jakobrs b07602a604 nixos/lib, nixos/filesystems: Make fsBefore more stable, and add depends option 2021-06-08 18:51:31 +02:00
Kevin Cox af51d70857
nixos/networkmanager: Add connectionConfig. (#118308)
Adds the `networking.networkmanager.connectionConfig` option which allows setting arbitrary settings inside the `[connection]` section.

This also reworked the underlying representation significantly to be less string-pasting and more semantic. In a future step it probably makes sense to provide raw access to other sections to users rather than replying on `extraConfig`. However I decided to defer this primarily because ordering of sections can matter. (Although IIUC this is only true for different `[connection]` sections). I think in the future we could expose an object where users can define/edit all sections and map the current configuration onto those. For now however only `[connection]` is exposed and the rest are just used internally.
2021-06-08 11:13:59 -04:00
Florian Klink ea4e8724f8
Merge pull request #122455 from ju1m/davfs2
nixos/davfs2: wrap {,u}mount.davfs with setuid=true
2021-06-08 16:22:06 +02:00
Luke Granger-Brown 631250e818
Merge pull request #126075 from rnhmjoj/fixup
Revert "nixos/wireless: make wireless.interfaces mandatory"
2021-06-08 14:04:19 +01:00
github-actions[bot] fde4df19f2
Merge staging-next into staging 2021-06-08 12:04:39 +00:00
Robert Hensing 843248d39f
Merge pull request #117379 from hercules-ci/nixos-metricbeat
nixos/metricbeat: init
2021-06-08 13:53:20 +02:00
rnhmjoj be01320a6c
nixos/wireless: only warn for no interfaces
A hard failure breaks the NixOS installer, which can't possibly
know the interface names in advance.
2021-06-08 07:42:34 +02:00
github-actions[bot] 59ab4de3e0
Merge staging-next into staging 2021-06-08 00:19:01 +00:00
Robin Gloster 218d6c37c8
Merge pull request #126045 from NixOS/jtojnar-patch-1
nixos/gnome: fix option label
2021-06-07 15:49:14 -05:00
Ashlynn Anderson 47db174a3c
nixos/self-deploy: make nixAttribute nullable (#125617)
Allows using a nix file that directly provides the derivation
2021-06-07 12:44:13 -07:00
github-actions[bot] 5b7fbb07b8
Merge staging-next into staging 2021-06-07 18:48:37 +00:00
rnhmjoj eba5f5c1e5
Revert "nixos/wireless: make wireless.interfaces mandatory"
This reverts commit 030a521adc.
2021-06-07 15:55:58 +02:00
jakobrs 475c007da0 nixos/libvirtd: add assertion requiring polkit to be enabled 2021-06-07 15:12:21 +02:00
talyz 7cc39b13b0
nixos/geoipupdate: Add stricter service security 2021-06-07 14:19:57 +02:00
github-actions[bot] d3f2c41b26
Merge staging-next into staging 2021-06-07 12:15:58 +00:00
talyz 41c82cd570
nixos/geoipupdate: Run the service right away one time
We don't want to have to wait for the timer to expire for the updater
to make its first run. This adds a timer unit which triggers the
geoipupdate.service unit immediately, but only runs if the configured
DatabaseDirectory doesn't exist yet.
2021-06-07 13:08:59 +02:00
talyz ba4d2bd03c
nixos/geoipupdate: Create database directory in a separate unit
The database directory needs to be created before the
geoipupdate.service unit is activated; otherwise, systemd will not be
able to set up the mount namespacing to grant the service read-write
access.
2021-06-07 13:01:49 +02:00
talyz 41387135dd nixos/grafana: Add error handling to service script
Without this, the services starts even if files are missing or
prerequisite commands fail, which can lead to incorrect initial
state.
2021-06-07 18:00:13 +09:00
talyz 98f07d6cc5 nixos/grafana: Filter out duplicate plugins
If the same plugin appears multiple times in `declarativePlugins`, for
example due to being added both by a module and in user config, the
build fails with an error message similar to

ln: failed to create symbolic link 'grafana-worldmap-panel/glmqcj88zk2bz3mvdr3r7920wxg02qnq-grafana-worldmap-panel-0.3.2': Permission denied

This is solved by removing all duplicates.
2021-06-07 18:00:13 +09:00
talyz 7cf55d1f4e
nixos/geoipupdate: Add myself to maintainers 2021-06-07 09:44:05 +02:00
talyz 99454b6f77
nixos/geoipupdate: Fix config filename copy-paste fail 2021-06-07 09:29:21 +02:00
github-actions[bot] e218376e4a
Merge staging-next into staging 2021-06-07 06:37:31 +00:00
Jan Tojnar 99fcca7b6b
nixos/gnome: fix option label
It is no longer GNOME 3.
2021-06-07 08:34:38 +02:00
Luke Granger-Brown 91fb672b21
Merge pull request #125573 from Flakebi/prometheus-script-exporter
prometheus-script-exporter: init at 1.2.0
2021-06-07 01:59:41 +01:00
github-actions[bot] 4db56e21dc
Merge staging-next into staging 2021-06-07 00:15:20 +00:00
AmineChikhaoui 7e89fb12e4 ec2-amis: add release 21.05 2021-06-06 17:09:14 -07:00
Flakebi 3bcf4e31ef
nixos/prometheus: add script exporter 2021-06-06 22:42:46 +02:00
github-actions[bot] a1f68141f3
Merge staging-next into staging 2021-06-06 18:30:36 +00:00
Christine Dodrill 2b220cc57b nixos/tailscale: add procps to $PATH
Currently tailscaled expects `sysctl` (from package procps) to be present
in the path when running on Linux. It can function without the `sysctl`
command present but it prints an error about it. This fixes that error.

    Warning: couldn't check net.ipv4.ip_forward (exec: "sysctl":
        executable file not found in $PATH).

Signed-off-by: Christine Dodrill <me@christine.website>
2021-06-06 14:17:03 +00:00
Niklas Hambüchen fdca90d07f
docs: acme: Fix typo 2021-06-06 14:27:13 +02:00
github-actions[bot] 385224957b
Merge staging-next into staging 2021-06-06 12:14:34 +00:00
Michele Guerini Rocco 78d9a75d9e
Merge pull request #125288 from rnhmjoj/wpa-race-fix
nixos/wireless: make wireless.interfaces mandatory
2021-06-06 10:35:15 +02:00
github-actions[bot] 500db2661d
Merge staging-next into staging 2021-06-06 00:15:23 +00:00
Sandro 0c85b23e25
Merge pull request #123433 from kira-bruneau/gamemode 2021-06-06 02:13:02 +02:00
Sandro 6e2204ea32
Merge pull request #123364 from edude03/patch-7 2021-06-06 01:35:18 +02:00
Flakebi 5e5a3c39ed nixos/prometheus: add process exporter 2021-06-06 08:17:25 +09:00
tomberek 157aee00a5
nixos/sourcehut: init (#113244)
* nixos/sourcehut: init

* sourcehut: default nginx setup

* sourcehut: documentation

* sourcehut: re-structure settings

* sourcehut: tests

* nixos/sourcehut: adopt StateDirectory

* Apply suggestions from code review

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
Co-authored-by: Thibaut Marty <github@thibautmarty.fr>
Co-authored-by: malte-v <34393802+malte-v@users.noreply.github.com>

* nixos/sourcehut: PR suggestions

* nixos/sourcehut: malte-v patch

* nixos/sourcehut: add base virtualhost

* nixos/sourcehut: remove superfluous key

* nixos/sourcehut: use default from cfg

* nixos/sourcehut: use originBase for logs

* nixos/sourcehut: use toPythonApplication in systemPackages

* nixos/sourcehut: directly use ExecStart

* nixos/sourcehut: update docs

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
Co-authored-by: Thibaut Marty <github@thibautmarty.fr>
Co-authored-by: malte-v <34393802+malte-v@users.noreply.github.com>
2021-06-05 14:42:51 -04:00
github-actions[bot] 0397e518b7
Merge staging-next into staging 2021-06-05 18:30:31 +00:00
Kim Lindberger 0dda2a708f
Merge pull request #125699 from talyz/fix-mysql-alias
treewide: Fix mysql alias deprecation breakage
2021-06-05 19:07:35 +02:00
Sandro 9751baf8da
Merge pull request #125303 from Vonfry/fcitx5/autostart
nixos/fcitx5: autostart with xserver
2021-06-05 18:06:12 +02:00
Sandro ef45f53bc9
Merge pull request #106465 from jerith666/globalprotect-vpn 2021-06-05 16:40:21 +02:00
ElXreno 7b9df38982
bees: 0.6.3 -> 0.6.5
Change-Id: I1866eab9c348d9c10219290ecba698121a32d128
2021-06-05 17:39:12 +03:00
ElXreno a3fa2cf7c2
bees: nixpkgs-fmt
Change-Id: If4e9431dad00ffade3316cf22235d8d44d12d149
2021-06-05 17:39:12 +03:00
Malte Voos f41f456422 nixos/roundcube: Use php74 2021-06-05 15:28:29 +02:00
Robert Hensing 81c8189a84 nixos/postgresqlBackup: Only replace backup when successful
Previously, a failed backup would always overwrite ${db}.sql.gz,
because the bash `>` redirect truncates the file; even if the
backup was going to fail.
On the next run, the ${db}.prev.sql.gz backup would be
overwritten by the bad ${db}.sql.gz.

Now, if the backup fails, the ${db}.in-progress.sql.gz is in an
unknown state, but ${db}.sql.gz will not be written.
On the next run, ${db}.prev.sql.gz (our only good backup) will
not be overwritten because ${db}.sql.gz does not exist.
2021-06-05 15:09:27 +02:00
github-actions[bot] d776739d99
Merge staging-next into staging 2021-06-05 06:28:02 +00:00
Jörg Thalheim 6fdb73a3b4
Merge pull request #118801 from Mic92/k3s
nixos/k3s: improve zfs/docker support
2021-06-05 07:54:54 +02:00
Jörg Thalheim 03582eb6e3
nixos/k3s: add zfs to path 2021-06-05 07:52:53 +02:00
Jörg Thalheim 7c310e8d28
nixos/k3s: add to environment.systemPackages for adminstration 2021-06-05 07:52:48 +02:00
Vonfry 195b26b95e
nixos/fcitx5: autostart with xserver 2021-06-05 09:22:58 +08:00
github-actions[bot] 8d96bfd409
Merge staging-next into staging 2021-06-05 00:20:36 +00:00
Edward Tjörnhammar afdb5675a1 nixos/containers: add storage.conf 2021-06-05 10:08:24 +10:00
Maciej Krüger 26b3751de7
Merge pull request #97692 from ryneeverett/lockkernelmodules-lxd 2021-06-05 01:27:27 +02:00
Pascal Bach b1b9e003dc nixos/minio: credentialfile 2021-06-04 23:27:12 +02:00
talyz 59e0120aa5
treewide: Fix mysql alias deprecation breakage
62733b37b4 broke evaluation in all
places `pkgs.mysql` was used. Fix this by changing all occurrences to
`pkgs.mariadb`.
2021-06-04 21:42:08 +02:00
github-actions[bot] c06baac6ff
Merge staging-next into staging 2021-06-04 19:41:02 +00:00
Robert Hensing c586e42763 nixos/postgresqlBackup: Use PATH for readability 2021-06-04 17:49:53 +02:00
Robin Gloster 5433abfd6d
Merge pull request #125483 from Ma27/prometheus-exporter-fixes
nixos/prometheus-exporters: improve docs & fix rspamd exporter
2021-06-04 09:10:34 -05:00
github-actions[bot] 0b0d0c21ec
Merge staging-next into staging 2021-06-04 13:00:29 +00:00
Luke Granger-Brown 39e225b0f4 nixos/engelsystem: don't rely on mysql alias
Since 3edde6562e, we can no longer use
aliases inside the test framework. This has the implication that we can
no longer use aliases in any NixOS modules used by the test framework as
well (which is good), but does mean we need to clean up any instances
where this is the case.
2021-06-04 08:43:48 +00:00
Maximilian Bosch 951e6988ac
Merge pull request #104543 from chkno/sftpServerExecutable
nixos/sshd: Option to set the sftp server executable
2021-06-04 10:16:20 +02:00
github-actions[bot] b511c637c8
Merge staging-next into staging 2021-06-03 19:52:05 +00:00
talyz f5f8341c76
nixos/geoipupdate: Replace the old geoip-updater module
Our old bespoke GeoIP updater doesn't seem to be working
anymore. Instead of trying to fix it, replace it with the official
updater from MaxMind.
2021-06-03 20:57:25 +02:00
Bjørn Forsman 4bcb22e17a nixos/jenkins-job-builder: add support for folder jobs
Add support for folder jobs
(https://plugins.jenkins.io/cloudbees-folder/) by reworking the service
to support nested jobs.

This also fixes this deprecation warning (as a happy side effect):

  WARNING:jenkins_jobs.cli.subcommand.test:(Deprecated) The default output behavior of `jenkins-jobs test` when given the --output flag will change in JJB 3.0. Instead of writing jobs to OUTPUT/jobname; they will be written to OUTPUT/jobname/config.xml. The new behavior can be enabled by the passing `--config-xml` parameter
2021-06-03 19:29:57 +02:00
github-actions[bot] 25b7ba022b
Merge staging-next into staging 2021-06-03 12:49:14 +00:00
Maximilian Bosch ba9768f314
nixos/mail-exporter: add note about rspamd marking probe mails as spam 2021-06-03 13:10:23 +02:00
Maximilian Bosch 6fb847c556
nixos/dovecot-exporter: fix documentation for old stats 2021-06-03 13:01:11 +02:00
Maximilian Bosch 976d668e5c
nixos/rspamd-exporter: fix metrics
In 0.3.0 of the json-exporter[1] it was switched to a different jsonpath
library which made some changes - especially for spaces in keys -
necessary. Also I decided to remove the pretty-printed JSON as this
would interfere with the bash quoting too much. If one needs
pretty-printed output, they can still pipe the output to `jq`.

[1] https://github.com/prometheus-community/json_exporter/releases/tag/v0.3.0
2021-06-03 12:37:48 +02:00
Linus Heckemann 19cd7343fd
Merge pull request #125331 from wentasah/fix-mailman-serivce
nixos/mailman: Fix mailman-settings.service configuration
2021-06-03 10:34:45 +02:00
github-actions[bot] 7b3fe5e16a
Merge staging-next into staging 2021-06-03 07:26:17 +00:00
zowoq 3cf17240f0 Revert "nixos/containers: add storage.conf"
This file requires some defaults to be set otherwise podman, etc errors.
It also broke the podman nixos tests.

This reverts commit 7a4de9a983.
2021-06-03 13:56:17 +10:00
Martin Weinelt 01f8f4f074
nixos/matrix-synapse: allow preloading jemalloc
This is the default in the upstreams docker image and claims to reduce
memory fragmentation and usage.
2021-06-03 05:16:45 +02:00
Matt McHenry e2b7cfedd6 globalprotect-openconnect: init at 1.2.6
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: sterni <sternenseemann@systemli.org>
2021-06-02 19:22:13 -04:00
github-actions[bot] a261aaf9c2
Merge staging-next into staging 2021-06-02 13:08:16 +00:00
Maciej Krüger 5faa7056f9
nixos/virtualbox-image: add exportParams
This allows the user to specify custom export
parameters like adding a vendor to the exported VM
2021-06-02 13:28:43 +02:00
Maximilian Bosch cc88797ce0 plausible: minor polishing 2021-06-02 19:21:31 +09:00
Maximilian Bosch 6bc72cdd4a plausiblew: cleanup build & update script 2021-06-02 19:21:31 +09:00
Maximilian Bosch 02b15d0f5b plausible: first review fix iteration
* Most significant is probably the patching necessary to run plausible
  with postgres without superuser privilege. This change includes:
  * updating ecto_sql to 3.6 where `CREATE DATABASE` is only executed if
    it doesn't exist[1].
  * patching a migration to only modify the `users.email` column (to use
    `citext` rather than creating the extension. `plausible-postgres`
    takes care of that).
* Correctly declare dependencies in systemd.
* A few minor fixes.

[1] 051baf669e
2021-06-02 19:21:31 +09:00
Maximilian Bosch b06ea1146c plausible: init at 1.3.0 2021-06-02 19:21:31 +09:00
Edward Tjörnhammar 7a4de9a983 nixos/containers: add storage.conf 2021-06-02 19:03:53 +10:00
github-actions[bot] 632c65fbd4
Merge staging-next into staging 2021-06-02 07:51:55 +00:00
Michal Sojka 2a4755e1d4 nixos/mailman: Fix mailman-settings.service configuration
Without this change, mailman-settings.service is not guaranteed to
complete before dependent services. This can lead to various errors
like:

    mailman-web-setup.service: Changing to the requested working directory failed: No such file or directory
2021-06-02 08:20:08 +02:00
Robert Hensing d9e4512443
Merge pull request #124589 from hercules-ci/containers-dnsname
nixos/podman-dnsname: init
2021-06-02 08:18:48 +02:00
Kira Bruneau caac437b9b nixos/gamemode: add module 2021-06-01 21:03:34 -04:00
rnhmjoj 030a521adc
nixos/wireless: make wireless.interfaces mandatory
This is the only way to solve issue #101963, for now.
2021-06-01 23:19:40 +02:00
github-actions[bot] ffe6577d05
Merge staging-next into staging 2021-06-01 20:30:47 +00:00
Jörg Thalheim 79ef19e02b
Merge pull request #125169 from Mic92/containerd-zfs
nixos/containerd: improve zfs support
2021-06-01 20:43:11 +02:00
Jörg Thalheim f2e4cb7f20
nixos/containerd: improve zfs support 2021-06-01 20:41:42 +02:00
Jan Tojnar ab0d28758e
Merge pull request #125180 from chpatrick/gnome-flashback-panel-modules
gnome-flashback: add module support to gnome-panel for installing applets
2021-06-01 19:34:36 +02:00
Sandro 44327ab7dc
Merge pull request #124991 from ju1m/apparmor 2021-06-01 15:26:30 +02:00
Sandro eb5c8e51b7
Merge pull request #124404 from nagy/option-types 2021-06-01 15:12:16 +02:00
Patrick Chilton 6bcd4fe4ef gnome-flashback: add module support to gnome-panel for installing applets
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2021-06-01 14:04:30 +02:00
Jörg Thalheim 11a38f62f0
k3s: add tokenFile option
To avoid having secrets in the nix store.
2021-06-01 13:35:04 +02:00
Jörg Thalheim 852739337b
nixos/k3s: add to environment.systemPackages for adminstration 2021-06-01 13:35:03 +02:00
Jörg Thalheim 846f44e880
Merge pull request #121667 from Mic92/buildkite
nixos/buildkite-agents: fix race-condition when installing secrets
2021-06-01 09:31:23 +02:00
rsynnest b562ae6c31 nixos/unifi-video: init at 3.10.13 2021-05-31 16:26:13 -07:00
Martin Weinelt e09bfc5d1c
Merge pull request #124950 from vincentbernat/fix/acme-no-reuse-key
nixos/acme: don't use --reuse-key
2021-06-01 00:59:09 +02:00
Vincent Bernat 632c8e1d54
nixos/acme: don't use --reuse-key
Reusing the same private/public key on renewal has two issues:

 - some providers don't accept to sign the same public key
   again (Buypass Go SSL)

 - keeping the same private key forever partly defeats the purpose of
   renewing the certificate often

Therefore, let's remove this option. People wanting to keep the same
key can set extraLegoRenewFlags to `[ --reuse-key ]` to keep the
previous behavior. Alternatively, we could put this as an option whose
default value is true.
2021-06-01 00:43:45 +02:00
Maciej Krüger ef555f6a0b
Merge pull request #123426 from mattchrist/brscan5 2021-05-31 17:52:16 +02:00
zowoq 72f54c32a6 nixos/podman-network-socket-ghostunnel: move condition to include socket 2021-05-31 23:38:31 +10:00
Robert Hensing 54f2f1e5f1 nixos/podman-dnsname: init 2021-05-31 14:31:09 +02:00
Robert Hensing d81631fb98 nixos/podman: Add defaultNetwork.extraPlugins 2021-05-31 14:31:09 +02:00
Robert Hensing efba949352 nixos/containers: Add virtualisation.containers.containersConf.cniPlugins 2021-05-31 14:29:57 +02:00
Robert Hensing 3600a82711
Merge pull request #124921 from zowoq/podman-cni-conf
podman: install cni config
2021-05-31 14:27:10 +02:00
Dominik Xaver Hörl 436f61c878 nixos/boot: properly override the kernel in boot.kernelPatches
Previously the code took the kernelPatches of the final derivation, which
might or might not be what was passed to the derivation in the original call.
The previous behaviour caused various hacks to become neccessary to avoid duplicates in kernelPatches.
2021-05-31 12:10:19 +02:00
Robert Hensing 5699d027ec nixos/metricbeat: init 2021-05-31 10:42:08 +02:00
Julien Moutinho 61654ca131 nixos/pam: use new plasma5Packages, fixes #124973 2021-05-30 21:44:25 +02:00
Johannes Schleifenbaum 878103ce55
nixos/trilium: use boolToString for noBackup 2021-05-30 18:16:13 +02:00
Martin Weinelt 219d8381bd
Merge pull request #124947 from helsinki-systems/fix/libvirtd-ethertypes 2021-05-30 16:52:46 +02:00
Janne Heß 964fc7cfef
Update nixos/modules/virtualisation/libvirtd.nix
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
2021-05-30 16:00:50 +02:00
Daniel Nagy e57465a617
nixos/monero: set port type to types.port 2021-05-30 14:38:20 +02:00
Daniel Nagy cc5517da4c
nixos/gitlab: set port type to types.port 2021-05-30 14:38:20 +02:00
Daniel Nagy 8e760f4858
nixos/matrix-synapse: set port type to types.port 2021-05-30 14:38:19 +02:00
Daniel Nagy 65b32a0afe
nixos/syncserver: set port type to types.port 2021-05-30 14:38:19 +02:00
Daniel Nagy 048c45679f
nixos/gitDaemon: set port type to types.port 2021-05-30 14:38:19 +02:00
Daniel Nagy 0cde374a76
nixos/redis: set port type to types.port 2021-05-30 14:38:19 +02:00
Daniel Nagy 73f9c29a2c
nixos/discourse: set port type to types.port 2021-05-30 14:38:18 +02:00
Daniel Nagy 137924cc96
nixos/terraria: adapt option types 2021-05-30 14:38:18 +02:00
Daniel Nagy 941fd008ed
nixos/lighttpd: set port type to types.port 2021-05-30 14:38:18 +02:00
Daniel Nagy a5321aecfb
nixos/darkhttpd: set port type to types.port 2021-05-30 14:38:18 +02:00
Janne Heß 2eeecef3fc
nixos/libvirtd: Take ethertypes from iptables-nftables-compat
iptables is currently defined in `all-packages.nix` to be
iptables-compat. That package does however not contain `ethertypes`.
Only `iptables-nftables-compat` contains this file so the symlink
dangles.
2021-05-30 11:55:19 +02:00
Robert Hensing b6570e7238 nixos/podman-network-socket-ghostunnel: init 2021-05-30 11:23:24 +02:00
Robert Hensing 52844efcd6 nixos/podman: Add generic networkSocket interface 2021-05-30 11:21:05 +02:00
Robert Hensing ff4d83a667 nixos/podman: Add dockerSocket.enable 2021-05-30 11:21:05 +02:00
Robert Hensing fb8b0a3843 nixos/podman: Change podman socket to new podman group 2021-05-30 11:21:05 +02:00
zowoq 30ae7e4ba9 nixos/podman: install cni config from package 2021-05-30 11:40:36 +10:00
markuskowa f188138af3
Merge pull request #124181 from pmenke-de/sdrplay
sdrplay: init at 3.07.1
2021-05-29 22:21:10 +02:00
Martin Weinelt ee8cf6a664
Merge pull request #124839 from mweinelt/wordpress/secret-key-regen
nixos/wordpress: regenerate secret keys if misspelled key name is found
2021-05-29 22:13:03 +02:00
Martin Weinelt 724ed08df0
nixos/wordpress: regenerate secret keys if misspelled key name is found
A secret key generated by the nixos module was misspelled, which could
possibly impact the security of session cookies.

To recover from this situation we will wipe all security keys that were
previously generated by the NixOS module, when the misspelled one is
found. This will result in all session cookies being invalidated. This
is confirmed by the wordpress documentation:

> You can change these at any point in time to invalidate all existing
> cookies. This does mean that all users will have to login again.

https://wordpress.org/support/article/editing-wp-config-php/#security-keys

Meanwhile this issue shouldn't be too grave, since the salting function
of wordpress will rely on the concatenation of both the user-provided
and automatically generated values, that are stored in the database.

> Secret keys are located in two places: in the database and in the
> wp-config.php file. The secret key in the database is randomly
> generated and will be appended to the secret keys in wp-config.php.

https://developer.wordpress.org/reference/functions/wp_salt/

Fixes: 2adb03fdae ("nixos/wordpress:
generate secrets locally")

Reported-by: Moritz Hedtke <Moritz.Hedtke@t-online.de>
2021-05-29 04:24:42 +02:00
Matt Christ dd54ac5648 brscan5: simplify mkEnableOption 2021-05-28 20:55:55 -05:00
Niklas Hambüchen d344dccf3d nixos/wireguard: Remove .path systemd unit for privkey. Fixes #123203
As per `man systemd.path`:

> When a service unit triggered by a path unit terminates
> (regardless whether it exited successfully or failed),
> monitored paths are checked immediately again,
> **and the service accordingly restarted instantly**.

Thus the existence of the path unit made it impossible to stop the
wireguard service using e.g.

    systemctl stop wireguard-wg0.service

Systemd path units are not intended for program inputs such
as private key files.
This commit simply removes this usage; the private key is still
generated by the `generateKeyServiceUnit`.
2021-05-28 17:44:19 -07:00
talyz cb80b67993 nixos/discourse: Assert deployed PostgreSQL version
Assert that the PostgreSQL version being deployed is the one used
upstream. Allow the user to override this assertion, since it's not
always possible or preferable to use the recommended one.
2021-05-28 17:43:02 -07:00
talyz 1f6b48be74 discourse: 2.6.5 -> 2.7.0 2021-05-28 17:43:02 -07:00
pmenke 9e0ed182aa
sdrplay: init at 3.07.1
this adds support for software defined radio (SDR) devices by SDRplay.
SDRplay provides an unfree binary library and api-service as well
as a MIT licensed adapter library for SoapySDR for integration
with many popular SDR applications.
2021-05-28 15:40:04 +02:00
Jan Tojnar b2f86e6662
nixos/gnome: Do not enable metacity by default
Did not realize this is not conditional on gnome-flashback being enabled.

Partially reverts https://github.com/NixOS/nixpkgs/pull/113957
2021-05-28 14:57:36 +02:00
Jan Tojnar e923fc2d2b
Merge pull request #113957 from chpatrick/gnome-flashback-panel-fix
gnome-flashback: add option to remove gnome-panel, auto-generate wmName
2021-05-28 13:32:22 +02:00
Patrick Chilton 424cd7d999 gnome-flashback: add option to remove gnome-panel, auto-generate wmName 2021-05-28 13:10:17 +02:00
Domen Kožar b72c2d3806
duplicati: 2.0.5.1 -> 2.0.6.1, fix nixos module 2021-05-28 10:33:53 +02:00
David Arnold 13750b25a5 kubernetes: fix generated kubeconfig
The absence of current-context in the right place resulted in obscure
bugs. The reason this has not been detected before can only be that
it was unused.
2021-05-26 23:39:48 -07:00
Sandro 5619e3eb35
Merge pull request #124147 from superherointj/package-firebird-v4.0.0 2021-05-27 05:13:50 +02:00
Sandro 5584b49a46
Merge pull request #123363 from FliegendeWurst/trilium-update-0.47.3 2021-05-27 04:52:55 +02:00
Naïm Favier a6788be01a
nixos/luksroot: add bypassWorkqueues (#118114)
https://wiki.archlinux.org/index.php/Dm-crypt/Specialties#Disable_workqueue_for_increased_solid_state_drive_(SSD)_performance
2021-05-26 09:43:38 -04:00
Matt Christ c92404dc69 brscan5: update example to be supported model 2021-05-25 19:14:18 -05:00
Martin Weinelt fcd6d0bc14
Merge pull request #124263 from Lassulus/solanum3
solanum: remove obsolete BANDB settings/patches
2021-05-25 20:51:32 +02:00
Sandro Jäckel 140828ce38
nixos/kresd: tell resolveconf to use local resolver 2021-05-25 16:37:00 +02:00
Niklas Hambüchen 83a8acc392
Merge pull request #121331 from nh2/wireguard-dynamicEndpointRefreshSeconds
nixos/wireguard: Add `dynamicEndpointRefreshSeconds` option
2021-05-24 21:49:05 +02:00
lassulus 8eb5701aaf solanum: remove obsolete BANDB settings/patches 2021-05-24 15:49:57 +02:00
Naïm Favier 821ca7d4cc
nixos/nginx: add option rejectSSL exposing ssl_reject_handshake 2021-05-24 15:10:09 +02:00
regnat 113823669b Revert "nixos/nix-daemon: fix sandbox-paths option"
This reverts commit aeeee447bc.
2021-05-24 10:51:02 +02:00
FliegendeWurst b9e2b878c5 nixos/trilium-server: noBackup option 2021-05-24 09:55:49 +02:00
FliegendeWurst 7cb492fb13 nixos/trilium-server: add myself as maintainer 2021-05-24 09:55:49 +02:00
Ivan Kozik d95960e275 nixos/bitwarden_rs: fix startup on 32 thread machines
LimitNPROC=64 is too low for bitwarden_rs to start on a 32 thread machine.
Remove the limit.

This fixes:

```
bitwarden_rs[38701]: /--------------------------------------------------------------------\
bitwarden_rs[38701]: |                       Starting Bitwarden_RS                        |
bitwarden_rs[38701]: |--------------------------------------------------------------------|
bitwarden_rs[38701]: | This is an *unofficial* Bitwarden implementation, DO NOT use the   |
bitwarden_rs[38701]: | official channels to report bugs/features, regardless of client.   |
bitwarden_rs[38701]: | Send usage/configuration questions or feature requests to:         |
bitwarden_rs[38701]: |   https://bitwardenrs.discourse.group/                             |
bitwarden_rs[38701]: | Report suspected bugs/issues in the software itself at:            |
bitwarden_rs[38701]: |   https://github.com/dani-garcia/bitwarden_rs/issues/new           |
bitwarden_rs[38701]: \--------------------------------------------------------------------/
bitwarden_rs[38701]: [INFO] No .env file found.
bitwarden_rs[38701]: [2021-05-24 03:34:41.121][bitwarden_rs::api::core::sends][INFO] Initiating send deletion
bitwarden_rs[38701]: [2021-05-24 03:34:41.122][start][INFO] Rocket has launched from http://127.0.0.1:8222
bitwarden_rs[38701]: [2021-05-24 03:34:41.126][panic][ERROR] thread 'unnamed' panicked at 'failed to spawn thread: Os { code: 11, kind: WouldBlock, message: "Resource temporarily unavailable" }': /build/rustc-1.52.1-src/library/std/src/thread/mod.rs:620
bitwarden_rs[38701]:    0: bitwarden_rs::init_logging::{{closure}}
bitwarden_rs[38701]:    1: std::panicking::rust_panic_with_hook
bitwarden_rs[38701]:    2: std::panicking::begin_panic_handler::{{closure}}
bitwarden_rs[38701]:    3: std::sys_common::backtrace::__rust_end_short_backtrace
bitwarden_rs[38701]:    4: rust_begin_unwind
bitwarden_rs[38701]:    5: core::panicking::panic_fmt
bitwarden_rs[38701]:    6: core::result::unwrap_failed
bitwarden_rs[38701]:    7: hyper::server::listener::spawn_with
bitwarden_rs[38701]:    8: hyper::server::listener::ListenerPool<A>::accept
bitwarden_rs[38701]:    9: std::sys_common::backtrace::__rust_begin_short_backtrace
bitwarden_rs[38701]:   10: core::ops::function::FnOnce::call_once{{vtable.shim}}
bitwarden_rs[38701]:   11: std::sys::unix:🧵:Thread:🆕:thread_start
bitwarden_rs[38701]:   12: start_thread
bitwarden_rs[38701]:   13: __GI___clone
bitwarden_rs[38701]: [2021-05-24 03:34:41.126][panic][ERROR] thread 'main' panicked at 'internal error: entered unreachable code: the call to `handle_threads` should block on success': /build/bitwarden_rs-1.20.0-vendor.tar.gz/rocket/src/rocket.rs:751
bitwarden_rs[38701]:    0: bitwarden_rs::init_logging::{{closure}}
bitwarden_rs[38701]:    1: std::panicking::rust_panic_with_hook
bitwarden_rs[38701]:    2: std::panicking::begin_panic_handler::{{closure}}
bitwarden_rs[38701]:    3: std::sys_common::backtrace::__rust_end_short_backtrace
bitwarden_rs[38701]:    4: rust_begin_unwind
bitwarden_rs[38701]:    5: core::panicking::panic_fmt
bitwarden_rs[38701]:    6: rocket:🚀:Rocket::launch
bitwarden_rs[38701]:    7: bitwarden_rs::main
bitwarden_rs[38701]:    8: std::sys_common::backtrace::__rust_begin_short_backtrace
bitwarden_rs[38701]:    9: std::rt::lang_start::{{closure}}
bitwarden_rs[38701]:   10: std::rt::lang_start_internal
bitwarden_rs[38701]:   11: main
```
2021-05-24 04:36:17 +00:00
Sandro fd26001ead
Merge pull request #123304 from SuperSandro2000/pihole-exporter 2021-05-24 04:27:16 +02:00
Sandro Jäckel 0724518919
nixos/prometheus: init pihole-exporter 2021-05-24 04:05:59 +02:00
Anderson Torres e445fc8661
Merge pull request #123583 from superherointj/module-libvirtd-ovmf-aarch64-fix
libvirtd: fix ovmf for aarch64
2021-05-23 19:56:27 -03:00
Michael Raskin ab51a2dbd6
Merge pull request #123926 from pschyska/master
nixos/atop: Add defaultText to types.package options, Fix timing-related test failures.
2021-05-23 18:08:46 +00:00
José Romildo Malaquias de84bd18d7
Merge pull request #121031 from romildo/fix.lxqt
lxqt: does not explicitly require gvfs package
2021-05-23 15:06:55 -03:00
superherointj 97d9e7849b nixos/firebird: updated firebird package 2021-05-23 10:53:00 -03:00
Matt Christ 14bf8f109b fix brscan5 config generation
before this, the config utility was unable to locate the models folder
update tests to use a compatible model
2021-05-23 08:08:31 -05:00
Guillaume Girol d7555732bc
Merge pull request #123902 from hyperfekt/mount-pstore-quiet
nixos/filesystems: condition mount-pstore.service on unmounted /sys/fs/pstore
2021-05-23 12:18:14 +00:00
Samuel Dionne-Riel 20b023b5ea iso-image: Improve disk detection
This should help in rare hardware-specific situations where the root is
not automatically detected properly.

We search using a marker file. This should help some weird UEFI setups
where the root is set to `(hd0,msdos2)` by default.

Defaulting to `(hd0)` by looking for the ESP **will break themeing**. It
is unclear why, but files in `(hd0,msdos2)` are not all present as they
should be.

This also fixes an issue introduced with cb5c4fcd3c
where rEFInd stopped booting in many cases. This is because it ended up
using (hd0) rather than using the `search` which was happening
beforehand, which in turn uses (hd0,msdos2), which is the ESP.
Putting back the `search` here fixes that.
2021-05-22 20:04:05 -07:00
Samuel Dionne-Riel c9bb054dd6 iso-image: unqualified root → ($root)
This technically changes nothing. In practice `$root` is always the
"CWD", whether searched for automatically or not.

But this serves to announce we are relying on `$root`... I guess...
2021-05-22 20:04:05 -07:00
Samuel Dionne-Riel 15eaed0718 iso-image: change date on all files
It may be that in some conditions dates earlier than 1980 on FAT on GRUB
2.06~ish will cause failures

https://github.com/NixOS/nixpkgs/issues/123376#issuecomment-845515035
2021-05-22 20:04:05 -07:00
Samuel Dionne-Riel f93f0e72e9 iso-image: Force gfxmode
https://www.gnu.org/software/grub/manual/grub/html_node/gfxmode.html
2021-05-22 20:04:05 -07:00
Jonathan Ringer 11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Martin Weinelt 84f649f693
Merge pull request #121626 from mweinelt/botamusique 2021-05-23 02:02:09 +02:00