3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

18728 commits

Author SHA1 Message Date
github-actions[bot] d33a58f89d
Merge master into staging-next 2021-10-27 12:01:20 +00:00
Maximilian Bosch 55e25f7840
Merge pull request #142800 from Ma27/drop-nextcloud-20
nextcloud20: drop
2021-10-27 13:11:06 +02:00
Maximilian Bosch 04fdff2517
nixos/nextcloud: drop obsolete assertion 2021-10-27 12:54:04 +02:00
github-actions[bot] 160c71e060
Merge master into staging-next 2021-10-27 06:01:21 +00:00
Peter Hoeg 22a500a3f8 pam_mount: do not re-prompt for password
nixos-rebuild test causes pam_mount to prompt for a password when running with
an encrypted home:

building '/nix/store/p6bflh7n5zy2dql8l45mix9qnzq65hbk-nixos-system-mildred-18.09.git.98592c5da79M.drv'...
activating the configuration...
setting up /etc...
reenter password for pam_mount:
(mount.c:68): Messages from underlying mount program:
(mount.c:72): crypt_activate_by_passphrase: File exists
(pam_mount.c:522): mount of /dev/mapper/vg0-lv_home_peter failed
kbuildsycoca5 running...

This change makes pam_mount not prompt. It still tries to remount (and fails in
the process) but that message can be ignored.

Fixes: #44586
2021-10-27 08:53:15 +08:00
github-actions[bot] 23c6bab47e
Merge master into staging-next 2021-10-27 00:01:25 +00:00
eyjhb 75d64a336b nixos/restic: rename s3CredentialsFile to environmentFile
This is done as the s3CredentialsFile specifies the environmentFile
for the systemd service, which can be used for more than just s3.

Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2021-10-26 14:01:32 -07:00
Wei Tang 7c7cd951c5
nixos/step-ca: fix comment typo 2021-10-26 20:47:30 +02:00
github-actions[bot] 9a27efeb34
Merge master into staging-next 2021-10-26 18:01:19 +00:00
Sandro 89a27a2e6f
Merge pull request #119719 from greizgh/seafile 2021-10-26 19:07:00 +02:00
github-actions[bot] 6bb6e64046
Merge master into staging-next 2021-10-26 12:01:25 +00:00
Vladimír Čunát 1f89685452
Merge #142864: nixos/gnome: fix an alias reference 2021-10-26 08:35:22 +02:00
github-actions[bot] 7e0da80ec9
Merge master into staging-next 2021-10-26 06:01:02 +00:00
Cleeyv 29f4cb4b0a nixos/jibri: add nixos test 2021-10-25 20:46:24 -04:00
Cleeyv 917c5fae70 nixos/jibri: fix & docs for enable not via meet 2021-10-25 20:46:24 -04:00
Cleeyv 57bd54d28b nixos/jibri: add finalize script option 2021-10-25 20:46:24 -04:00
Cleeyv 3473cff4b0 nixos/jibri: init at 8.0-93-g51fe7a2
This module was written by @puckipedia for nixcon-video-infra 2020.
Minor changes made by @cleeyv for compat with existing jibri package.
Co-authored-by: Puck Meerburg <puck@puck.moe>
2021-10-25 20:46:24 -04:00
Cleeyv ff8ed90033 nixos/jitsi-meet: add jibri.enable
This option enables a jibri service on the same host that is running
jitsi-meet. It was written, along with the jibri module, by @puckipedia
for nixcon-video-infra 2020.
Co-authored-by: Puck Meerburg <puck@puck.moe>
2021-10-25 20:46:24 -04:00
Martin Weinelt a47e0a6554 Merge remote-tracking branch 'origin/master' into staging-next 2021-10-25 21:03:48 +02:00
Martin Weinelt 1c20719373
Merge pull request #139311 from NinjaTrappeur/nin-acme-fix-webroot 2021-10-25 20:27:29 +02:00
Jonathan Ringer 569633e41c
nixos/gnome: remove alias reference to source-sans-pro 2021-10-25 08:28:23 -07:00
github-actions[bot] 0336295c41
Merge master into staging-next 2021-10-25 12:01:31 +00:00
Florian Klink 81715a5da0
Merge pull request #142570 from flokli/add-missing-cryptsetup-targets
nixos/systemd: add remote-cryptsetup.target
2021-10-25 12:51:27 +02:00
Vladimír Čunát b0d5803400
Merge #142786: plasma5: fix eval without aliases 2021-10-25 11:50:44 +02:00
illustris 91bb2b7016 nixos/hadoop: fix yarn, add more service configuration options 2021-10-25 16:30:19 +09:00
github-actions[bot] 0386c26190
Merge master into staging-next 2021-10-25 06:01:29 +00:00
Izorkin 4c092350ed nixos/peertube: init service
Co-authored-by: Moritz Hedtke <Moritz.Hedtke@t-online.de>
Co-authored-by: Steven Roose <steven@stevenroose.org>
Co-authored-by: Matthias Beyer <mail@beyermatthias.de>
Co-authored-by: Ismaël Bouya <ismael.bouya@normalesup.org>
2021-10-25 13:12:30 +09:00
Maximilian Bosch e1e15974f8
nextcloud20: drop
The version 20 of Nextcloud will be EOLed by the end of this month[1].

