Commit graph

18768 commits

Author SHA1 Message Date
github-actions[bot]
d9aba51052
Merge staging-next into staging 2021-10-29 06:01:42 +00:00
github-actions[bot]
e7fbce41fc
Merge master into staging-next 2021-10-29 06:01:10 +00:00
Bobby Rong
3f33a306a5
Merge pull request #143513 from bobby285271/pantheon
Pantheon updates 2021-10-28
2021-10-29 09:46:19 +08:00
Bobby Rong
6629b16e78
nixos/pantheon: install elementary-tasks by default 2021-10-29 09:10:40 +08:00
github-actions[bot]
37b1afa489
Merge staging-next into staging 2021-10-28 18:02:03 +00:00
Martin Weinelt
da1f248229 Merge remote-tracking branch 'origin/master' into staging-next 2021-10-28 19:51:45 +02:00
Bobby Rong
9e81c86a44
Merge pull request #143314 from bobby285271/pantheon
Pantheon updates 2021-10-27
2021-10-29 00:50:57 +08:00
Bobby Rong
d49d9a24b7
nixos/pantheon: mention latest appcenter changes in manual 2021-10-29 00:18:25 +08:00
Alyssa Ross
3f01b576af
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
	nixos/doc/manual/release-notes/rl-2111.section.md
2021-10-28 16:07:38 +00:00
github-actions[bot]
ea4da560ff
Merge master into staging-next 2021-10-28 12:01:32 +00:00
talyz
af9f6d9a2a nixos/qemu-vm: Rename pathsInNixDB to additionalPaths
pathsInNixDB isn't a very accurate name when a Nix store image is
built (virtualisation.useNixStoreImage); rename it to additionalPaths,
which should be general enough to cover both cases.
2021-10-28 12:55:01 +02:00
talyz
84839b395f nixos/qemu-vm: Allow building a Nix store image instead of using 9p
Add the `useNixStoreImage` option, allowing a disk image with the
necessary contents from the Nix store to be built using
make-disk-image.nix. The image will be mounted at `/nix/store` and
acts as a drop-in replacement for the usual 9p mounting of the host's
Nix store.

This removes the performance penalty of 9p, drastically improving
execution speed of applications which do lots of reads from the Nix
store. The caveats are increased disk space usage and image build
time.
2021-10-28 12:55:01 +02:00
Bobby Rong
ea8d53ed16
nixos/pantheon: use Inter as default sans-serif font 2021-10-28 18:26:52 +08:00
github-actions[bot]
783f3c33e5
Merge master into staging-next 2021-10-28 06:01:14 +00:00
Bobby Rong
8e440f1776
Merge pull request #142810 from bobby285271/pantheon
Pantheon updates 2021-10-25, 2021-10-26
2021-10-28 08:16:34 +08:00
github-actions[bot]
a1e570b43e
Merge master into staging-next 2021-10-28 00:01:36 +00:00
Guillaume Girol
6faa5581fd
Merge pull request #113198 from Izorkin/update-mastodon-mail
nixos/mastodon: fix send e-mail notifications
2021-10-27 18:20:18 +00:00
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]
9e0658fa12
Merge staging-next into staging 2021-10-27 06:01:57 +00: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]
b6a580b9b3
Merge staging-next into staging 2021-10-27 00:02:06 +00: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]
7455d89599
Merge staging-next into staging 2021-10-26 18:01:57 +00: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]
9d11ed2864
Merge staging-next into staging 2021-10-26 12:02:02 +00:00
github-actions[bot]
6bb6e64046
Merge master into staging-next 2021-10-26 12:01:25 +00:00
Izorkin
1d948428c8
nixos/mastodon: fix send e-mail notifications 2021-10-26 10:59:39 +03: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]
e5fe4acb71
Merge staging-next into staging 2021-10-26 06:01:35 +00: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
Bobby Rong
4780b6df1a
pantheon.elementary-settings-daemon: 1.0.0 -> 1.1.0 2021-10-26 08:42:26 +08:00
Bobby Rong
e26214dd6c
xdg-desktop-portal-pantheon: init at 1.0.0 2021-10-26 08:35:22 +08:00
github-actions[bot]
47ad670e14
Merge staging-next into staging 2021-10-26 00:02:18 +00: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]
a16b1b54b3
Merge staging-next into staging 2021-10-25 12:02:08 +00: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