Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: - pkgs/by-name/au/automatic-timezoned/package.nix - pkgs/by-name/da/darklua/package.nix - pkgs/by-name/ki/kittycad-kcl-lsp/package.nix - pkgs/by-name/li/limbo/package.nix - pkgs/by-name/mi/minijinja/package.nix - pkgs/by-name/pa/pay-respects/package.nix - pkgs/by-name/ri/river-bsp-layout/package.nix - pkgs/by-name/sv/svgbob/package.nix - pkgs/by-name/tu/tui-journal/package.nix - pkgs/by-name/wa/waypipe/package.nix - pkgs/development/python-modules/zxcvbn-rs-py/default.nix
NixOS · Jan 29, 2025 · 909803a · 909803a
2 parents c864087 + 1eebcc7
commit 909803a
Show file tree

Hide file tree

Showing 157 changed files with 1,755 additions and 1,028 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -9532,6 +9532,12 @@
     githubId = 1592375;
     name = "Walter Huf";
   };
+  huggy = {
+    email = "[email protected]";
+    github = "makeding";
+    githubId = 6511667;
+    name = "huggy";
+  };
   hughmandalidis = {
     name = "Hugh Mandalidis";
     email = "[email protected]";
@@ -14243,6 +14249,12 @@
     githubId = 585424;
     name = "Massimo Gengarelli";
   };
+  MasterEvarior = {
+    email = "[email protected]";
+    github = "MasterEvarior";
+    githubId = 36074738;
+    name = "MasterEvarior";
+  };
   matdibu = {
     email = "[email protected]";
     github = "matdibu";
@@ -15744,6 +15756,13 @@
     githubId = 2176611;
     name = "Marko Poikonen";
   };
+  mtpham99 = {
+    name = "Matthew Pham";
+    email = "[email protected]";
+    github = "mtpham99";
+    githubId = 72663763;
+    keys = [ { fingerprint = "DB3E A12D B291 594A 79C5 F6B3 10AB 6868 37F6 FA3F"; } ];
+  };
   mtreca = {
     email = "[email protected]";
     github = "mtreca";
@@ -17349,6 +17368,12 @@
     githubId = 108072;
     name = "Slawomir Gonet";
   };
