Unverified Commit 1ca4c99d authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents d47a287c 3699c02f
Loading
Loading
Loading
Loading
+41 −0
Original line number Diff line number Diff line
@@ -2909,6 +2909,12 @@
    githubId = 14790226;
    name = "Hubert Jasudowicz";
  };
  c-h-johnson = {
    name = "Charles Johnson";
    email = "charles@charlesjohnson.name";
    github = "c-h-johnson";
    githubId = 138403247;
  };
  chkno = {
    email = "scottworley@scottworley.com";
    github = "chkno";
@@ -6074,6 +6080,12 @@
    githubId = 25820499;
    name = "Roman Kretschmer";
  };
  goatchurchprime = {
    email = "julian@goatchurch.org.uk";
    github = "goatchurchprime";
    githubId = 677254;
    name = "Julian Todd";
  };
  gobidev = {
    email = "adrian.groh@t-online.de";
    github = "Gobidev";
@@ -7349,6 +7361,11 @@
    github = "jali-clarke";
    githubId = 17733984;
  };
  james-atkins = {
    name = "James Atkins";
    github = "james-atkins";
    githubId = 9221409;
  };
  jamiemagee = {
    email = "jamie.magee@gmail.com";
    github = "JamieMagee";
@@ -8090,6 +8107,12 @@
    email = "j.loos@posteo.net";
    githubId = 57965027;
  };
  josephst = {
    name = "Joseph Stahl";
    email = "hello@josephstahl.com";
    github = "josephst";
    githubId = 1269177;
  };
  joshniemela = {
    name = "Joshua Niemelä";
    email = "josh@jniemela.dk";
@@ -12051,6 +12074,12 @@
    githubId = 2946283;
    name = "Brian Cohen";
  };
  nova-madeline = {
    matrix = "@nova:tchncs.de";
    github = "nova-r";
    githubId = 126072875;
    name = "nova madeline";
  };
  novenary = {
    email = "streetwalkermc@gmail.com";
    github = "9ary";
@@ -12389,6 +12418,12 @@
    githubId = 75299;
    name = "Malcolm Matalka";
  };
  orichter = {
    email = "richter-oliver@gmx.net";
    github = "RichterOliver";
    githubId = 135209509;
    name = "Oliver Richter";
  };
  orivej = {
    email = "orivej@gmx.fr";
    github = "orivej";
@@ -16375,6 +16410,12 @@
    github = "thielema";
    githubId = 898989;
  };
  thillux = {
    name = "Markus Theil";
    email = "theil.markus@gmail.com";
    github = "thillux";
    githubId = 2171995;
  };
  thilobillerbeck = {
    name = "Thilo Billerbeck";
    email = "thilo.billerbeck@officerent.de";
+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@

- The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely.

- mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually.

## Other Notable Changes {#sec-release-23.11-notable-changes}

- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
+5 −0
Original line number Diff line number Diff line
@@ -252,6 +252,11 @@ in
          let realDevice' = escapeSystemdPath sw.realDevice;
          in nameValuePair "mkswap-${sw.deviceName}"
          { description = "Initialisation of swap device ${sw.device}";
            # The mkswap service fails for file-backed swap devices if the
            # loop module has not been loaded before the service runs.
            # We add an ordering constraint to run after systemd-modules-load to
            # avoid this race condition.
            after = [ "systemd-modules-load.service" ];
            wantedBy = [ "${realDevice'}.swap" ];
            before = [ "${realDevice'}.swap" ];
            path = [ pkgs.util-linux pkgs.e2fsprogs ]
+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ foreach my $g (@{$spec->{groups}}) {
    if (defined $existing) {
        $g->{gid} = $existing->{gid} if !defined $g->{gid};
        if ($g->{gid} != $existing->{gid}) {
            dry_print("warning: not applying", "warning: would not apply", "GID change of group ‘$name’ ($existing->{gid} -> $g->{gid})");
            dry_print("warning: not applying", "warning: would not apply", "GID change of group ‘$name’ ($existing->{gid} -> $g->{gid}) in /etc/group");
            $g->{gid} = $existing->{gid};
        }
        $g->{password} = $existing->{password}; # do we want this?
@@ -209,7 +209,7 @@ foreach my $u (@{$spec->{users}}) {
    if (defined $existing) {
        $u->{uid} = $existing->{uid} if !defined $u->{uid};
        if ($u->{uid} != $existing->{uid}) {
            dry_print("warning: not applying", "warning: would not apply", "UID change of user ‘$name’ ($existing->{uid} -> $u->{uid})");
            dry_print("warning: not applying", "warning: would not apply", "UID change of user ‘$name’ ($existing->{uid} -> $u->{uid}) in /etc/passwd");
            $u->{uid} = $existing->{uid};
        }
    } else {
+9 −2
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ sub in {

my $fileSystems;
my %fsByDev;
my $useSwraid = 0;
foreach my $fs (read_file("/proc/self/mountinfo")) {
    chomp $fs;
    my @fields = split / /, $fs;
@@ -510,8 +511,8 @@ EOF
    # boot.initrd.luks.devices entry.
    if (-e $device) {
        my $deviceName = basename(abs_path($device));
        if (-e "/sys/class/block/$deviceName"
            && read_file("/sys/class/block/$deviceName/dm/uuid",  err_mode => 'quiet') =~ /^CRYPT-LUKS/)
        my $dmUuid = read_file("/sys/class/block/$deviceName/dm/uuid",  err_mode => 'quiet');
        if ($dmUuid =~ /^CRYPT-LUKS/)
        {
            my @slaves = glob("/sys/class/block/$deviceName/slaves/*");
            if (scalar @slaves == 1) {
@@ -527,8 +528,14 @@ EOF
                }
            }
        }
        if (-e "/sys/class/block/$deviceName/md/uuid") {
            $useSwraid = 1;
        }
    }
}
if ($useSwraid) {
    push @attrs, "boot.swraid.enable = true;\n\n";
}


# Generate the hardware configuration file.
Loading