Merge master into haskell-updates

doc/default.nix

@@ -2,6 +2,7 @@
 let
  inherit (pkgs) lib;
  inherit (lib) hasPrefix removePrefix;
+ fs = lib.fileset;
 
  common = import ./common.nix;
 
@@ -99,20 +100,30 @@ in pkgs.stdenv.mkDerivation {
  nixos-render-docs
  ];
 
- src = ./.;
+ src = fs.toSource {
+ root = ./.;
+ fileset = fs.unions [
+ (fs.fileFilter (file:
+ file.hasExt "md"
+ || file.hasExt "md.in"
+ ) ./.)
+ ./style.css
+ ./anchor-use.js
+ ./anchor.min.js
+ ./manpage-urls.json
+ ];
+ };
 
  postPatch = ''
  ln -s ${optionsDoc.optionsJSON}/share/doc/nixos/options.json ./config-options.json
  '';
 
- buildPhase = let
- pythonInterpreterTable = pkgs.callPackage ./doc-support/python-interpreter-table.nix {};
- pythonSection = with lib.strings; replaceStrings
- [ "@python-interpreter-table@" ]
- [ pythonInterpreterTable ]
- (readFile ./languages-frameworks/python.section.md);
- in ''
- cp ${builtins.toFile "python.section.md" pythonSection} ./languages-frameworks/python.section.md
+ pythonInterpreterTable = pkgs.callPackage ./doc-support/python-interpreter-table.nix {};
+
+ passAsFile = [ "pythonInterpreterTable" ];
+
+ buildPhase = ''
+ substituteInPlace ./languages-frameworks/python.section.md --subst-var-by python-interpreter-table "$(<"$pythonInterpreterTablePath")"
 
  cat \
  ./functions/library.md.in \

maintainers/maintainer-list.nix

@@ -1917,12 +1917,6 @@
  githubId = 7745457;
  name = "Astavie";
  };
- astindev = {
- email = "[email protected]";
- github = "astindev";
- githubId = 52360869;
- name = "Astin";
- };
  astro = {
  email = "[email protected]";
  github = "astro";
@@ -5234,6 +5228,12 @@
  github = "diniamo";
  githubId = 55629891;
  };
+ diogomdp = {
+ email = "[email protected]";
+ github = "diogomdp";
+ githubId = 52360869;
+ name = "Diogo";
+ };
  diogotcorreia = {
  name = "Diogo Correia";
  email = "[email protected]";
@@ -7154,6 +7154,13 @@
  githubId = 77672306;
  name = "Florian Agbuya";
  };
+ fsnkty = {
+ name = "fsnkty";
+ github = "fsnkty";
+ githubId = 153512689;
+ email = "[email protected]";
+ matrix = "@nuko:shimeji.cafe";
+ };
  fstamour = {
  email = "[email protected]";
  github = "fstamour";
@@ -15239,13 +15246,6 @@
  github = "numkem";
  githubId = 332423;
  };
- nu-nu-ko = {
- email = "[email protected]";
- matrix = "@nuko:shimeji.cafe";
- github = "nu-nu-ko";
- githubId = 153512689;
- name = "nuko";
- };
  nviets = {
  email = "[email protected]";
  github = "nviets";

nixos/lib/test-driver/default.nix

@@ -13,11 +13,20 @@
 , extraPythonPackages ? (_ : [])
 , nixosTests
 }:
-
+let
+ fs = lib.fileset;
+in
 python3Packages.buildPythonApplication {
  pname = "nixos-test-driver";
  version = "1.1";
- src = ./.;
+ src = fs.toSource {
+ root = ./.;
+ fileset = fs.unions [
+ ./pyproject.toml
+ ./test_driver
+ ./extract-docstrings.py
+ ];
+ };
  pyproject = true;
 
  propagatedBuildInputs = [

nixos/modules/services/audio/navidrome.nix

@@ -157,5 +157,5 @@ in
 
  networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.Port ];
  };
- meta.maintainers = with maintainers; [ nu-nu-ko ];
+ meta.maintainers = with maintainers; [ fsnkty ];
 }

nixos/modules/services/misc/jellyfin.nix

@@ -160,5 +160,5 @@ in
 
  };
 
- meta.maintainers = with maintainers; [ minijackson nu-nu-ko ];
+ meta.maintainers = with maintainers; [ minijackson fsnkty ];
 }

nixos/modules/services/networking/aria2.nix

@@ -7,12 +7,6 @@ let
  defaultRpcListenPort = 6800;
  defaultDir = "${homeDir}/Downloads";
 