Since the recommended default (that didn't raise an eval-warning) on
21.05 was Nextcloud 21, this shouldn't affect too many people.

In order to ensure that nobody does a (not working) upgrade across
several major-versions of Nextcloud, I replaced the derivation of
`nextcloud20` with a `throw` that provides instructions how to proceed.

The only case that I consider "risky" is a setup upgraded from 21.05 (or
older) with a `system.stateVersion` <21.11 and with
`services.nextcloud.package` not explicitly declared in its config. To
avoid that, I also left the `else-if` for `stateVersion < 21.03` which
now sets `services.nextcloud.package` to `pkgs.nextcloud20` and thus
leads to an eval-error. This condition can be removed
as soon as 21.05 is EOL because then it's safe to assume that only
21.11. is used as stable release where no Nextcloud <=20 exists that can
lead to such an issue.

It can't be removed earlier because then every `system.stateVersion <
21.11` would lead to `nextcloud21` which is a problem if `nextcloud19`
is still used.

[1] https://docs.nextcloud.com/server/20/admin_manual/release_schedule.html
2021-10-25 01:34:47 +02:00
ajs124 76a77c0bfb plasma5: fix evaluation with aliases disabled and thunderbolt enabled 2021-10-24 23:10:52 +02:00
github-actions[bot] ceea0e5f2a
Merge master into staging-next 2021-10-24 18:00:57 +00:00
Bruno Bigras 69b01e3a22
Merge pull request #141408 from bbigras/openresty-lua
nixos/nginx: disable MemoryDenyWriteExecute for pkgs.openresty
2021-10-24 17:39:27 +00:00
Sandro 062469fd09
Merge pull request #140309 from OPNA2608/init/gkraken/21.11 2021-10-24 18:28:57 +02:00
github-actions[bot] e84dc8ac6b
Merge master into staging-next 2021-10-24 12:01:27 +00:00
Sebastian dc0769c63c
nixos/bookstack: fix error message output (#142729) 2021-10-24 18:13:54 +08:00
github-actions[bot] 50a5d0f17c
Merge master into staging-next 2021-10-23 18:01:15 +00:00
Alexandre Iooss 8d559672be
nixos/grafana: fix systemd unit
Remove MemoryDenyWriteExecute hardening as it breaks image rendering
plugin. Add CAP_NET_BIND_SERVICE to bind to low ports when needed.
Remove PrivateUsers and ProcSubset as upstream choose to remove it.

Upstream changes: <https://github.com/grafana/grafana/pull/40219>,
<https://github.com/grafana/grafana/pull/40178>,
<https://github.com/grafana/grafana/pull/40339> and
<https://github.com/grafana/grafana/pull/40815>.
2021-10-23 14:33:31 +02:00
Greizgh 7b7f3dfbe4
nixos/seafile: init service 2021-10-23 11:39:08 +02:00
github-actions[bot] 59156778b4
Merge master into staging-next 2021-10-23 06:01:03 +00:00
Artturi dfad31d753
Merge pull request #142273 from ju1m/display-managers 2021-10-23 03:58:21 +03:00
github-actions[bot] 421a9e648e
Merge master into staging-next 2021-10-23 00:01:46 +00:00
pennae 1fa5e13f30 nixos/borgbackup: allow dump scripts as stdin inputs
borg is able to process stdin during backups when backing up the special path -,
which can be very useful for backing up things that can be streamed (eg database
dumps, zfs snapshots).
2021-10-22 16:31:50 -04:00
pennae 56d0b5cd6a nixos/mosquitto: rewrite the module
mosquitto needs a lot of attention concerning its config because it doesn't
parse it very well, often ignoring trailing parts of lines, duplicated config
keys, or just looking back way further in the file to associated config keys
with previously defined items than might be expected.

this replaces the mosquitto module completely. we now have a hierarchical config
that flattens out to the mosquitto format (hopefully) without introducing spooky
action at a distance.
2021-10-22 16:06:55 -04:00
github-actions[bot] c93daf97af
Merge master into staging-next 2021-10-22 18:01:15 +00:00
Michele Guerini Rocco b1df6feb1a
Merge pull request #142272 from ju1m/console
nixos/console: fix cross-compiling
2021-10-22 19:02:25 +02:00
Jonathan Ringer fc25d94010
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/jupyter-client/default.nix
	pkgs/development/python-modules/jupyterlab-git/default.nix
2021-10-22 09:33:07 -07:00
davidak 6adc2ce335
Merge pull request #142455 from bobby285271/fileroller
pantheon.file-roller: init
2021-10-22 16:21:45 +02:00
Florian Klink 0084c41abf nixos/systemd: add remote-cryptsetup.target
/etc/crypttab can contain the _netdev option, which adds crypto devices
to the remote-cryptsetup.target.

remote-cryptsetup.target has a dependency on cryptsetup-pre.target. So
let's add both of them.

Currently, one needs to manually ssh in and invoke `systemctl start
systemd-cryptsetup@<name>.service` to unlock volumes.

After this change, systemd will properly add it to the target, and
assuming remote-cryptsetup.target is pulled in somewhere, you can simply
pass the passphrase by invoking `systemd-tty-ask-password-agent` after
ssh-ing in, without having to manually start these services.

Whether remote-cryptsetup.target should be added to multi-user.target
(as it is on other distros) is part of another discussion - right now
the following snippet will do:

```
systemd.targets.multi-user.wants = [ "remote-cryptsetup.target" ];
```
2021-10-22 15:47:21 +02:00
Peter Hoeg d2ed9e4f96 nixos/plasma5: add thunderbolt package if configured 2021-10-22 10:46:16 +08:00
Peter Hoeg f1a82a2182 nixos/plasma5: make running with systemd configurable 2021-10-22 10:46:16 +08:00
Bobby Rong 73487dee85
nixos/pantheon: prefer pantheon.file-roller 2021-10-22 10:26:27 +08:00