Commit Graph

42675 Commits

Author SHA1 Message Date
éclairevoyant
9aeb620274
Merge pull request #329940 from antonmosich/grammar-fix
nixos/system: fix grammatical error in docs
2024-07-25 17:19:18 +00:00
Anton Mosich
bc1c51d6d0
nixos/system: fix grammatical error in docs 2024-07-25 18:19:35 +02:00
Alexandru Scvortov
742ee97845 livebook: fix service not starting when LIVEBOOK_COOKIE was not set 2024-07-25 17:17:41 +01:00
Alexandru Scvortov
f147a306d5 livebook: add munksgaard and scvalex as maintainers 2024-07-25 17:17:41 +01:00
❄️
5f2a6de6f9
Merge pull request #328385 from rorosen/k3s-kubelet-config
nixos/k3s: add options for graceful node shutdown and kubelet config
2024-07-25 10:19:16 -03:00
github-actions[bot]
12ea252962
Merge master into staging-next 2024-07-25 06:01:22 +00:00
github-actions[bot]
94c17d2caa
Merge master into staging-next 2024-07-25 00:02:30 +00:00
abysssol
084f6a3e26 nixos/ollama: make rocmOverrideGfx backward compatible
The initial version of `rocmOverrideGfx` incorrectly used `lib.mkIf`
in an attempt to prevent interference with previous uses of
`environmentVariables.HSA_OVERRIDE_GFX_VERSION`.

However, the effect was actually to simply erase existing definitions of
`HSA_OVERRIDE_GFX_VERSION` until `rocmOverrideGfx` was set,
which was the situation I was trying to avoid in the first place.

