1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-02 22:10:08 +03:00
Commit graph

32279 commits

Author SHA1 Message Date
Martin Weinelt
9ccfa87721
Merge pull request #332764 from NixOS/staging-next
staging-next 2024-08-06
2024-08-14 13:33:28 +02:00
Emily
57d0d4a8f3
Merge pull request #334526 from ElvishJerricco/revert-boot-counting-again-sadface
systemd-boot: Revert boot counting again
2024-08-14 12:19:55 +01:00
Pol Dellaiera
302b8650e5
Merge pull request #334371 from nixupp/patch-1
nixos/openwebui: add link to description
2024-08-14 12:02:02 +02:00
Maximilian Bosch
15dab820a6
nixos/mailpit: allow multiple instances
Now it's possible to start multiple mailpit instances - for e.g.
multiple testing environments - on the same machine:

    {
      services.mailpit.instances = {
        dev = { /* ... */ };
        staging = { /* ... */ };
      };
    }

The simplest way to start a single instance is by declaring

    services.mailpit.instances.default = {};
2024-08-14 11:33:52 +02:00
Maximilian Bosch
a2437d8075
nixos/mailpit: init
Simple module to configure a systemd service for mailpit.
2024-08-14 11:33:52 +02:00
Eduard Bachmakov
b33bf6b99a nixos/systemd/initrd: Fix emergencyAccess to work with null.
Implementation is now compatible with the option's .type already defined.

This allows us to pass `config.users.users.<user>.hashedPassword` even if this is null (the default).

Before:
true  => access
false => no access
hash  => access via password
null  => eval error

After:
true  => access
false => no access
hash  => access via password
null  => no access
2024-08-14 10:26:15 +02:00
github-actions[bot]
261f1edcbd
Merge master into staging-next 2024-08-14 06:01:07 +00:00
Doron Behar
e58e0e1d95 doc: mention Taskwarrior 3 in taskserver module docs & in release notes 2024-08-14 08:06:11 +03:00
Doron Behar
ecf4caea3f nixos/taskchampion-sync-server: init
Co-authored-by: Mohamed Laradji <mlaradji@proton.me>
2024-08-14 08:06:11 +03:00
Doron Behar
54698e8db6 taskwarrior2: rename from taskwarrior, with a warning alias
Also remove an outdated link in `taskserver/default.md`.
2024-08-14 08:06:10 +03:00
Will Fancher
0637303ca8 Revert "Merge pull request #330017 from Mic92/boot-counting"
This reverts commit 3d3c0f4d34, reversing
changes made to 47f7e25a77.
2024-08-13 23:11:18 -04:00
Nick Cao
12f650234b
Merge pull request #334257 from Dan-Theriault/miniflux-no-admin-required
nixos/miniflux: make admin provisioning optional
2024-08-13 21:54:34 -04:00
Will Fancher
b78bd2f912 Revert "Merge pull request #333952 from r-vdp/specialisation-name-regex"
This reverts commit fc35704bc8, reversing
changes made to c67d90d517.
2024-08-13 21:33:15 -04:00
github-actions[bot]
ae6040d6a6
Merge master into staging-next 2024-08-14 00:02:32 +00:00
Dan Theriault
f6788b6165 nixos/miniflux: make admin provisioning optional
Miniflux supports provisioning users via SSO, which renders admin
accounts unnecessary for some use-cases. This change retains the
existing default, but makes it easier to disable admin provisioning.
2024-08-13 18:56:16 -04:00
Someone
f9a85112f5
Merge pull request #334340 from eljamm/nvidia-open
nixos/nvidia: fix CUDA for open driver
2024-08-13 19:35:46 +00:00
Pol Dellaiera
a0a63aa8d4
Merge pull request #332593 from mzacho/master
nixos/modules/services/mail: add protonmail-bridge service
2024-08-13 21:08:24 +02:00
Pol Dellaiera
c556059765
Merge pull request #334344 from truh/docs/oci-containers-docs-urls
nixos/oci-containers: replace broken links to docker docs
2024-08-13 20:44:55 +02:00
github-actions[bot]
35c1846996
Merge master into staging-next 2024-08-13 18:01:28 +00:00
Philip Taron
04a8c1e764
Merge pull request #328030 from Wulfsta/swap-status 2024-08-13 07:05:46 -07:00
Adam C. Stephens
7e95d0361c
Merge pull request #333730 from adamcstephens/incus/from-lxd
nixos/incus: add incus-only vm and container images
2024-08-13 08:39:26 -04:00
nixupp
876cfeddfc
nixos/openwebui: add link to description 2024-08-13 12:18:54 +00:00
Martin Weinelt
0906206d42
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/top-level/python-packages.nix
2024-08-13 13:21:03 +02:00
WilliButz
8dd369f524
nixos/systemd-tmpfiles: add initrd support
This adds support for declaring tmpfiles rules exclusively for the
systemd initrd. Configuration is possible through the new option
`boot.initrd.systemd.tmpfiles.settings` that shares the same interface as
`systemd.tmpfiles.settings`.

