Merge staging-next into staging

NixOS · Dec 31, 2024 · 3588b4d · 3588b4d
2 parents 2bd6a3e + c154dd0
commit 3588b4d
Show file tree

Hide file tree

Showing 272 changed files with 11,074 additions and 2,927 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -1632,6 +1632,12 @@
     matrix = "@anthonyrsl:matrix.org";
     keys = [ { fingerprint = "472D 368A F107 F443 F3A5  C712 9DC4 987B 1A55 E75E"; } ];
   };
+  antipatico = {
+    email = "[email protected]";
+    github = "antipatico";
+    githubId = 14838767;
+    name = "Jacopo Scannella";
+  };
   antoinerg = {
     email = "[email protected]";
     github = "antoinerg";
@@ -2510,6 +2516,12 @@
     githubId = 66330398;
     name = "Victor Hang";
   };
+  baongoc124 = {
+    email = "[email protected]";
+    github = "baongoc124";
+    githubId = 766221;
+    name = "Ngoc Nguyen";
+  };
   barab-i = {
     email = "[email protected]";
     github = "barab-i";
@@ -4931,6 +4943,12 @@
     github = "damhiya";
     githubId = 13533446;
   };
+  damidoug = {
+    email = "[email protected]";
+    github = "damidoug";
+    githubId = 75175586;
+    name = "Douglas Damiano";
+  };
   DamienCassou = {
     email = "[email protected]";
     github = "DamienCassou";

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -151,8 +151,12 @@
 
 - `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`.
 
+- `foundationdb` was upgraded to 7.3.
+
 - `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years.
 
+- `sm64ex-coop` has been removed as it was archived upstream. Consider migrating to `sm64coopdx`.
+
 - `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.
   Like upstream's docker images, renovate now runs on NodeJS 22.
 

diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
@@ -8,19 +8,35 @@ let
 
   cfg = config.fonts.fontDir;
 
-  x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } ''
-    mkdir -p "$out/share/X11/fonts"
-    font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
-    find ${toString config.fonts.packages} -regex "$font_regexp" \
-      -exec ln -sf -t "$out/share/X11/fonts" '{}' \;
-    cd "$out/share/X11/fonts"
-    ${lib.optionalString cfg.decompressFonts ''
-      ${pkgs.gzip}/bin/gunzip -f *.gz
-    ''}
-    ${pkgs.xorg.mkfontscale}/bin/mkfontscale
-    ${pkgs.xorg.mkfontdir}/bin/mkfontdir
-    cat $(find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias
-  '';
+  x11Fonts = pkgs.callPackage (
+    {
+      runCommand,
+      gzip,
+      xorg,
+    }:
+    runCommand "X11-fonts"
+      {
+        preferLocalBuild = true;
+        nativeBuildInputs = [
+          gzip
+          xorg.mkfontscale
+          xorg.mkfontdir
+        ];
+      }
+      ''
+        mkdir -p "$out/share/X11/fonts"
+        font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
+        find ${toString config.fonts.packages} -regex "$font_regexp" \
+          -exec ln -sf -t "$out/share/X11/fonts" '{}' \;
+        cd "$out/share/X11/fonts"
+        ${lib.optionalString cfg.decompressFonts ''
+          gunzip -f *.gz
+        ''}
+        mkfontscale
+        mkfontdir
+        cat $(find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias
+      ''
+  ) { };
 
 in
 

diff --git a/nixos/modules/services/databases/foundationdb.md b/nixos/modules/services/databases/foundationdb.md
@@ -18,7 +18,7 @@ To enable FoundationDB, add the following to your
 ```nix
 {
   services.foundationdb.enable = true;
-  services.foundationdb.package = pkgs.foundationdb71; # FoundationDB 7.1.x
+  services.foundationdb.package = pkgs.foundationdb73; # FoundationDB 7.r3.x
 }
 ```
 
@@ -68,7 +68,7 @@ necessary Python modules).
 ```ShellSession
 a@link> cat fdb-status.py
 #! /usr/bin/env nix-shell
-#! nix-shell -i python -p python pythonPackages.foundationdb71
+#! nix-shell -i python -p python pythonPackages.foundationdb73
 
 import fdb
 import json

diff --git a/nixos/modules/services/misc/dwm-status.nix b/nixos/modules/services/misc/dwm-status.nix
@@ -49,7 +49,7 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    services.upower.enable = lib.elem "battery" cfg.order;
+    services.upower.enable = lib.mkIf (lib.elem "battery" cfg.order) true;
 
     systemd.user.services.dwm-status = {
       description = "Highly performant and configurable DWM status service";

diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix
@@ -31,7 +31,7 @@ let
   '';
 in
 {
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = with lib.maintainers; [ jvanbruegge ];
 
   options.services.tandoor-recipes = {
     enable = lib.mkOption {

diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
@@ -498,16 +498,16 @@ in
         ca.cert = if needToCreateCA then "${cfg.dataDir}/keys/ca.cert" else "${cfg.pki.manual.ca.cert}";
       };
 
+      systemd.tmpfiles.rules = [
+        "d ${cfg.dataDir} 0770 ${cfg.user} ${cfg.group}"
+        "z ${cfg.dataDir} 0770 ${cfg.user} ${cfg.group}"
+      ];
+
       systemd.services.taskserver-init = {
         wantedBy = [ "taskserver.service" ];
         before = [ "taskserver.service" ];
         description = "Initialize Taskserver Data Directory";
 
-        preStart = ''
-          mkdir -m 0770 -p "${cfg.dataDir}"
-          chown "${cfg.user}:${cfg.group}" "${cfg.dataDir}"
-        '';
-
         script = ''
           ${taskd} init
           touch "${cfg.dataDir}/.is_initialized"

diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix
@@ -153,6 +153,8 @@ in
         '';
       };
 
+      package = lib.mkPackageOption pkgs "keepalived" { };
+
       openFirewall = mkOption {
         type = types.bool;
         default = false;
@@ -334,7 +336,7 @@ in
           umask 077
           ${pkgs.envsubst}/bin/envsubst -i "${keepalivedConf}" > ${finalConfigFile}
         '');
-        ExecStart = "${pkgs.keepalived}/sbin/keepalived"
+        ExecStart = "${lib.getExe cfg.package}"
           + " -f ${finalConfigFile}"
           + " -p ${pidFile}"
           + optionalString cfg.snmp.enable " --snmp";

diff --git a/nixos/modules/services/x11/colord.nix b/nixos/modules/services/x11/colord.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
 
   cfg = config.services.colord;
@@ -17,12 +14,12 @@ in
   options = {
 
     services.colord = {
-      enable = mkEnableOption "colord, the color management daemon";
+      enable = lib.mkEnableOption "colord, the color management daemon";
     };
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.colord ];
 

diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixos/modules/services/x11/desktop-managers/cde.nix
@@ -4,19 +4,16 @@
   pkgs,
   ...
 }:
-
-with lib;
-
 let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.cde;
 in
 {
   options.services.xserver.desktopManager.cde = {
-    enable = mkEnableOption "Common Desktop Environment";
+    enable = lib.mkEnableOption "Common Desktop Environment";
 
-    extraPackages = mkOption {
-      type = with types; listOf package;
+    extraPackages = lib.mkOption {
+      type = with lib.types; listOf package;
       default = with pkgs.xorg; [
         xclock
         bitmap
@@ -29,7 +26,7 @@ in
         xwd
         xwud
       ];
-      defaultText = literalExpression ''
+      defaultText = lib.literalExpression ''
         with pkgs.xorg; [
           xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud
         ]
@@ -40,7 +37,7 @@ in
     };
   };
 
-  config = mkIf (xcfg.enable && cfg.enable) {
+  config = lib.mkIf (xcfg.enable && cfg.enable) {
     environment.systemPackages = cfg.extraPackages;
 
     services.rpcbind.enable = true;