This fixes the bug by switching from `lib.mkIf` to `lib.optionalAttrs`.
2024-07-24 16:11:09 -04:00
abysssol
246d1ee533 nixos/ollama: reformat with nixfmt-rfc-style 2024-07-24 16:09:56 -04:00
Julien Moutinho
43c36273b2 nixos/radicle: fix support of absolute file paths for SSH keys 2024-07-24 22:07:53 +02:00
Guillaume Girol
bbd80e97f9
Merge pull request #328459 from onny/sane-backends-fix
sane-backends: 1.2.1 -> 1.3.1
2024-07-24 20:40:47 +02:00
github-actions[bot]
7208220b63
Merge master into staging-next 2024-07-24 18:01:18 +00:00
Emily
477c3c6d5e
Merge pull request #307962 from jpds/restic-snapshot-list-only-latest
nixos/restic: Use cat config in pre-start repo initialization check
2024-07-24 17:13:38 +02:00
Masum Reza
81cb83b07f
Merge pull request #290008 from eum3l/add-opengfw
opengfw: init at 0.4.0 (+NixOS module)
2024-07-24 20:39:41 +05:30
Bobby Rong
3a422267eb
Merge pull request #329199 from bobby285271/upd/cinnamon-by-name
Move all packages out of cinnamon scope
2024-07-24 22:04:34 +08:00
Robert Hensing
c5e5aa7266
Merge pull request #308822 from yorickvP/yorickvp/streamLayeredImage-overridable
dockerTools.streamLayeredImage: add includeNixDB argument, expose conf and streamScript
2024-07-24 16:02:35 +02:00
Peder Bergebakken Sundt
24899eea99
Merge pull request #327184 from bhankas/goatcounter
nixos/goatcounter: init
2024-07-24 15:38:27 +02:00
eum3l
86ae0fca93 nixos/opengfw: init 2024-07-24 15:11:23 +02:00
github-actions[bot]
8402add1f4
Merge master into staging-next 2024-07-24 12:01:12 +00:00
Silvan Mosberger
473e469d5a
Merge pull request #328381 from tie/map-attrs-flatten 2024-07-24 13:32:34 +02:00
Ivan Trubach
b9c51260d0 lib/deprecated: print deprecation warning for mapAttrsFlatten 2024-07-24 13:23:16 +03:00
Yaya
9ea48560ad nixos/doc/rl-2411: Mention a change in nixos/gitlab
`gitaly` is now using the bundled git package instead of `pkgs.git`
internally to maintain compatibility with GitLab.
2024-07-24 10:51:55 +02:00
Yaya
66f9d60dd7 nixosTests.gitlab: add git package 2024-07-24 10:51:55 +02:00
Yaya
feeb53a430 nixos/gitlab: Replace git package with bundled git
This commit switches gitaly's git package from `pkgs.git` to the bundled
`git` package in order to maintain compatibility with the supported git
release by gitaly.
2024-07-24 10:51:55 +02:00
TheRealGramdalf
d66d94b37b
nixos/caddy: fix group option description (#328034) 2024-07-24 16:40:07 +08:00
Sven Slootweg
51a72a8271
nixos/caddy: fix module docs for new root syntax (#328444)
Old syntax no longer works; `root` now takes two arguments. Updated example in module documentation to reflect this.
2024-07-24 16:38:48 +08:00
Dominique Martinet
7c448e8d44 nixos/cryptpad: harden service
cryptpad is not directly exposed to the network, but has plenty that can
be hardened more properly, so fix that.
2024-07-24 16:17:32 +09:00
Dominique Martinet
b846e8762f nixos/cryptpad: init
This is a full rewrite independent of the previously removed cryptpad
module, managing cryptpad's config in RFC0042 along with a shiny test.

Upstream cryptpad provides two nginx configs, with many optimizations
and complex settings; this uses the easier variant for now but
improvements (e.g. serving blocks and js files directly through nginx)
should be possible with a bit of work and care about http headers.

the /checkup page of cryptpad passes all tests except HSTS, we don't
seem to have any nginx config with HSTS enabled in nixpkgs so leave this
as is for now.

Co-authored-by: Pol Dellaiera <pol.dellaiera@protonmail.com>
Co-authored-by: Michael Smith <shmitty@protonmail.com>
2024-07-24 16:17:26 +09:00
Vladimír Čunát
cd346565bb
Merge branch 'master' into staging-next 2024-07-24 07:19:19 +02:00
Payas Relekar
aebb3d3474 nixos/goatcounter: init 2024-07-24 10:17:44 +05:30
Masum Reza
13da3c09fb
Merge pull request #327499 from max-privatevoid/pam-kanidm-package-option
nixos/pam: use Kanidm's package option
2024-07-24 09:24:09 +05:30
Franz Pletz
b865ea167d
Merge pull request #321644 from pedorich-n/netdata-146 2024-07-23 23:23:30 +02:00
Franz Pletz
e6ae50bb83
Merge pull request #327986 from 7596ff/7596ff/airsonic-context-path 2024-07-23 23:15:27 +02:00
Franz Pletz
f1f5d9433b
Merge pull request #329014 from n8henrie/n8henrie-espanso-maintainer 2024-07-23 23:14:53 +02:00
Kiskae
bfeb6e74cf nixos/nvidia: default open for version 560+ 2024-07-23 22:41:30 +02:00
Jan Tojnar
3178439a4e
Merge pull request #282317 from dawidd6/gdm-autologin-unlocks-keyring
nixos/gdm: autologin unlocks keyring when possible
2024-07-23 21:04:35 +02:00
Bobby Rong
be722f046d
cinnamon: Document scope deprecation 2024-07-23 22:12:43 +08:00
Bobby Rong
d2ec434026
nixos/cinnamon: Fix excludePackages example
We don't ship blueberry and blueberry is in top-level.
2024-07-23 22:12:42 +08:00
Bobby Rong
22b54a6e7f
cinnamon-gsettings-overrides: Move from cinnamon scope to top-level 2024-07-23 22:12:42 +08:00
Bobby Rong
ab6606dfb8
cinnamon-screensaver: Move from cinnamon scope to top-level 2024-07-23 22:12:42 +08:00
Bobby Rong
d1a7acfc47
cinnamon-common: Move from cinnamon scope to top-level 2024-07-23 22:12:41 +08:00
Bobby Rong
6fd4a53e3e
cinnamon-control-center: Move from cinnamon scope to top-level 2024-07-23 22:12:41 +08:00
Bobby Rong
bf4ffb38d0
cinnamon-session: Move from cinnamon scope to top-level 2024-07-23 22:12:41 +08:00
Bobby Rong
f3d0454e4a
nemo-with-extensions: Move from cinnamon scope to top-level 2024-07-23 22:12:40 +08:00
Bobby Rong
925db507a8
nemo: Move from cinnamon scope to top-level 2024-07-23 22:00:19 +08:00
Bobby Rong
e5373c3e6c
cinnamon-settings-daemon: Move from cinnamon scope to top-level 2024-07-23 22:00:18 +08:00
Bobby Rong
e8fd435f36
cinnamon-translations: Move from cinnamon scope to top-level 2024-07-23 22:00:18 +08:00
Bobby Rong
6f102799e7
cinnamon-menus: Move from cinnamon scope to top-level 2024-07-23 22:00:18 +08:00
Bobby Rong
3fba5befb1
cinnamon-desktop: Move from cinnamon scope to top-level 2024-07-23 22:00:18 +08:00
Franz Pletz
38953c157e
Merge pull request #326369 from getchoo/nixos/nvidia/modesetting 2024-07-23 14:16:56 +02:00
github-actions[bot]
d284ef371e
Merge master into staging-next 2024-07-23 12:01:18 +00:00
Florian
a161b380a9
Merge pull request #328205 from litchipi/ifm
ifm: init at 4.0.2
2024-07-23 09:35:56 +02:00
Dawid Dziurla
097b63d424
nixos/gdm: autologin unlocks keyring when possible 2024-07-23 09:34:19 +02:00
Litchi Pi
0fb7268b9b Init IFM service at version 4.0.2
Signed-off-by: Litchi Pi <litchi.pi@proton.me>
2024-07-23 08:44:50 +02:00
github-actions[bot]
09a27d5bc1
Merge master into staging-next 2024-07-23 00:02:18 +00:00
Franz Pletz
b12aaa9f9b
Merge pull request #316139 from Luflosi/bind-service-wait-for-ready-status 2024-07-23 00:19:53 +02:00
Pol Dellaiera
771c4624ed
Merge pull request #328713 from mweinelt/ollama-sandbox-issue
nixos/ollama: replace flawed sandboxing option
2024-07-22 22:21:16 +02:00
Artturin
60e9cffe2c Merge branch 'master' into staging-next 2024-07-22 22:53:31 +03:00
nikstur
be0df72dfa
Merge pull request #328926 from nikstur/sysusers-only-for-sysusers
Sysusers only for sysusers
2024-07-22 20:55:58 +02:00
Bruno BELANYI
87a80cdaf9
Merge pull request #329112 from ambroisie/tandoor-module
nixos/tandoor-recipes: revert 'GUNICORN_MEDIA=1'
2024-07-22 15:48:52 +01:00
Jonas Heinrich
4edef1362f sane-backends: configure and use lock dir 2024-07-22 16:46:30 +02:00
Bobby Rong
3e9b9159cb
Merge pull request #327144 from bobby285271/upd/cinnamon-xapps-by-name
Move various packages out of cinnamon scope
2024-07-22 21:33:16 +08:00
Martin Weinelt
fe58e8856f
nixos/ollama: make host example dualstack wildcard
Binding to IPv6 wildcard generally binds dual-stack, which is also a
better example because the way to specify it is not always very clear.
2024-07-22 14:51:40 +02:00
Martin Weinelt
bd473ceae3
nixos/doc/rl-2411: add ollama changes 2024-07-22 14:51:40 +02:00
Martin Weinelt
12897b37a8
nixos/ollama: harden systemd unit
Tested with CPU and CUDA acceleration. Researched for ROCm, but I have no
compatible card to test it with.
2024-07-22 14:51:40 +02:00
Martin Weinelt
be7bce879f
nixos/ollama: remove writablePaths option
Making the models directory always writable is much simpler, than having
to watch out for an option to facilitate that.
2024-07-22 14:51:39 +02:00
Martin Weinelt
809ea5c6bd
nixos/ollama: replace flawed sandboxing option
The ollama module in its default configuration relies on systemd's
`DynamicUser=` feature for user allocation. In #305076 that allocation
was made conditional and tied to the `sandboxing` option, that was
intended to fix access to model directories outside the allocated state
directory.

However, by disabling sandboxing ollama would inadvertently run as root,
given that `User=` and `Group=` are not required to be set.

The correct way to grant access to other paths is to allocate static
user and group, and grant permissions to the destination path to that
allocation.

We therefore replace the sandboxing option user and group options, that
default to `null`, which means they default to `DynamicUser=`, but can
be replaced with a statically allocated user/group, and thereby a stable
uid/gid.

Fixes: 552eb759 ("nixos/ollama: add options to bypass sandboxing")
2024-07-22 14:51:39 +02:00
Bruno BELANYI
c8f2bb1b65 nixos/tandoor-recipes: revert 'GUNICORN_MEDIA=1'
Quoting from upstream's documentation [1]:

> Basically everyone recommends not doing this. Please use [a webserver]
> to handle media file serving.

Given that this commit broke the module for unrelated reasons, I've
decided to just revert it and let downstream users make the choice of
easy vs. secure.

[1]: https://docs.tandoor.dev/system/configuration/#gunicorn-media

This reverts commit e8c56de827.
2024-07-22 09:17:41 +00:00
PopeRigby
a5eaa1df10
nixos/scrutiny: enable collector by default if scrutiny is enabled (#329069) 2024-07-22 07:38:45 +01:00
Aleksana
b841e48094
Merge pull request #329018 from Aleksanaa/nixos/appimage
nixos/appimage: minor fix eval
2024-07-22 07:57:16 +08:00
aleksana
71b3f89bee nixos/appimage: minor fix eval 2024-07-22 07:47:00 +08:00
Sohalt
c11439943d
nixos/containers: add wants and after dependency for network interfaces (#153234)
Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
2024-07-22 01:22:19 +02:00
Nathan Henrie
de322fa088 nixos/espanso: add n8henrie to maintainers
I help maintain espanso and would like to help maintain both the package
and the module.
2024-07-21 17:08:24 -06:00
Marcus Ramberg
585a077fd2
Merge pull request #327665 from bolives-hax/add-qemu-s390x-binfmt
added s390x option type via magic attributes
2024-07-21 23:12:55 +02:00
Sandro
4b97ce3bc4
Merge pull request #322095 from illustris/hadoop_3_4
hadoop: init 3.4, drop 3.2
2024-07-21 21:24:10 +02:00
Sandro
af3e8fe556
Merge pull request #322173 from illustris/hbase
hbase: version upgrades
2024-07-21 21:23:28 +02:00
Sandro
49831e2e65
Merge pull request #328604 from illustris/pve-kvm
nixos/proxmoxImage: fix build
2024-07-21 21:23:06 +02:00
bl0v3
e83fc89111 nixos/binfmt: added s390x option type via magic attributes 2024-07-21 20:17:16 +02:00
Bobby Rong
d114d56aad
nixos/cinnamon: Do not use "with pkgs.cinnamon"
Otherwise with allowAliases enabled, the aliases are preferred and used,
spamming deprecation warnings.
2024-07-22 01:02:17 +08:00
Bobby Rong
508637b0e3
xapp: Move from cinnamon scope to top-level
* The timeshift changes are used to make by-name check happy.
* More by-name changes in the next commit.
2024-07-22 01:02:16 +08:00
Atemu
f6d4f4f055
Merge pull request #328662 from Aleksanaa/nixos/appimage
nixos/appimage: support both type-1 and type-2 appimages in binfmt
2024-07-21 17:44:39 +02:00
Sandro
4cc8b29327
Merge pull request #299599 from SuperSandro2000/kde-pim
programs/kde-pim: init
2024-07-21 16:26:01 +02:00
nikstur
2ca04530c9 nixos/systemd-sysusers: assert against password and hashedPassword
Regardless of mutable or immutable users, systemd-sysupdate never
updates existing user records and thus will for example never change
passwords for you.

It only support initial passwords and now actively asserts agains other
paswords.
2024-07-21 16:23:11 +02:00
nikstur
2710a49adb nixos/systemd-sysusers: stop creating users statically
On Linux we cannot feasbibly generate users statically because we need
to take care to not change or re-use UIDs over the lifetime of a machine
(i.e. over multiple generations). This means we need the context of the
running machine.

Thus, stop creating users statically and instead generate them at
runtime irrespective of mutableUsers.

When /etc is immutable, the password files (e.g. /etc/passwd etc.) are
created in a separate directory (/var/lib/nixos/etc). /etc will be
pre-populated with symlinks to this separate directory.

Immutable users are now implemented by bind-mounting the password files
read-only onto themselves and only briefly re-mounting them writable to
re-execute sysusers. The biggest limitation of this design is that you
now need to manually unmount this bind mount to change passwords because
sysusers cannot change passwords for you. This shouldn't be too much of
an issue because system users should only rarely need to change their
passwords.
2024-07-21 16:23:11 +02:00
nikstur
d43e323b4a nixos/systemd-sysusers: only create systemusers
systemd-sysusers cannot create normal users (i.e. with a UID > 1000).
Thus we stop trying an explitily only use systemd-sysusers when there
are no normal users on the system (e.g. appliances).
2024-07-21 16:22:01 +02:00
Bobby Rong
350a70036a
mint-themes: Move from cinnamon scope to top-level 2024-07-21 21:17:11 +08:00
Bobby Rong
2359076f1f
mint-y-icons: Move from cinnamon scope to top-level 2024-07-21 21:17:10 +08:00
Bobby Rong
c09bdb5d5e
mint-cursor-themes: Move from cinnamon scope to top-level 2024-07-21 21:17:09 +08:00
github-actions[bot]
968bf02dc2
Merge master into staging-next 2024-07-21 12:01:16 +00:00
Will Fancher
6f959a9e96 nixos/make-initrd-ng: dlopen ELF notes 2024-07-21 06:31:42 -04:00
Will Fancher
e6c544270c nixos/make-initrd-ng: Pass contents as JSON 2024-07-21 06:31:42 -04:00
Will Fancher
519680f662 nixos/systemd: Check that systemd-boot is copied to both places. 2024-07-21 06:31:42 -04:00
nikstur
d4a80b6d0c systemd: 255.6 -> 256.2 2024-07-21 06:31:37 -04:00
Franz Pletz
1a3c164570
Merge pull request #328682 from fpletz/nixos/fix-proxmox-lxc 2024-07-21 09:09:40 +02:00
github-actions[bot]
be3262bae8
Merge master into staging-next 2024-07-21 00:02:58 +00:00
Nick Cao
b7080d0dd7
Revert "nixos/keycloak: disable keycloak-metrics-spi in tests"
This reverts commit 0360d42e20.
2024-07-20 15:39:58 -04:00
Cottand
6e52b03583 nomad_1_5: deprecate 2024-07-20 20:19:33 +01:00
Adam C. Stephens
65ef67740b
Merge pull request #328665 from adamcstephens/incus/fix-lts-unstable
incus: fix OVMF path backward compatibility
2024-07-20 14:09:46 -04:00
github-actions[bot]
e533bfc8da
Merge master into staging-next 2024-07-20 18:01:23 +00:00
lassulus
e209fc2f2f
Merge pull request #241373 from nikstur/qemu-vm-simplify-nix-store-image
nixos/qemu-vm: simplify building nix store image
2024-07-20 19:27:40 +02:00
Franz Pletz
ceafec213f
nixos/proxmox-lxc: fix nixos-rebuild
Same is being done in lxc-container module.
2024-07-20 16:54:29 +02:00
Franz Pletz
c501d3fa97
nixos/proxmox-lxc: fix getty start
Otherwise there is no getty on tty1 in Proxmox.
2024-07-20 16:54:28 +02:00
Franz Pletz
4aa419c046
nixos/proxmox-lxc: reformat 2024-07-20 16:54:28 +02:00
Franz Pletz
7c67f72893
Merge pull request #320075 from illustris/pve-lxc-ping-fix 2024-07-20 16:52:05 +02:00
illustris
aa794162ba
hbase: version upgrades
- 2.4.17 -> 2.4.18
- 2.5.4 -> 2.5.9
- init 2.6.0
- 3.0.0-alpha-3 -> 3.0.0-beta-1
2024-07-20 20:21:00 +05:30
Vladimír Čunát
577f40b8a9
Merge branch 'staging' into staging-next 2024-07-20 16:12:24 +02:00
Arian van Putten
8afba669e2 nixos/wrappers: use normal mount for /run/wrappers
We want to get rid of specialFileSystems / earlyMountScript eventually and
there is no need to run this before systemd anymore now that
the wrappers themselves are set up in a systemd unit since https://github.com/NixOS/nixpkgs/pull/263203

Also this is needed to make soft-reboot work. We want to make sure
that we remount /run/wrappers with the nosuid bit removed on soft-reboot
but because @earlyMountScript@ happens in initrd, this wouldn't happen
2024-07-20 16:07:43 +02:00
Adam Stephens
28922c4421
incus: fix OVMF path backward compatibility
incus 6.3.0 changed the OVMF path, but our module needs to support LTS
as well. Also move the newer OCI deps to be conditional on version.
2024-07-20 09:54:07 -04:00
aleksana
1d1676b2ee nixos/appimage: support both type-1 and type-2 appimages in binfmt 2024-07-20 21:23:59 +08:00
K900
5e13e3e566
Merge pull request #324894 from paveloom/flaresolverr
flaresolverr: init at 3.3.21 + nixos/flaresolverr: initial commit
2024-07-20 11:06:18 +03:00
illustris
0dca765a25
nixos/proxmoxImage: fix build 2024-07-20 12:12:16 +05:30
Robert Rose
c58c1e8f55 nixos/k3s: add options for graceful node shutdown and kubelet config
Allow to set kubelet configuration parameters
via an option. Additionally, expose the
respective options for graceful node
shutdown directly, as it is anticipated to
be used frequently.
2024-07-19 20:28:00 +02:00
github-actions[bot]
637b531dcf
Merge staging-next into staging 2024-07-19 18:01:40 +00:00
Pavel Sobolev
c9c14f86db
nixos/flaresolverr: initial commit 2024-07-19 20:55:21 +03:00
OPNA2608
029b06454e tests/teleports: ubuntu_font_family -> ubuntu-classic 2024-07-19 19:23:19 +02:00
OPNA2608
2d49594644 tests/lomiri-clock-app: ubuntu_font_family -> ubuntu-classic 2024-07-19 19:23:00 +02:00
OPNA2608
005ef5ab39 tests/lomiri-calculator-app: ubuntu_font_family -> ubuntu-classic 2024-07-19 19:22:45 +02:00
OPNA2608
dc004592e8 tests/lomiri-filemanager-app: ubuntu_font_family -> ubuntu-classic 2024-07-19 19:22:25 +02:00
OPNA2608
47e508ba36 tests/morph-browser: ubuntu_font_family -> ubuntu-classic 2024-07-19 19:21:56 +02:00
OPNA2608
6613de20f2 tests/lomiri-system-settings: ubuntu_font_family -> ubuntu-classic 2024-07-19 19:21:32 +02:00
OPNA2608
c768ee4aa3 nixos/lomiri: ubuntu_font_family -> ubuntu-classic 2024-07-19 19:20:59 +02:00
Peder Bergebakken Sundt
b2a54feb35
Merge pull request #279408 from alyssais/mailman-nginx-timeout
nixos/mailman: increase nginx proxy timeout
2024-07-19 17:56:07 +02:00
Aleksana
532db1f9d1
Merge pull request #310621 from Istvan91/dont_write_defaults_in_ssh_config
nixos/ssh: don't write addressfamily with default value in config
2024-07-19 21:23:08 +08:00
github-actions[bot]
a6c20a7387
Merge staging-next into staging 2024-07-19 12:01:49 +00:00
Sandro
89d95fb2bc
Merge pull request #327939 from Guanran928/libreddit 2024-07-19 13:47:14 +02:00
Sarah Brofeldt
54fbcf1be8
Merge pull request #321632 from PedroRegisPOAR/kubernetes-mkCert-drops-nogroup-as-default
nixos/kubernetes: adds argument to mkCert defaulting to kubernetes group
2024-07-19 12:49:49 +02:00
Jonas Chevalier
676e42a45e
Merge pull request #327729 from zimbatm/odoo-fixes
odoo fixes
2024-07-19 12:35:03 +02:00
Sirio Balmelli
c2b4c0e51d tests/odoo: replace db init workaround with services.odoo.autoInit
Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
2024-07-19 11:52:01 +02:00
Sirio Balmelli
85761ade56 modules/odoo: add autoInitExtraFlags
Allow module user to specify additional flags to be passed on autoInit

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
2024-07-19 11:51:57 +02:00
Sirio Balmelli
67bcb287ec modules/odoo: execute autoInit only once
Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
2024-07-19 11:51:52 +02:00
Philip Taron
c67ed48869
nixos/ldap: avoid top-level with expression (#327992) 2024-07-19 11:19:51 +02:00
Philip Taron
f56ba38335
make-disk-image.nix: avoid top-level with statement (#327020) 2024-07-19 11:19:19 +02:00
Ivan Trubach
7919709a23 nixos/modules: use mapAttrsToList instead of mapAttrsFlatten 2024-07-19 11:39:39 +03:00
Frédéric Christ
0539bbe086 nixos/tests: Fix tests failing with new default IPv6 configuration 2024-07-19 09:58:25 +02:00
github-actions[bot]
f6ed4c2f35
Merge staging-next into staging 2024-07-19 06:01:45 +00:00
Matthew Croughan
be9599e3d4
nixos/scion: introduce package option (#327765) 2024-07-19 02:30:10 +02:00
github-actions[bot]
f316203fda
Merge staging-next into staging 2024-07-19 00:03:05 +00:00
lassulus
3575fad9da
Merge pull request #323466 from andersk/grep-stray
nixos/udev: Fix `grep: warning: stray \ before /`
2024-07-18 23:02:07 +02:00
Jörg Thalheim
054c2d71f7
Merge pull request #328221 from nikstur/fix-overlay-etc
nixos/etc: handle mountpoints on top of /etc when switching
2024-07-18 21:59:30 +02:00
nikstur
6abbe725ca nixos/etc: handle mountpoints on top of /etc when switching
The activation script that remounts the /etc overlay now handles other
mount points on top of /etc by bind mounting them to the new temporary
/etc overlay and then atomically revealing it.
2024-07-18 21:28:53 +02:00
nikstur
289dd22132 nixos/qemu-vm: simplify building nix store image
Summary of this change:

- Simplify code.
- Stop a disk image from being cached in the binary cache.
- Make erofs Nix Store image build in an acceptable time outside of
  testing environments (like `darwin.builder`).
- Do not regress on performance for tests that use many store paths in
  their Nix store image.
- Slightly longer startup time for tests where not many store paths are
  included in the image (these probably shouldn't use `useNixStoreImage`
  anyways).
- Slightly longer startup time when inputs of VM do not change because
  the Nix store image is not cached anymore.

Remove the `storeImage` built with make-disk-image.nix. This produced a
separate derivation which is then cached in the binary cache. These
types of images should be avoided because they gunk up the cache as they
change frequently. Now all Nix store images, whether read-only or
writable are based on the erofs image previously only used for read-only
images.

Additionally, simplify the way the erofs image is built by copying the
paths to include to a separate directory and build the erofs image from
there.

Before this change, the list of Nix store paths to include in the Nix
store image was converted to a complex regex that *excludes* all other
paths from a potentially large Nix store.

This previous approach suffers from two issues:

1. The regex is complex and, as admitted in the source code of the
   includes-to-excludes.py script, most likely contains at least one
   error. This means that it's unlikely that anyone will touch this
   piece of software again.

2. When the Nix store image is built from a large Nix store (like when
   you build the VM script to run outside of any testing context) this
   regex becomes painfully slow. There is at least one prominent
   use-case where this matters: `darwin.builder`.

Benchmarking impressions:

- Building Nix store via make-disk-image.nix takes ~25s
- Building Nix store as an erofs image takes ~4s
- Running nixosTests.qemu-vm-writable-store-image takes ~10s when
  building the erofs image with the regex vs ~14s when building by
  copying to a temporary directory.
- nixosTests.gitlab which had the biggest gains from the initial erofs
  change takes the same time as before.
- On a host with ~140k paths in /nix/store, building the erofs image
  with the regex takes 410s as opposed to 6s when copying to a temporary
  directory.
2024-07-18 20:24:58 +02:00
github-actions[bot]
401d4660b3
Merge staging-next into staging 2024-07-18 18:01:57 +00:00
lassulus
a62c421981
Merge pull request #290730 from nikstur/qemu-vm-refactoring
qemu-vm.nix refactoring
2024-07-18 19:34:51 +02:00
nikstur
b6e354f052 nixos/qemu-vm: remove creation of /etc/nixos
/etc/nixos is already created by stage-2-init.sh
2024-07-18 19:11:28 +02:00
nikstur
cb5a876e82 nixos/qemu-vm: consistently use efiSysMountPoint
Remove the explicit creation of efiSysMountPoint. This is not needed in
the scripted or the systemd initrd.
2024-07-18 19:11:27 +02:00
nikstur
b7b90d0455 nixos/qemu-vm: fsck ESP
The ESP is a writable vfat filesystem that can be fscked like any other
fs thus we should stick to the default.
2024-07-18 19:11:27 +02:00
nikstur
0e5f929851 nixos/tests/qemu-vm-store: init 2024-07-18 19:11:27 +02:00
nikstur
ded6d983d6 nixos/qemu-vm: use new overlayfs API 2024-07-18 19:11:24 +02:00
nikstur
54674e9063 nixos/qemu-vm: remove duplication between scripted and systemd initrd 2024-07-18 19:09:28 +02:00
Michael Hoang
ab65220a1a regreet: add options for controlling theming 2024-07-19 01:28:45 +10:00