I did intentionally not replicate the `rules` interface here, given that
the settings attribute set is more versatile than the list of strings
used for `rules`. This should also make it unnecessary to implement the
workaround from 1a68e21d47 again.

A self-contained `tmpfiles.d` directory is generated from the new initrd
settings and it is added to the initrd as a content path at
`/etc/tmpfiles.d`.

The stage-1 `systemd-tmpfiles-setup.service` is now altered to no longer
operate under the `/sysroot` prefix, because the `/sysroot` hierarchy
cannot be expected to be available when the default upstream service is
started.

To handle files under `/sysroot` a slightly altered version of the
upstream default service is introduced. This new unit
`systemd-tmpfiles-setup-sysroot.service` operates only under the
`/sysroot` prefix and it is ordered between `initrd-fs.target` and the
nixos activation.

Config related to tmpfiles was moved from initrd.nix to tmpfiles.nix.
2024-08-13 13:02:21 +02:00
eljamm
4548c39286
nixos/nvidia: fix CUDA for open driver
For the open driver, the `nvidia-uvm` module does not auto-load after
`nvidia`, which makes CUDA not work.

In this case, we need to add it to `boot.kernelModules` for it to work
again.
2024-08-13 11:56:10 +01:00
Jakob Klepp
0b8954f8d2 nixos/oci-containers: replace broken links to docker docs
Old links in descriptions now lead to 404 pages.
2024-08-13 11:49:08 +02:00
Sarah Brofeldt
ba99ba8ea7
Merge pull request #327914 from 0z13/nvidia-container-toolkit-device-name
nixos/nvidia-container-toolkit: add device-name-strategy option
2024-08-13 10:41:45 +02:00
superherointj
3a158316b8
Merge pull request #332183 from codedownio/k3s-containerd-config
nixos/k3s: add containerdConfigTemplate option
2024-08-13 04:03:59 -03:00
Kerstin Humm
13c96978c3 nixos/weblate: init module and test
Co-authored-by: Taeer Bar-Yam <Radvendii@users.noreply.github.com>
2024-08-13 08:44:54 +02:00
Will Fancher
208e953381 systemd-stage-1: Fully merge /bin and /sbin
In #327506, we stopped using `/sbin` in the `pathsToLink` of `initrdBinEnv`. This inadvertantly stopped including the `sbin` directory of the `initrdBin` packages, which meant that things like `mdadm`'s udev rules, which referred to binaries by their `sbin` paths, stopped working.

The purpose of #327506 was to fix the fact that `mount` was not calling mount helpers like `mount.ext4` unless they happened to be in `/sbin`. But this raised some questions for me, because I thought we set `managerEnvironment.PATH` to help util-linux find helpers for both `mount` and `fsck`. So I decided to look at how this works in stage 2 to figure it out, and it's a little cursed.

---

What I already knew is that we have [this](696a4e3758/nixos/modules/system/boot/systemd.nix (L624-L625))

```
        # util-linux is needed for the main fsck utility wrapping the fs-specific ones
        PATH = lib.makeBinPath (config.system.fsPackages ++ [cfg.package.util-linux]);
```

And I thought this was how `mount` finds the mount helpers. But if that were true, then `mount` should be finding helpers in stage 1 because of [this](696a4e3758/nixos/modules/system/boot/systemd/initrd.nix (L411))

```
      managerEnvironment.PATH = "/bin";
```

Turns out, `mount` _actually_ finds helpers with [this configure flag](696a4e3758/pkgs/os-specific/linux/util-linux/default.nix (L59))