+  oughie = {
+    name = "Oughie";
+    email = "[email protected]";
+    github = "Oughie";
+    githubId = 123173954;
+  };
   outfoxxed = {
     name = "outfoxxed";
     email = "[email protected]";

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
@@ -46,10 +46,11 @@ with lib.maintainers;
 
   android = {
     members = [
-      numinit
+      adrian-gierakowski
       hadilq
+      johnrtitor
+      numinit
       RossComputerGuy
-      adrian-gierakowski
     ];
     scope = "Maintain Android-related tooling in nixpkgs.";
     githubTeams = [ "android" ];

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -221,6 +221,8 @@
   word-breaking. So you want to write `extraArgs = [ "--prefer" "spaced pat" ]`
   rather than previous `extraArgs = [ "--prefer 'spaced pat'" ]`.
 
+- `nodePackages."@commitlint/config-conventional"` has been removed, as it is a library, and projects should depend on it instead.
+
 - `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead.
 
 - `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead.
@@ -466,6 +468,8 @@
 
 - `gerbera` now has wavpack support.
 
+- `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0)
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ```{=include=} sections

diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
@@ -4,7 +4,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  makeProg = args: pkgs.substituteAll (args // {
+  makeProg = args: pkgs.replaceVarsWith (args // {
     dir = "bin";
     isExecutable = true;
     nativeBuildInputs = [
@@ -18,28 +18,32 @@ let
   nixos-generate-config = makeProg {
     name = "nixos-generate-config";
     src = ./nixos-generate-config.pl;
-    perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";
-    hostPlatformSystem = pkgs.stdenv.hostPlatform.system;
-    detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";
-    btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
-    inherit (config.system.nixos-generate-config) configuration desktopConfiguration;
-    xserverEnabled = config.services.xserver.enable;
+    replacements = {
+      perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";
+      hostPlatformSystem = pkgs.stdenv.hostPlatform.system;
+      detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";
+      btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
+      inherit (config.system.nixos-generate-config) configuration desktopConfiguration;
+      xserverEnabled = config.services.xserver.enable;
+    };
     manPage = ./manpages/nixos-generate-config.8;
   };
 
   nixos-version = makeProg {
     name = "nixos-version";
     src = ./nixos-version.sh;
-    inherit (pkgs) runtimeShell;
-    inherit (config.system.nixos) version codeName revision;
-    inherit (config.system) configurationRevision;
-    json = builtins.toJSON ({
-      nixosVersion = config.system.nixos.version;
-    } // lib.optionalAttrs (config.system.nixos.revision != null) {
-      nixpkgsRevision = config.system.nixos.revision;
-    } // lib.optionalAttrs (config.system.configurationRevision != null) {
-      configurationRevision = config.system.configurationRevision;
-    });
+    replacements = {
+      inherit (pkgs) runtimeShell;
+      inherit (config.system.nixos) version codeName revision;
+      inherit (config.system) configurationRevision;
+      json = builtins.toJSON ({
+        nixosVersion = config.system.nixos.version;
+      } // lib.optionalAttrs (config.system.nixos.revision != null) {
+        nixpkgsRevision = config.system.nixos.revision;
+      } // lib.optionalAttrs (config.system.configurationRevision != null) {
+        configurationRevision = config.system.configurationRevision;
+      });
+    };
     manPage = ./manpages/nixos-version.8;
   };
 

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -94,7 +94,7 @@ let
         ++ optional (pskString != null) "psk=${pskString}"
         ++ optionals (opts.auth != null) (filter (x: x != "") (splitString "\n" opts.auth))
         ++ optional (opts.priority != null) "priority=${toString opts.priority}"
-        ++ optional (opts.extraConfig != "") opts.extraConfig;
+        ++ filter (x: x != "") (splitString "\n" opts.extraConfig);
     in
     ''
       network={

diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix
@@ -7,6 +7,13 @@
 let
   cfg = config.services.hound;
   settingsFormat = pkgs.formats.json { };
+  houndConfigFile = pkgs.writeTextFile {
+    name = "hound-config.json";
+    text = builtins.toJSON cfg.settings;
+    checkPhase = ''
+      ${cfg.package}/bin/houndd -check-conf -conf $out
+    '';
+  };
 in
 {
   imports = [
@@ -96,13 +103,7 @@ in
       };
     };
 
-    environment.etc."hound/config.json".source = pkgs.writeTextFile {
-      name = "hound-config";
-      text = builtins.toJSON cfg.settings;
-      checkPhase = ''
-        ${cfg.package}/bin/houndd -check-conf -conf $out
-      '';
-    };
+    environment.etc."hound/config.json".source = houndConfigFile;
 
     services.hound.settings = {
       dbpath = "${config.services.hound.home}/data";
@@ -112,6 +113,7 @@ in
       description = "Hound Code Search";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
+      restartTriggers = [ houndConfigFile ];
       serviceConfig = {
         User = cfg.user;
         Group = cfg.group;

diff --git a/nixos/modules/services/security/canaille.nix b/nixos/modules/services/security/canaille.nix
@@ -33,9 +33,12 @@ let
       old.dependencies
       ++ old.optional-dependencies.front
       ++ old.optional-dependencies.oidc
+      ++ old.optional-dependencies.scim
       ++ old.optional-dependencies.ldap
       ++ old.optional-dependencies.sentry
-      ++ old.optional-dependencies.postgresql;
+      ++ old.optional-dependencies.postgresql
+      ++ old.optional-dependencies.otp
+      ++ old.optional-dependencies.sms;
     makeWrapperArgs = (old.makeWrapperArgs or [ ]) ++ [
       "--set CONFIG /etc/canaille/config.toml"
       "--set SECRETS_DIR \"${secretsDir}\""

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -527,7 +527,7 @@ sub addGeneration {
     my @links = sort (glob "$path/specialisation/*");
 
     if ($current != 1 && scalar(@links) != 0) {
-        $conf .= "submenu \"> $name$nameSuffix\" --class submenu {\n";
+        $conf .= "submenu \"$name$nameSuffix\" --class submenu {\n";
     }
 
     addEntry("$name" . (scalar(@links) == 0 ? "" : " - Default") . $nameSuffix, $path, $options, $current);

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -31,7 +31,7 @@ let
 
   edk2ShellEspPath = "efi/edk2-uefi-shell/shell.efi";
 
-  systemdBootBuilder = pkgs.substituteAll rec {
+  systemdBootBuilder = pkgs.replaceVarsWith {
     name = "systemd-boot";
 
     dir = "bin";
@@ -40,68 +40,66 @@ let
 
     isExecutable = true;
 
-    inherit (builtins) storeDir;
+    replacements = rec {
+      inherit (builtins) storeDir;
 
-    inherit (pkgs) python3;
+      inherit (pkgs) python3;
 
-    systemd = config.systemd.package;
+      systemd = config.systemd.package;
 
-    bootspecTools = pkgs.bootspec;
+      bootspecTools = pkgs.bootspec;
 
-    nix = config.nix.package.out;
+      nix = config.nix.package.out;
 
-    timeout = if config.boot.loader.timeout == null then "menu-force" else config.boot.loader.timeout;
+      timeout = if config.boot.loader.timeout == null then "menu-force" else config.boot.loader.timeout;
 
-    configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit;
+      configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit;
 
-    inherit (cfg)
-      consoleMode
-      graceful
-      editor
-      rebootForBitlocker
-      ;
+      inherit (cfg)
+        consoleMode
+        graceful
+        editor
+        rebootForBitlocker
+        ;
 
-    inherit (efi) efiSysMountPoint canTouchEfiVariables;
+      inherit (efi) efiSysMountPoint canTouchEfiVariables;
 
-    bootMountPoint =
-      if cfg.xbootldrMountPoint != null then cfg.xbootldrMountPoint else efi.efiSysMountPoint;
+      bootMountPoint =
+        if cfg.xbootldrMountPoint != null then cfg.xbootldrMountPoint else efi.efiSysMountPoint;
 
-    nixosDir = "/EFI/nixos";
+      nixosDir = "/EFI/nixos";
 
-    inherit (config.system.nixos) distroName;
+      inherit (config.system.nixos) distroName;
 
-    memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86plus;
-
-    netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi;
+      checkMountpoints = pkgs.writeShellScript "check-mountpoints" ''
+        fail() {
+          echo "$1 = '$2' is not a mounted partition. Is the path configured correctly?" >&2
+          exit 1
+        }
+        ${pkgs.util-linuxMinimal}/bin/findmnt ${efiSysMountPoint} > /dev/null || fail efiSysMountPoint ${efiSysMountPoint}
+        ${lib.optionalString (cfg.xbootldrMountPoint != null)
+          "${pkgs.util-linuxMinimal}/bin/findmnt ${cfg.xbootldrMountPoint} > /dev/null || fail xbootldrMountPoint ${cfg.xbootldrMountPoint}"
+        }
+      '';
 
-    checkMountpoints = pkgs.writeShellScript "check-mountpoints" ''
-      fail() {
-        echo "$1 = '$2' is not a mounted partition. Is the path configured correctly?" >&2
-        exit 1
-      }
-      ${pkgs.util-linuxMinimal}/bin/findmnt ${efiSysMountPoint} > /dev/null || fail efiSysMountPoint ${efiSysMountPoint}
-      ${lib.optionalString (cfg.xbootldrMountPoint != null)
-        "${pkgs.util-linuxMinimal}/bin/findmnt ${cfg.xbootldrMountPoint} > /dev/null || fail xbootldrMountPoint ${cfg.xbootldrMountPoint}"
-      }
-    '';
-
-    copyExtraFiles = pkgs.writeShellScript "copy-extra-files" ''
-      empty_file=$(${pkgs.coreutils}/bin/mktemp)
-
-      ${concatStrings (
-        mapAttrsToList (n: v: ''
-          ${pkgs.coreutils}/bin/install -Dp "${v}" "${bootMountPoint}/"${escapeShellArg n}
-          ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/"${escapeShellArg n}
-        '') cfg.extraFiles
-      )}
-
-      ${concatStrings (
-        mapAttrsToList (n: v: ''
-          ${pkgs.coreutils}/bin/install -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n}
-          ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n}
-        '') cfg.extraEntries
-      )}
-    '';
+      copyExtraFiles = pkgs.writeShellScript "copy-extra-files" ''
+        empty_file=$(${pkgs.coreutils}/bin/mktemp)
+
+        ${concatStrings (
+          mapAttrsToList (n: v: ''
+            ${pkgs.coreutils}/bin/install -Dp "${v}" "${bootMountPoint}/"${escapeShellArg n}
+            ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/"${escapeShellArg n}
+          '') cfg.extraFiles
+        )}
+
+        ${concatStrings (
+          mapAttrsToList (n: v: ''
+            ${pkgs.coreutils}/bin/install -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n}
+            ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n}
+          '') cfg.extraEntries
+        )}
+      '';
+    };
   };
 
   finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" ''

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
@@ -975,6 +975,7 @@ in {
   spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {};
   spiped = runTest ./spiped.nix;
   sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {};
+  squid = handleTest ./squid.nix {};
   sslh = handleTest ./sslh.nix {};
   ssh-agent-auth = handleTest ./ssh-agent-auth.nix {};
   ssh-audit = handleTest ./ssh-audit.nix {};

diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix
@@ -11,17 +11,15 @@ import ./make-test-python.nix (
       {
         services.hound = {
           enable = true;
-          config = ''
-            {
-              "max-concurrent-indexers": 1,
-              "dbpath": "/var/lib/hound/data",
-              "repos": {
-                "nix": {
-                  "url": "file:///var/lib/hound/my-git"
-                }
-              }
-            }
-          '';
+          settings = {
+            "max-concurrent-indexers" = 1;
+            "dbpath" = "/var/lib/hound/data";
+            "repos" = {
+              "nix" = {
+                "url" = "file:///var/lib/hound/my-git";
+              };
+            };
+          };
         };
 
         systemd.services.houndseed = {