Merge master into staging-next

maintainers/maintainer-list.nix

@@ -11576,6 +11576,11 @@
  githubId = 4158274;
  name = "Michiel Leenaars";
  };
+ legojames = {
+ github = "jrobinson-uk";
+ githubId = 4701504;
+ name = "James Robinson";
+ };
  leifhelm = {
  email = "[email protected]";
  github = "leifhelm";

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -30,6 +30,8 @@
  `services.forgejo.secrets` is a small wrapper over systemd's `LoadCredential=`. It has the same structure (sections/keys) as
  `services.forgejo.settings` but takes file paths that will be read before service startup instead of some plaintext value.
 
+- `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead.
+
 - The Invoiceplane module now only accepts the structured `settings` option.
  `extraConfig` is now removed.
 

nixos/modules/services/desktop-managers/lomiri.nix

@@ -22,6 +22,7 @@ in {
  libusermetrics
  lomiri
  lomiri-download-manager
+ lomiri-filemanager-app
  lomiri-schemas # exposes some required dbus interfaces
  lomiri-session # wrappers to properly launch the session
  lomiri-sounds
@@ -36,6 +37,10 @@ in {
  suru-icon-theme
  # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043
  ]);
+ variables = {
+ # To override the keyboard layouts in Lomiri
+ NIXOS_XKB_LAYOUTS = config.services.xserver.xkb.layout;
+ };
  };
 
  hardware.pulseaudio.enable = lib.mkDefault true;

nixos/modules/services/networking/ddclient.nix

@@ -11,7 +11,9 @@ let
  # This file can be used as a template for configFile or is automatically generated by Nix options.
  cache=${dataDir}/ddclient.cache
  foreground=YES
- use=${cfg.use}
+ ${lib.optionalString (cfg.use != "") "use=${cfg.use}"}
+ ${lib.optionalString (cfg.use == "" && cfg.usev4 != "") "usev4=${cfg.usev4}"}
+ ${lib.optionalString (cfg.use == "" && cfg.usev6 != "") "usev6=${cfg.usev6}"}
  login=${cfg.username}
  password=${if cfg.protocol == "nsupdate" then "/run/${RuntimeDirectory}/ddclient.key" else "@password_placeholder@"}
  protocol=${cfg.protocol}
@@ -163,12 +165,26 @@ with lib;
  };
 
  use = mkOption {
- default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '";
+ default = "";
  type = str;
  description = ''
  Method to determine the IP address to send to the dynamic DNS provider.
  '';
  };
+ usev4 = mkOption {
+ default = "webv4, webv4=checkip.dyndns.com/, webv4-skip='Current IP Address: '";
+ type = str;
+ description = ''
+ Method to determine the IPv4 address to send to the dynamic DNS provider. Only used if `use` is not set.
+ '';
+ };
+ usev6 = mkOption {
+ default = "webv6, webv6=checkipv6.dyndns.com/, webv6-skip='Current IP Address: '";
+ type = str;
+ description = ''
+ Method to determine the IPv6 address to send to the dynamic DNS provider. Only used if `use` is not set.
+ '';
+ };
 
  verbose = mkOption {
  default = false;
@@ -204,6 +220,8 @@ with lib;
  ###### implementation
 
  config = mkIf config.services.ddclient.enable {
+ warnings = lib.optional (cfg.use != "") "Setting `use` is deprecated, ddclient now supports `usev4` and `usev6` for separate IPv4/IPv6 configuration.";
+
  systemd.services.ddclient = {
  description = "Dynamic DNS Client";
  wantedBy = [ "multi-user.target" ];

nixos/tests/all-tests.nix

@@ -516,6 +516,7 @@ in {
  lxd-image-server = handleTest ./lxd-image-server.nix {};
  #logstash = handleTest ./logstash.nix {};
  lomiri = handleTest ./lomiri.nix {};
+ lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
  lomiri-system-settings = handleTest ./lomiri-system-settings.nix {};
  lorri = handleTest ./lorri/default.nix {};
  maddy = discoverTests (import ./maddy { inherit handleTest; });

nixos/tests/lomiri-filemanager-app.nix

@@ -0,0 +1,48 @@
+{ pkgs, lib, ... }:
+{
+ name = "lomiri-filemanager-app-standalone";
+ meta.maintainers = lib.teams.lomiri.members;
+
+ nodes.machine =
+ { config, pkgs, ... }:
+ {
+ imports = [ ./common/x11.nix ];
+
+ services.xserver.enable = true;
+
+ environment = {
+ systemPackages = with pkgs.lomiri; [
+ suru-icon-theme
+ lomiri-filemanager-app
+ ];
+ variables = {
+ UITK_ICON_THEME = "suru";
+ };
+ };
+
+ i18n.supportedLocales = [ "all" ];
+
+ fonts.packages = with pkgs; [
+ # Intended font & helps with OCR
+ ubuntu_font_family
+ ];
+ };
+
+ enableOCR = true;
+
+ testScript = ''
+ machine.wait_for_x()
+
+ with subtest("lomiri filemanager launches"):
+ machine.execute("lomiri-filemanager-app >&2 &")
+ machine.wait_for_text(r"(filemanager.ubports|alice|items|directories|files|folder)")
+ machine.screenshot("lomiri-filemanager_open")
+
+ machine.succeed("pkill -f lomiri-filemanager-app")
+
+ with subtest("lomiri filemanager localisation works"):
+ machine.execute("env LANG=de_DE.UTF-8 lomiri-filemanager-app >&2 &")
+ machine.wait_for_text(r"(Elemente|Verzeichnisse|Dateien|Ordner)")
+ machine.screenshot("lomiri-filemanager_localised")
+ '';
+}

nixos/tests/lomiri.nix

@@ -268,7 +268,7 @@ in {
  machine.screenshot("settings_content-hub_peers")
 
  # Select Morph as content source
- mouse_click(300, 100)
+ mouse_click(370, 100)
 
  # Expect Morph to be brought into the foreground, with its Downloads page open
  machine.wait_for_text("No downloads")

pkgs/applications/backup/timeshift/unwrapped.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
  pname = "timeshift";
- version = "24.01.1";
+ version = "24.06.1";
 
  src = fetchFromGitHub {
  owner = "linuxmint";
  repo = "timeshift";
  rev = version;
- hash = "sha256-vAKUR0VsOuiQmB+1jPOR0KufzfXaxAsf3EOPzdgFt0A=";
+ hash = "sha256-H4PCZ1WwNg34WSDXgmH6pUPBglXafLTFfIzvmWiyeCw=";
  };
 
  patches = [