```
    "--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin"
```

Ok... so then why do we need the PATH? Because `fsck` has [this](a75c7a102e/disk-utils/fsck.c (L1659))

```
	fsck_path = xstrdup(path && *path ? path : FSCK_DEFAULT_PATH);
```

(`path` is `getenv("PATH")`)

So, tl;dr, `mount` and `fsck` have completely unrelated search paths for their helper programs

For `mount`, we have to use a configure flag to point to `/run/current-system`, and for `fsck` we can just set PATH

---

So, for systemd stage 1, we *do* want to include packages' `sbin` paths, because of the `mdadm` problem. But for `mount`, we need helpers to be on the search path, and right now that means putting it somewhere in `/run/wrappers/bin:/run/current-system/sw/bin:/sbin`.
2024-08-12 23:35:01 -04:00
Will Fancher
d74d182991 Revert "systemd-stage-1: Use common bin for /sbin"
This reverts commit b4b4751e97.
2024-08-12 23:35:01 -04:00
github-actions[bot]
0a1ac11214
Merge master into staging-next 2024-08-13 00:02:23 +00:00
Will Fancher
bcd1d9cf54
Merge pull request #312755 from tomfitzhenry/systemd-dhcp108
nixos/networkd: allow IPv6OnlyPreferredSec in networkd.conf
2024-08-12 19:19:34 -04:00
Tom McLaughlin
81c0783c0e nixos/k3s: add containerdConfigTemplate option 2024-08-12 14:58:18 -07:00
github-actions[bot]
62f43c3094
Merge master into staging-next 2024-08-12 18:02:11 +00:00
Philip Taron
c44e170e3f
nixos/proxmox-lxc: lib.mdDoc is deprecated 2024-08-12 08:02:57 -07:00
Philip Taron
5c21c35835
nixos/borgmatic: lib.mdDoc is deprecated 2024-08-12 08:02:10 -07:00
Florian
20d3d501ad
Merge pull request #290913 from flandweber/borgmatic-improvement
nixos/borgmatic: added test
2024-08-12 15:37:12 +02:00
Sandro
e32c796ff7
Merge pull request #332541 from SuperSandro2000/mailman-relay-assert
nixos/mailman: allow setting relay domains with services.postfix.conf…
2024-08-12 14:37:53 +02:00
github-actions[bot]
8674a36b01
Merge master into staging-next 2024-08-12 12:01:27 +00:00
Florian Klink
fc35704bc8
Merge pull request #333952 from r-vdp/specialisation-name-regex
specialisation: limit the allowed characters in specialisation names
2024-08-12 13:30:54 +03:00
github-actions[bot]
dc79586bdf
Merge master into staging-next 2024-08-12 00:02:44 +00:00
Gavin John
80656f196d
nixos/chromium: Update description for programs.chromium.enable 2024-08-11 19:37:51 -04:00
r-vdp
d38257b024
systemd-boot-builder: allow underscores in the specialisation name 2024-08-11 23:33:18 +02:00
Martin Weinelt
038dfb6969
Merge remote-tracking branch 'origin/master' into staging-next 2024-08-11 21:20:35 +02:00
Pol Dellaiera
71daf1a037
Merge pull request #333643 from eduarrrd/initrd-ids
nixos/systemd/initrd: Set /etc/hostname in the initrd.
2024-08-11 20:32:20 +02:00
K900
12aa5ec0a9
Merge pull request #333947 from timschumi/rpi3-sd-dtbs
sd-image-aarch64: add dtbs for the bcm2710 raspberries
2024-08-11 21:29:45 +03:00
github-actions[bot]
a473a12c7d
Merge master into staging-next 2024-08-11 18:01:11 +00:00
r-vdp
57a30e4cbd
specialisation: limit the allowed characters in specialisation names
Since the systemd boot counting PR was merged, dashes in specialisation
names cause issues when installing the boot loader entries, since dashes
are also used as separator for the different components of the file name
of the boot loader entries on disk.

The assertion avoids this footgun which is pretty annoying to recover
from.
2024-08-11 19:07:44 +02:00
Tim Schumacher
794d005bdd sd-image-aarch64: add dtbs for the bcm2710 raspberries
This appears to cover the BCM2836, BCM2837 and BCM2837B0 families of
devices.
2024-08-11 18:39:15 +02:00