- rangesToStringList = map (x:
- if x.from == x.to
- then builtins.toString x.from
- else builtins.toString x.from + "-" + builtins.toString x.to
- );
-
  portRangesToString = ranges: lib.concatStringsSep "," (map
  (x:
  if x.from == x.to
@@ -77,6 +71,7 @@ in
 
  [0]: https://aria2.github.io/manual/en/html/aria2c.html#synopsis
  '';
+ default = { };
  type = lib.types.submodule {
  freeformType = with lib.types; attrsOf (oneOf [ bool int float singleLineStr ]);
  options = {

nixos/modules/services/ttys/getty.nix

@@ -101,7 +101,7 @@ in
  config = {
  # Note: this is set here rather than up there so that changing
  # nixos.label would not rebuild manual pages
- services.getty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>'';
+ services.getty.greetingLine = mkDefault ''<<< Welcome to ${config.system.nixos.distroName} ${config.system.nixos.label} (\m) - \l >>>'';
  services.getty.helpLine = mkIf (config.documentation.nixos.enable && config.documentation.doc.enable) "\nRun 'nixos-help' for the NixOS manual.";
 
  systemd.services."getty@" =
@@ -158,4 +158,5 @@ in
 
  };
 
+ meta.maintainers = with maintainers; [ RossComputerGuy ];
 }

nixos/modules/services/x11/window-managers/qtile.nix

@@ -7,6 +7,10 @@ let
 in
 
 {
+ imports = [
+ (mkRemovedOptionModule [ "services" "xserver" "windowManager" "qtile" "backend" ] "The qtile package now provides separate display sessions for both X11 and Wayland.")
+ ];
+
  options.services.xserver.windowManager.qtile = {
  enable = mkEnableOption "qtile";
 
@@ -22,14 +26,6 @@ in
  '';
  };
 
- backend = mkOption {
- type = types.enum [ "x11" "wayland" ];
- default = "x11";
- description = ''
- Backend to use in qtile: `x11` or `wayland`.
- '';
- };
-
  extraPackages = mkOption {
  type = types.functionTo (types.listOf types.package);
  default = _: [];
@@ -57,25 +53,14 @@ in
  };
 
  config = mkIf cfg.enable {
- services.xserver.windowManager.qtile.finalPackage = pkgs.python3.withPackages (p:
- [ (cfg.package.unwrapped or cfg.package) ] ++ (cfg.extraPackages p)
- );
-
- services.xserver.windowManager.session = [{
- name = "qtile";
- start = ''
- ${cfg.finalPackage}/bin/qtile start -b ${cfg.backend} \
- ${optionalString (cfg.configFile != null)
- "--config \"${cfg.configFile}\""} &
- waitPID=$!
- '';
- }];
+ services = {
+ xserver.windowManager.qtile.finalPackage = pkgs.python3.pkgs.qtile.override { extraPackages = cfg.extraPackages pkgs.python3.pkgs; };
+ displayManager.sessionPackages = [ cfg.finalPackage ];
+ };
 
- environment.systemPackages = [
- # pkgs.qtile is currently a buildenv of qtile and its dependencies.
- # For userland commands, we want the underlying package so that
- # packages such as python don't bleed into userland and overwrite intended behavior.
- (cfg.package.unwrapped or cfg.package)
- ];
+ environment = {
+ etc."xdg/qtile/config.py" = mkIf (cfg.configFile != null) { source = cfg.configFile; };
+ systemPackages = [ cfg.finalPackage ];
+ };
  };
 }

nixos/tests/all-tests.nix

@@ -1019,7 +1019,7 @@ in {
  vault-agent = handleTest ./vault-agent.nix {};
  vault-dev = handleTest ./vault-dev.nix {};
  vault-postgresql = handleTest ./vault-postgresql.nix {};
- vaultwarden = handleTest ./vaultwarden.nix {};
+ vaultwarden = discoverTests (import ./vaultwarden.nix);
  vector = handleTest ./vector {};
  vengi-tools = handleTest ./vengi-tools.nix {};
  victoriametrics = handleTest ./victoriametrics.nix {};

nixos/tests/firefly-iii.nix

@@ -39,19 +39,21 @@ in
  DB_DATABASE = "firefly";
  DB_USERNAME = "firefly";
  DB_PASSWORD_FILE = "/etc/postgres-pass";
+ PGSQL_SCHEMA = "firefly";
  };
  };
 
  services.postgresql = {
  enable = true;
- package = pkgs.postgresql_15;
+ package = pkgs.postgresql_16;
  authentication = ''
  local all postgres peer
  local firefly firefly password
  '';
  initialScript = pkgs.writeText "firefly-init.sql" ''
  CREATE USER "firefly" WITH LOGIN PASSWORD '${db-pass}';
  CREATE DATABASE "firefly" WITH OWNER "firefly";
+ \c firefly
  CREATE SCHEMA AUTHORIZATION firefly;
  '';
  };

nixos/tests/qtile.nix

@@ -10,7 +10,7 @@ import ./make-test-python.nix ({ lib, ...} : {
  test-support.displayManager.auto.user = "alice";
 
  services.xserver.windowManager.qtile.enable = true;
- services.displayManager.defaultSession = lib.mkForce "none+qtile";
+ services.displayManager.defaultSession = lib.mkForce "qtile";
 
  environment.systemPackages = [ pkgs.kitty ];
  };