Merge master into haskell-updates

2024-11-26 17:03:01 +00:00 · 2024-08-27 00:15:15 +00:00 · 2024-08-27 00:15:15 +00:00 · be00f9196e
commit be00f9196e
parent 8894a160fe 0c7aafc7f5
321 changed files with 4340 additions and 2067 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@ -154,6 +154,9 @@ bdfde18037f8d9f9b641a4016c8ada4dc4cbf856
 # nixos/ollama: format with nixfmt-rfc-style (#329561)
 246d1ee533810ac1946d863bbd9de9b525818d56

+# steam: cleanup (#216972)
+ad815aebfbfe1415ff6436521d545029c803c3fb
+
 # nixos/nvidia: apply nixfmt-rfc-style (#313440)
 fbdcdde04a7caa007e825a8b822c75fab9adb2d6

--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@ -404,6 +404,12 @@ lib.mapAttrs mkLicense ({
    fullName  = "CeCILL-C Free Software License Agreement";
  };

+  cockroachdb-community-license = {
+    fullName = "CockroachDB Community License Agreement";
+    url = "https://www.cockroachlabs.com/cockroachdb-community-license/";
+    free = false;
+  };
+
  cpal10 = {
    spdxId = "CPAL-1.0";
    fullName = "Common Public Attribution License 1.0";
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@ -201,8 +201,9 @@ rec {
      target = "zImage";
    };
    gcc = {
-      arch = "armv6";
-      fpu = "vfp";
+      # https://en.wikipedia.org/wiki/Raspberry_Pi#Specifications
+      arch = "armv6kz";
+      fpu = "vfpv2";
    };
  };

--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@ -542,21 +542,21 @@ checkConfigOutput '^"pear\\npear"$' config.twice.raw ./merge-module-with-key.nix

 # Declaration positions
 # Line should be present for direct options
-checkConfigOutput '^10$' options.imported.line10.declarationPositions.0.line ./declaration-positions.nix
-checkConfigOutput '/declaration-positions.nix"$' options.imported.line10.declarationPositions.0.file ./declaration-positions.nix
+checkConfigOutput '^14$' options.imported.line14.declarationPositions.0.line ./declaration-positions.nix
+checkConfigOutput '/declaration-positions.nix"$' options.imported.line14.declarationPositions.0.file ./declaration-positions.nix
 # Generated options may not have line numbers but they will at least get the
 # right file
-checkConfigOutput '/declaration-positions.nix"$' options.generated.line18.declarationPositions.0.file ./declaration-positions.nix
-checkConfigOutput '^null$' options.generated.line18.declarationPositions.0.line ./declaration-positions.nix
+checkConfigOutput '/declaration-positions.nix"$' options.generated.line22.declarationPositions.0.file ./declaration-positions.nix
+checkConfigOutput '^null$' options.generated.line22.declarationPositions.0.line ./declaration-positions.nix
 # Submodules don't break it
-checkConfigOutput '^39$' config.submoduleLine34.submodDeclLine39.0.line ./declaration-positions.nix
-checkConfigOutput '/declaration-positions.nix"$' config.submoduleLine34.submodDeclLine39.0.file ./declaration-positions.nix
+checkConfigOutput '^45$' config.submoduleLine38.submodDeclLine45.0.line ./declaration-positions.nix
+checkConfigOutput '/declaration-positions.nix"$' config.submoduleLine38.submodDeclLine45.0.file ./declaration-positions.nix
 # New options under freeform submodules get collected into the parent submodule
 # (consistent with .declarations behaviour, but weird; notably appears in system.build)
-checkConfigOutput '^34|23$' options.submoduleLine34.declarationPositions.0.line ./declaration-positions.nix
-checkConfigOutput '^34|23$' options.submoduleLine34.declarationPositions.1.line ./declaration-positions.nix
+checkConfigOutput '^38|27$' options.submoduleLine38.declarationPositions.0.line ./declaration-positions.nix
+checkConfigOutput '^38|27$' options.submoduleLine38.declarationPositions.1.line ./declaration-positions.nix
 # nested options work
-checkConfigOutput '^30$' options.nested.nestedLine30.declarationPositions.0.line ./declaration-positions.nix
+checkConfigOutput '^34$' options.nested.nestedLine34.declarationPositions.0.line ./declaration-positions.nix

 cat <<EOF
 ====== module tests ======
--- a/lib/tests/modules/declaration-positions.nix
+++ b/lib/tests/modules/declaration-positions.nix
@ -1,13 +1,17 @@
 { lib, options, ... }:
-let discardPositions = lib.mapAttrs (k: v: v);
+let
+  discardPositions = lib.mapAttrs (k: v: v);
 in
 # unsafeGetAttrPos is unspecified best-effort behavior, so we only want to consider this test on an evaluator that satisfies some basic assumptions about this function.
 assert builtins.unsafeGetAttrPos "a" { a = true; } != null;
-assert builtins.unsafeGetAttrPos "a" (discardPositions { a = true; }) == null;
+assert
+  builtins.unsafeGetAttrPos "a" (discardPositions {
+    a = true;
+  }) == null;
 {
  imports = [
    {
-      options.imported.line10 = lib.mkOption {
+      options.imported.line14 = lib.mkOption {
        type = lib.types.int;
      };

@ -15,35 +19,39 @@ assert builtins.unsafeGetAttrPos "a" (discardPositions { a = true; }) == null;
      # programs.firefox.nativeMessagingHosts.ff2mpv. We don't expect to get
      # line numbers for these, but we can fall back on knowing the file.
      options.generated = discardPositions {
-        line18 = lib.mkOption {
+        line22 = lib.mkOption {
          type = lib.types.int;
        };
      };

-      options.submoduleLine34.extraOptLine23 = lib.mkOption {
+      options.submoduleLine38.extraOptLine27 = lib.mkOption {
        default = 1;
        type = lib.types.int;
      };
    }
  ];

-  options.nested.nestedLine30 = lib.mkOption {
+  options.nested.nestedLine34 = lib.mkOption {
    type = lib.types.int;
  };

-  options.submoduleLine34 = lib.mkOption {
+  options.submoduleLine38 = lib.mkOption {
    default = { };
    type = lib.types.submoduleWith {
      modules = [
-        ({ options, ... }: {
-          options.submodDeclLine39 = lib.mkOption { };
-        })
+        (
+          { options, ... }:
+          {
+            options.submodDeclLine45 = lib.mkOption { };
+          }
+        )
        { freeformType = with lib.types; lazyAttrsOf (uniq unspecified); }
      ];
    };
  };

  config = {
-    submoduleLine34.submodDeclLine39 = (options.submoduleLine34.type.getSubOptions [ ]).submodDeclLine39.declarationPositions;
+    submoduleLine38.submodDeclLine45 =
+      (options.submoduleLine38.type.getSubOptions [ ]).submodDeclLine45.declarationPositions;
  };
 }
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -6807,6 +6807,12 @@
    name = "Sebastian Neubauer";
    keys = [ { fingerprint = "2F93 661D AC17 EA98 A104  F780 ECC7 55EE 583C 1672"; } ];
  };
+  Flameopathic = {
+    email = "flameopathic@gmail.com";
+    github = "Flameopathic";
+    githubId = 64027365;
+    name = "Erin Pletches";
+  };
  flandweber = {
    email = "finn@landweber.xyz";
    github = "flandweber";
@ -6991,6 +6997,12 @@
    githubId = 14952658;
    name = "Tom Dohrmann";
  };
+  frectonz = {
+    name = "Fraol Lemecha";
+    email = "fraol0912@gmail.com";
+    github = "frectonz";
+    githubId = 53809656;
+  };
  fredeb = {
    email = "im@fredeb.dev";
    github = "FredeEB";
@ -19934,13 +19946,6 @@
    githubId = 36031171;
    name = "Supa";
  };
-  superherointj = {
-    email = "sergiomarcelo@yandex.com";
-    github = "superherointj";
-    githubId = 5861043;
-    matrix = "@superherointj:matrix.org";
-    name = "Sérgio Marcelo";
-  };
  SuperSandro2000 = {
    email = "sandro.jaeckel@gmail.com";
    matrix = "@sandro:supersandro.de";
@ -20413,6 +20418,13 @@
    githubId = 3889585;
    name = "Cheng Shao";
  };
+  terryg = {
+    name = "Terry Garcia";
+    email = "terry@terryg.org";
+    github = "TerryGarcia";
+    githubId = 159372832;
+    keys = [ { fingerprint = "6F54 C08C 37C8 EC78 15FA  0D01 A721 8CBA 2D80 15C3"; } ];
+  };
  tesq0 = {
    email = "mikolaj.galkowski@gmail.com";
    github = "tesq0";
@ -21917,6 +21929,14 @@
    githubId = 230381;
    name = "Daniel Nilsson";
  };
+  vrifox = {
+    email = "vrifox@vrifox.cc";
+    github = "vrifox";
+    githubId = 109021367;
+    keys = [ { fingerprint = "413C 73F0 C5BD 6318 826A  42D9 D400 98E5 B60B 2197"; } ];
+    matrix = "@vri:cozy.town";
+    name = "Vri";
+  };
  vrinek = {
    email = "vrinek@hey.com";
    github = "vrinek";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -507,7 +507,6 @@ with lib.maintainers;
      marcusramberg
      mic92
      rorosen
-      superherointj
      wrmilling
      yajo
    ];
@ -780,7 +779,11 @@ with lib.maintainers;
  };

  perl = {
-    members = [ sgo ];
+    members = [
+      sgo
+      marcusramberg
+      zakame
+    ];
    scope = "Maintain the Perl interpreter and Perl packages.";
    shortName = "Perl";
    enableFeatureFreezePing = true;
@ -947,7 +950,6 @@ with lib.maintainers;
  stridtech = {
    # Verify additions by approval of an already existing member of the team
    members = [
-      superherointj
      ulrikstrid
    ];
    scope = "Group registration for Strid Tech AB team members who collectively maintain packages";
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -33,6 +33,8 @@

 - [Goatcounter](https://www.goatcounter.com/), Easy web analytics. No tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcocunter.enable).

+- [UWSM](https://github.com/Vladimir-csp/uwsm), a wayland session manager to wrap Wayland Compositors into useful systemd units such as `graphical-session.target`. Available as [programs.uwsm](#opt-programs.uwsm.enable).
+
 - [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI
  for LLMs. Available as [services.open-webui](#opt-services.open-webui.enable)
  service.
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@ -1,8 +1,4 @@
 { config, lib, pkgs, ... }:
-
-with pkgs;
-with lib;
-
 let

  cfg = config.hardware.pulseaudio;
@ -10,28 +6,28 @@ let
  hasZeroconf = let z = cfg.zeroconf; in z.publish.enable || z.discovery.enable;

  overriddenPackage = cfg.package.override
-    (optionalAttrs hasZeroconf { zeroconfSupport = true; });
-  binary = "${getBin overriddenPackage}/bin/pulseaudio";
+    (lib.optionalAttrs hasZeroconf { zeroconfSupport = true; });
+  binary = "${lib.getBin overriddenPackage}/bin/pulseaudio";
  binaryNoDaemon = "${binary} --daemonize=no";

  # Forces 32bit pulseaudio and alsa-plugins to be built/supported for apps
  # using 32bit alsa on 64bit linux.
-  enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null);
+  enable32BitAlsaPlugins = cfg.support32Bit && pkgs.stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null);


  myConfigFile =
    let
-      addModuleIf = cond: mod: optionalString cond "load-module ${mod}";
-      allAnon = optional cfg.tcp.anonymousClients.allowAll "auth-anonymous=1";
+      addModuleIf = cond: mod: lib.optionalString cond "load-module ${mod}";
+      allAnon = lib.optional cfg.tcp.anonymousClients.allowAll "auth-anonymous=1";
      ipAnon =  let a = cfg.tcp.anonymousClients.allowedIpRanges;
-                in optional (a != []) ''auth-ip-acl=${concatStringsSep ";" a}'';
-    in writeTextFile {
+                in lib.optional (a != []) ''auth-ip-acl=${lib.concatStringsSep ";" a}'';
+    in pkgs.writeTextFile {
      name = "default.pa";
        text = ''
        .include ${cfg.configFile}
        ${addModuleIf cfg.zeroconf.publish.enable "module-zeroconf-publish"}
        ${addModuleIf cfg.zeroconf.discovery.enable "module-zeroconf-discover"}
-        ${addModuleIf cfg.tcp.enable (concatStringsSep " "
+        ${addModuleIf cfg.tcp.enable (lib.concatStringsSep " "
           ([ "module-native-protocol-tcp" ] ++ allAnon ++ ipAnon))}
        ${addModuleIf config.services.jack.jackd.enable "module-jack-sink"}
        ${addModuleIf config.services.jack.jackd.enable "module-jack-source"}
@ -49,7 +45,7 @@ let
  # Create pulse/client.conf even if PulseAudio is disabled so
  # that we can disable the autospawn feature in programs that
  # are built with PulseAudio support (like KDE).
-  clientConf = writeText "client.conf" ''
+  clientConf = pkgs.writeText "client.conf" ''
    autospawn=no
    ${cfg.extraClientConf}
  '';
@ -82,16 +78,16 @@ in {
  options = {

    hardware.pulseaudio = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
        default = false;
        description = ''
          Whether to enable the PulseAudio sound server.
        '';
      };

-      systemWide = mkOption {
-        type = types.bool;
+      systemWide = lib.mkOption {
+        type = lib.types.bool;
        default = false;
        description = ''
          If false, a PulseAudio server is launched automatically for
@ -105,8 +101,8 @@ in {
        '';
      };

-      support32Bit = mkOption {
-        type = types.bool;
+      support32Bit = lib.mkOption {
+        type = lib.types.bool;
        default = false;
        description = ''
          Whether to include the 32-bit pulseaudio libraries in the system or not.
@ -114,8 +110,8 @@ in {
        '';
      };

-      configFile = mkOption {
-        type = types.nullOr types.path;
+      configFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
        description = ''
          The path to the default configuration options the PulseAudio server
          should use. By default, the "default.pa" configuration
@ -123,8 +119,8 @@ in {
        '';
      };

-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
        default = "";
        description = ''
          Literal string to append to `configFile`
@ -132,21 +128,21 @@ in {
        '';
      };

-      extraClientConf = mkOption {
-        type = types.lines;
+      extraClientConf = lib.mkOption {
+        type = lib.types.lines;
        default = "";
        description = ''
          Extra configuration appended to pulse/client.conf file.
        '';
      };

-      package = mkOption {
-        type = types.package;
+      package = lib.mkOption {
+        type = lib.types.package;
        default = if config.services.jack.jackd.enable
                  then pkgs.pulseaudioFull
                  else pkgs.pulseaudio;
-        defaultText = literalExpression "pkgs.pulseaudio";
-        example = literalExpression "pkgs.pulseaudioFull";
+        defaultText = lib.literalExpression "pkgs.pulseaudio";
+        example = lib.literalExpression "pkgs.pulseaudioFull";
        description = ''
          The PulseAudio derivation to use.  This can be used to enable
          features (such as JACK support, Bluetooth) via the
@ -154,10 +150,10 @@ in {
        '';
      };

-      extraModules = mkOption {
-        type = types.listOf types.package;
+      extraModules = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
        default = [];
-        example = literalExpression "[ pkgs.pulseaudio-modules-bt ]";
+        example = lib.literalExpression "[ pkgs.pulseaudio-modules-bt ]";
        description = ''
          Extra pulseaudio modules to use. This is intended for out-of-tree
          pulseaudio modules like extra bluetooth codecs.
@ -167,8 +163,8 @@ in {
      };

      daemon = {
-        logLevel = mkOption {
-          type = types.str;
+        logLevel = lib.mkOption {
+          type = lib.types.str;
          default = "notice";
          description = ''
            The log level that the system-wide pulseaudio daemon should use,
@ -176,31 +172,31 @@ in {
          '';
        };

-        config = mkOption {
-          type = types.attrsOf types.unspecified;
+        config = lib.mkOption {
+          type = lib.types.attrsOf lib.types.unspecified;
          default = {};
          description = "Config of the pulse daemon. See `man pulse-daemon.conf`.";
-          example = literalExpression ''{ realtime-scheduling = "yes"; }'';
+          example = lib.literalExpression ''{ realtime-scheduling = "yes"; }'';
        };
      };

      zeroconf = {
        discovery.enable =
-          mkEnableOption "discovery of pulseaudio sinks in the local network";
+          lib.mkEnableOption "discovery of pulseaudio sinks in the local network";
        publish.enable =
-          mkEnableOption "publishing the pulseaudio sink in the local network";
+          lib.mkEnableOption "publishing the pulseaudio sink in the local network";
      };

      # TODO: enable by default?
      tcp = {
-        enable = mkEnableOption "tcp streaming support";
+        enable = lib.mkEnableOption "tcp streaming support";

        anonymousClients = {
-          allowAll = mkEnableOption "all anonymous clients to stream to the server";
-          allowedIpRanges = mkOption {
-            type = types.listOf types.str;
+          allowAll = lib.mkEnableOption "all anonymous clients to stream to the server";
+          allowedIpRanges = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
            default = [];
-            example = literalExpression ''[ "127.0.0.1" "192.168.1.0/24" ]'';
+            example = lib.literalExpression ''[ "127.0.0.1" "192.168.1.0/24" ]'';
            description = ''
              A list of IP subnets that are allowed to stream to the server.
            '';
@ -213,7 +209,7 @@ in {
  };


-  config = lib.mkIf cfg.enable (mkMerge [
+  config = lib.mkIf cfg.enable (lib.mkMerge [
    {
      environment.etc."pulse/client.conf".source = clientConf;

@ -222,21 +218,21 @@ in {
      environment.etc = {
        "alsa/conf.d/99-pulseaudio.conf".text = alsaConf;

-        "pulse/daemon.conf".source = writeText "daemon.conf"
+        "pulse/daemon.conf".source = pkgs.writeText "daemon.conf"
          (lib.generators.toKeyValue {} cfg.daemon.config);

-        "openal/alsoft.conf".source = writeText "alsoft.conf" "drivers=pulse";
+        "openal/alsoft.conf".source = pkgs.writeText "alsoft.conf" "drivers=pulse";

-        "libao.conf".source = writeText "libao.conf" "default_driver=pulse";
+        "libao.conf".source = pkgs.writeText "libao.conf" "default_driver=pulse";
      };

-      hardware.pulseaudio.configFile = mkDefault "${getBin overriddenPackage}/etc/pulse/default.pa";
+      hardware.pulseaudio.configFile = lib.mkDefault "${lib.getBin overriddenPackage}/etc/pulse/default.pa";

      # Disable flat volumes to enable relative ones
-      hardware.pulseaudio.daemon.config.flat-volumes = mkDefault "no";
+      hardware.pulseaudio.daemon.config.flat-volumes = lib.mkDefault "no";

      # Upstream defaults to speex-float-1 which results in audible artifacts
-      hardware.pulseaudio.daemon.config.resample-method = mkDefault "speex-float-5";
+      hardware.pulseaudio.daemon.config.resample-method = lib.mkDefault "speex-float-5";

      # Allow PulseAudio to get realtime priority using rtkit.
      security.rtkit.enable = true;
@ -247,7 +243,7 @@ in {
      services.udev.packages = [ overriddenPackage ];
    }

-    (mkIf (cfg.extraModules != []) {
+    (lib.mkIf (cfg.extraModules != []) {
      hardware.pulseaudio.daemon.config.dl-search-path = let
        overriddenModules = builtins.map
          (drv: drv.override { pulseaudio = overriddenPackage; })
@ -259,15 +255,15 @@ in {
      in lib.concatStringsSep ":" modulePaths;
    })

-    (mkIf hasZeroconf {
+    (lib.mkIf hasZeroconf {
      services.avahi.enable = true;
    })
-    (mkIf cfg.zeroconf.publish.enable {
+    (lib.mkIf cfg.zeroconf.publish.enable {
      services.avahi.publish.enable = true;
      services.avahi.publish.userServices = true;
    })

-    (mkIf (!cfg.systemWide) {
+    (lib.mkIf (!cfg.systemWide) {
      environment.etc = {
        "pulse/default.pa".source = myConfigFile;
      };
@ -278,7 +274,7 @@ in {
            RestartSec = "500ms";
            PassEnvironment = "DISPLAY";
          };
-        } // optionalAttrs config.services.jack.jackd.enable {
+        } // lib.optionalAttrs config.services.jack.jackd.enable {
          environment.JACK_PROMISCUOUS_SERVER = "jackaudio";
        };
        sockets.pulseaudio = {
@ -287,7 +283,7 @@ in {
      };
    })

-    (mkIf cfg.systemWide {
+    (lib.mkIf cfg.systemWide {
      users.users.pulse = {
        # For some reason, PulseAudio wants UID == GID.
        uid = assert uid == gid; uid;
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -310,6 +310,7 @@
  ./programs/wayland/miracle-wm.nix
  ./programs/wayland/river.nix
  ./programs/wayland/sway.nix
+  ./programs/wayland/uwsm.nix
  ./programs/wayland/waybar.nix
  ./programs/wayland/wayfire.nix
  ./programs/weylus.nix
--- a/nixos/modules/programs/gamescope.nix
+++ b/nixos/modules/programs/gamescope.nix
@ -17,6 +17,7 @@ let
      mkdir -p $out/bin
      makeWrapper ${cfg.package}/bin/gamescope $out/bin/gamescope --inherit-argv0 \
        ${builtins.toString wrapperArgs}
+      ln -s ${cfg.package}/bin/gamescopectl $out/bin/gamescopectl
    '';
 in
 {
--- a/nixos/modules/programs/wayland/uwsm.nix
+++ b/nixos/modules/programs/wayland/uwsm.nix
@ -0,0 +1,129 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.programs.uwsm;
+
+  # Helper function to create desktop entry files for UWSM-managed compositors
+  mk_uwsm_desktop_entry =
+    opts:
+    (pkgs.writeTextFile {
+      name = "${opts.name}-uwsm";
+      text = ''
+        [Desktop Entry]
+        Name=${opts.prettyName} (UWSM)
+        Comment=${opts.comment}
+        Exec=${lib.getExe cfg.package} start -S -F ${opts.binPath}
+        Type=Application
+      '';
+      destination = "/share/wayland-sessions/${opts.name}-uwsm.desktop";
+      derivationArgs = {
+        passthru.providedSessions = [ "${opts.name}-uwsm" ];
+      };
+    });
+in
+{
+  options.programs.uwsm = {
+    enable = lib.mkEnableOption ''
+      uwsm, which wraps standalone Wayland compositors with a set
+      of Systemd units on the fly. This essentially
+      binds the wayland compositor into `graphical-session-pre.target`,
+      `graphical-session.target`, `xdg-desktop-autostart.target`.
+
+      This is useful for Wayland compositors like Hyprland, Sway, Wayfire,
+      etc. that do not start these targets and services on their own.
+
+      ::: {.note}
+      You must configure `waylandCompositors` suboptions as well
+      so that UWSM knows which compositors to manage.
+
+      Additionally, this by default uses `dbus-broker` as the dbus
+      implementation for better compatibility. If you dislike this behavior
+      you can set `services.dbus.implementation = lib.mkForce "dbus"`
+      in your configuration.
+      :::
+
+      If you are having trouble starting a service that depends on
+      `graphical-session.target`, while using a WM, enabling this option
+      might help
+    '';
+    package = lib.mkPackageOption pkgs "uwsm" { };
+
+    waylandCompositors = lib.mkOption {
+      description = ''
+        Configuration for UWSM-managed Wayland Compositors. This
+        creates a desktop entry file which will be used by Display
+        Managers like GDM, to allow starting the UWSM managed session.
+      '';
+      type = lib.types.attrsOf (
+        lib.types.submodule (
+          { ... }:
+          {
+            options = {
+              prettyName = lib.mkOption {
+                type = lib.types.str;
+                description = "The full name of the desktop entry file.";
+                example = "ExampleWaylandCompositor";
+              };
+              comment = lib.mkOption {
+                type = lib.types.str;
+                description = "The comment field of the desktop entry file.";
+                default = "An intelligent Wayland compositor managed by UWSM.";
+              };
+              binPath = lib.mkOption {
+                type = lib.types.path;
+                description = ''
+                  The wayland-compositor binary path that will be called by UWSM.
+
+                  It is recommended to use the `/run/current-system/sw/bin/` path
+                  instead of `lib.getExe pkgs.<compositor>` to avoid version mismatch
+                  of the compositor used by UWSM and the one installed in the system.
+                '';
+                example = "/run/current-system/sw/bin/ExampleCompositor";
+              };
+            };
+          }
+        )
+      );
+      example = lib.literalExpression ''
+        hyprland = {
+          prettyName = "Hyprland";
+          comment = "Hyprland compositor managed by UWSM";
+          binPath = "/run/current-system/sw/bin/Hyprland";
+        };
+        sway = {
+          prettyName = "Sway";
+          comment = "Sway compositor managed by UWSM";
+          binPath = "/run/current-system/sw/bin/sway";
+        };
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    systemd.packages = [ cfg.package ];
+    environment.pathsToLink = [ "/share/uwsm" ];
+
+    services.graphical-desktop.enable = true;
+
+    # UWSM recommends dbus broker for better compatibility
+    services.dbus.implementation = "broker";
+
+    services.displayManager.sessionPackages = lib.mapAttrsToList (
+      name: value:
+      mk_uwsm_desktop_entry {
+        inherit name;
+        inherit (value) prettyName comment binPath;
+      }
+    ) cfg.waylandCompositors;
+  };
+
+  meta.maintainers = with lib.maintainers; [
+    johnrtitor
+    kai-tub
+  ];
+}
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@ -24,6 +24,7 @@ in {
        lomiri-calculator-app
        lomiri-camera-app
        lomiri-clock-app
+        lomiri-docviewer-app
        lomiri-download-manager
        lomiri-filemanager-app
        lomiri-gallery-app
--- a/nixos/modules/services/home-automation/home-assistant.nix
+++ b/nixos/modules/services/home-automation/home-assistant.nix
@ -655,6 +655,7 @@ in {
        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
        User = "hass";
        Group = "hass";
+        WorkingDirectory = cfg.configDir;
        Restart = "on-failure";
        RestartForceExitStatus = "100";
        SuccessExitStatus = "100";
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@ -84,7 +84,7 @@ let
  };
 in
 {
-  meta.maintainers = with maintainers; [ erikarvstedt Flakebi leona ];
+  meta.maintainers = with maintainers; [ leona SuperSandro2000 erikarvstedt ];

  imports = [
    (mkRenamedOptionModule [ "services" "paperless-ng" ] [ "services" "paperless" ])
--- a/nixos/modules/services/video/go2rtc/default.nix
+++ b/nixos/modules/services/video/go2rtc/default.nix
@ -55,8 +55,8 @@ in
          ffmpeg = {
            bin = mkOption {
              type = path;
-              default = "${lib.getBin pkgs.ffmpeg_6-headless}/bin/ffmpeg";
-              defaultText = literalExpression "\${lib.getBin pkgs.ffmpeg_6-headless}/bin/ffmpeg";
+              default = lib.getExe pkgs.ffmpeg_7-headless;
+              defaultText = literalExpression "lib.getExe pkgs.ffmpeg_7-headless";
              description = ''
                The ffmpeg package to use for transcoding.
              '';
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@ -52,7 +52,7 @@ let

  flashbackEnabled = cfg.flashback.enableMetacity || lib.length cfg.flashback.customSessions > 0;
  flashbackWms = lib.optional cfg.flashback.enableMetacity {
-    wmName = "pkgs.metacity";
+    wmName = "metacity";
    wmLabel = "Metacity";
    wmCommand = "${pkgs.metacity}/bin/metacity";
    enableGnomePanel = true;
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixos/modules/tasks/auto-upgrade.nix
@ -181,7 +181,7 @@ in {
          "nixpkgs=${cfg.channel}/nixexprs.tar.xz"
        ]
      else
-        [ "--flake ${cfg.flake}" ]);
+        [ "--refresh" "--flake ${cfg.flake}" ]);

    systemd.services.nixos-upgrade = {
      description = "NixOS Upgrade";
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -545,6 +545,7 @@ in {
  lomiri-calculator-app = runTest ./lomiri-calculator-app.nix;
  lomiri-camera-app = runTest ./lomiri-camera-app.nix;
  lomiri-clock-app = runTest ./lomiri-clock-app.nix;
+  lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix;
  lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
  lomiri-gallery-app = runTest ./lomiri-gallery-app.nix;
  lomiri-system-settings = handleTest ./lomiri-system-settings.nix {};
--- a/nixos/tests/lomiri-docviewer-app.nix
+++ b/nixos/tests/lomiri-docviewer-app.nix
@ -0,0 +1,84 @@
+{ lib, ... }:
+let
+  exampleText = "Lorem ipsum dolor sit amet";
+in
+{
+  name = "lomiri-docviewer-app-standalone";
+  meta.maintainers = lib.teams.lomiri.members;
+
+  nodes.machine =
+    { config, pkgs, ... }:
+    {
+      imports = [ ./common/x11.nix ];
+
+      services.xserver.enable = true;
+
+      environment = {
+        etc."docviewer-sampletext.txt".text = exampleText;
+        systemPackages =
+          with pkgs;
+          [
+            libreoffice # txt -> odf to test LibreOfficeKit integration
+          ]
+          ++ (with pkgs.lomiri; [
+            suru-icon-theme
+            lomiri-docviewer-app
+          ]);
+        variables = {
+          UITK_ICON_THEME = "suru";
+        };
+      };
+
+      i18n.supportedLocales = [ "all" ];
+
+      fonts = {
+        packages = with pkgs; [
+          # Intended font & helps with OCR
+          ubuntu-classic
+        ];
+      };
+    };
+
+  enableOCR = true;
+
+  testScript = ''
+    machine.wait_for_x()
+
+    with subtest("lomiri docviewer launches"):
+        machine.succeed("lomiri-docviewer-app >&2 &")
+        machine.wait_for_text("No documents")
+        machine.screenshot("lomiri-docviewer_open")
+
+    machine.succeed("pkill -f lomiri-docviewer-app")
+
+    # Setup different document types
+    machine.succeed("soffice --convert-to odt --outdir /root/ /etc/docviewer-sampletext.txt")
+    machine.succeed("soffice --convert-to pdf --outdir /root/ /etc/docviewer-sampletext.txt")
+
+    with subtest("lomiri docviewer txt works"):
+        machine.succeed("lomiri-docviewer-app /etc/docviewer-sampletext.txt >&2 &")
+        machine.wait_for_text("${exampleText}")
+        machine.screenshot("lomiri-docviewer_txt")
+
+    machine.succeed("pkill -f lomiri-docviewer-app")
+
+    with subtest("lomiri docviewer odt works"):
+        machine.succeed("lomiri-docviewer-app /root/docviewer-sampletext.odt >&2 &")
+        machine.wait_for_text("${exampleText}")
+        machine.screenshot("lomiri-docviewer_odt")
+
+    machine.succeed("pkill -f lomiri-docviewer-app")
+
+    with subtest("lomiri docviewer pdf works"):
+        machine.succeed("lomiri-docviewer-app /root/docviewer-sampletext.pdf >&2 &")
+        machine.wait_for_text("${exampleText}")
+        machine.screenshot("lomiri-docviewer_pdf")
+
+    machine.succeed("pkill -f lomiri-docviewer-app")
+
+    with subtest("lomiri docviewer localisation works"):
+        machine.succeed("env LANG=de_DE.UTF-8 lomiri-docviewer-app >&2 &")
+        machine.wait_for_text("Keine Dokumente")
+        machine.screenshot("lomiri-docviewer_localised")
+  '';
+}
--- a/nixos/tests/paperless.nix
+++ b/nixos/tests/paperless.nix
@ -1,6 +1,6 @@
 import ./make-test-python.nix ({ lib, ... }: {
  name = "paperless";
-  meta.maintainers = with lib.maintainers; [ erikarvstedt Flakebi ];
+  meta.maintainers = with lib.maintainers; [ leona SuperSandro2000 erikarvstedt ];

  nodes = let self = {
    simple = { pkgs, ... }: {
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
    homepage = "https://audacious-media-player.org";
    downloadPage = "https://github.com/audacious-media-player/audacious";
    mainProgram = "audacious";
-    maintainers = with lib.maintainers; [ eelco ramkromberg ttuegel thiagokokada ];
+    maintainers = with lib.maintainers; [ ramkromberg ttuegel thiagokokada ];
    platforms = lib.platforms.linux;
    license = with lib.licenses; [
      bsd2
--- a/pkgs/applications/audio/musly/default.nix
+++ b/pkgs/applications/audio/musly/default.nix
@ -1,34 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg_4 }:
-stdenv.mkDerivation {
-  pname = "musly";
-  version = "unstable-2017-04-26";
-  src = fetchFromGitHub {
-    owner = "dominikschnitzer";
-    repo = "musly";
-    rev = "f911eacbbe0b39ebe87cb37d0caef09632fa40d6";
-    sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825";
-  };
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ eigen ffmpeg_4 ];
-  fixupPhase = lib.optionalString stdenv.isDarwin ''
-    install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly
-    install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly
-    install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib
-  '';
-
-  meta = with lib; {
-    homepage = "https://www.musly.org";
-    description = "Fast and high-quality audio music similarity library written in C/C++";
-    longDescription = ''
-      Musly analyzes the the audio signal of music pieces to estimate their similarity.
-      No meta-data about the music piece is included in the similarity estimation.
-      To use Musly in your application, have a look at the library documentation
-      or try the command line application included in the package and start generating
-      some automatic music playlists right away.
-    '';
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ ggpeti ];
-    platforms = with platforms; darwin ++ linux;
-    mainProgram = "musly";
-  };
-}
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "snapcast";
-  version = "0.28.0";
+  version = "0.29.0";

  src = fetchFromGitHub {
    owner  = "badaix";
    repo   = "snapcast";
    rev    = "v${version}";
-    sha256 = "sha256-XxpiLojs1TI3qM7yXS+OPcHKo6pLcfJ+Eop7GjQ4HQw=";
+    hash = "sha256-FWOGBXYWLHHZhvC5/BpkDd70ZupzALZ3ks3qTcrtwKQ=";
  };

  nativeBuildInputs = [ cmake pkg-config ];
--- a/pkgs/applications/audio/spotify/linux.nix
+++ b/pkgs/applications/audio/spotify/linux.nix
@ -184,6 +184,6 @@ stdenv.mkDerivation {
    '';

  meta = meta // {
-    maintainers = with lib.maintainers; [ eelco ftrvxmtrx sheenobu timokau ma27 ];
+    maintainers = with lib.maintainers; [ ftrvxmtrx sheenobu timokau ma27 ];
  };
 }
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
@ -8,13 +8,13 @@

 melpaBuild {
  pname = "ligo-mode";
-  version = "1.7.0-unstable-2024-08-14";
+  version = "1.7.0-unstable-2024-08-22";

  src = fetchFromGitLab {
    owner = "ligolang";
    repo = "ligo";
-    rev = "547da30202972fd9b5114ce82c4b94ddf6c8e8f7";
-    hash = "sha256-kGFV3Ci8F+vK1LCQCsdpxeoLHarfa4dItQkJDihE7eI=";
+    rev = "47128d41a9329356cbad40a982d8144da19a9218";
+    hash = "sha256-IrxPnbWrhqe3TxELsqa2y4NdcfEJMGUcGCdNuDG+rfs=";
  };

  files = ''("tools/emacs/ligo-mode.el")'';
--- a/pkgs/applications/editors/vim/plugins/get-plugins.nix
+++ b/pkgs/applications/editors/vim/plugins/get-plugins.nix
@ -1,19 +1,28 @@
-with import <localpkgs> {};
+with import <localpkgs> { };
 let
-  inherit (vimUtils.override {inherit vim;}) buildVimPlugin;
+  inherit (vimUtils.override { inherit vim; }) buildVimPlugin;
  inherit (neovimUtils) buildNeovimPlugin;

  generated = callPackage <localpkgs/pkgs/applications/editors/vim/plugins/generated.nix> {
    inherit buildNeovimPlugin buildVimPlugin;
-  } {} {};
-  hasChecksum = value:
-    lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
-  getChecksum = name: value:
-    if hasChecksum value then {
-      submodules = value.src.fetchSubmodules or false;
-      sha256 = value.src.outputHash;
-      rev = value.src.rev;
-    } else null;
+  } { } { };
+  hasChecksum =
+    value:
+    lib.isAttrs value
+    && lib.hasAttrByPath [
+      "src"
+      "outputHash"
+    ] value;
+  getChecksum =
+    name: value:
+    if hasChecksum value then
+      {
+        submodules = value.src.fetchSubmodules or false;
+        sha256 = value.src.outputHash;
+        rev = value.src.rev;
+      }
+    else
+      null;
  checksums = lib.mapAttrs getChecksum generated;
 in
-  lib.filterAttrs (n: v: v != null) checksums
+lib.filterAttrs (n: v: v != null) checksums
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -771,7 +771,7 @@ let
          downloadPage = "https://marketplace.visualstudio.com/items?itemName=bradgashler.htmltagwrap";
          homepage = "https://github.com/bgashler1/vscode-htmltagwrap";
          license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.superherointj ];
+          maintainers = [ ];
        };
      };

@ -2357,6 +2357,22 @@ let
        };
      };

+      huytd.nord-light = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "nord-light";
+          publisher = "huytd";
+          version = "0.1.1";
+          hash = "sha256-q2GG3j5j3CLGF02J7/plywKLkhUmm2Gn3MiSVmiZ+48=";
+        };
+        meta = {
+          description = "Light theme for VSCode based on the Nord color palette";
+          license = lib.licenses.mit;
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=huytd.nord-light";
+          homepage = "https://github.com/huytd/vscode-nord-light";
+          maintainers = [ lib.maintainers.Flameopathic ];
+        };
+      };
+
      ibm.output-colorizer = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "output-colorizer";
@ -2584,7 +2600,7 @@ let
          downloadPage = "https://marketplace.visualstudio.com/items?itemName=jeff-hykin.better-nix-syntax";
          homepage = "https://github.com/jeff-hykin/better-nix-syntax";
          license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.superherointj ];
+          maintainers = [ ];
        };
      };

@ -4285,7 +4301,7 @@ let
          downloadPage = "https://marketplace.visualstudio.com/items?itemName=signageos.signageos-vscode-sops";
          homepage = "https://github.com/signageos/vscode-sops";
          license = lib.licenses.unfree;
-          maintainers = [ lib.maintainers.superherointj ];
+          maintainers = [ ];
        };
      };

--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
    name = "tinymist";
    publisher = "myriad-dreamin";
    inherit (tinymist) version;
-    hash = "sha256-8+CPlLJnMwlemMH36xOjGvL/NapPSpyFerpxER07hOU=";
+    hash = "sha256-m5wq1F2sjiBacdyTFtLoqrJ/B6nwoaUjiNbc+zfpJoU=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/emulators/gens-gs/default.nix
+++ b/pkgs/applications/emulators/gens-gs/default.nix
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
    description = "Genesis/Mega Drive emulator";
    platforms = [ "i686-linux" ];
    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.eelco ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@ -57,7 +57,7 @@ in mkDerivation {
    homepage = "https://github.com/kmkolasinski/AwesomeBump";
    description = "Program to generate normal, height, specular or ambient occlusion textures from a single image";
    license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.eelco ];
+    maintainers = [ ];
    platforms = lib.platforms.linux;
    mainProgram = "AwesomeBump";
  };
--- a/pkgs/applications/kde/ktorrent.nix
+++ b/pkgs/applications/kde/ktorrent.nix
@ -11,7 +11,7 @@ mkDerivation {
    description = "KDE integrated BtTorrent client";
    homepage    = "https://apps.kde.org/ktorrent/";
    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ eelco ];
+    maintainers = [ ];
  };

  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
--- a/pkgs/applications/kde/libktorrent.nix
+++ b/pkgs/applications/kde/libktorrent.nix
@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation,
  extra-cmake-modules,
  karchive, kcrash, ki18n, kio, libgcrypt, qca-qt5, solid,
  boost, gmp
@ -7,10 +7,10 @@

 mkDerivation {
  pname = "libktorrent";
-  meta = with lib; {
+  meta = {
    description = "BitTorrent library used by KTorrent";
    homepage    = "https://apps.kde.org/ktorrent/";
-    maintainers = with maintainers; [ eelco ];
+    maintainers = [ ];
  };

  nativeBuildInputs = [ extra-cmake-modules ];
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@ -21,13 +21,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "albert";
-  version = "0.26.0";
+  version = "0.26.2";

  src = fetchFromGitHub {
    owner = "albertlauncher";
    repo = "albert";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-OdRx8fev0weXgSMEUhSm7aESN2W3BVnJpgtrlEUo+L0=";
+    hash = "sha256-jgSa1IvpMlwtpNT/SEysG28qaszV7gH6ZSqGrHQ/EC0=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/misc/ttdl/default.nix
+++ b/pkgs/applications/misc/ttdl/default.nix
@ -5,16 +5,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ttdl";
-  version = "4.4.0";
+  version = "4.4.1";

  src = fetchFromGitHub {
    owner = "VladimirMarkelov";
    repo = "ttdl";
    rev = "v${version}";
-    sha256 = "sha256-PZ1q360gkV+mB0pgkrUmViZqJRyrX8NkmFFZhqvFIPk=";
+    sha256 = "sha256-pcZ/8eM8JN+DKJKdVKJEl775QUXC4CFeMAaiBN0j+zo=";
  };

-  cargoHash = "sha256-9LoVtY9Okt2SUQLDMgM6V76OJBM4WU0sQioXHlNNzwU=";
+  cargoHash = "sha256-+caVo53gf7ZUMr0w/yoXfBaZ5MPe73s7vwoOdZVUcNY=";

  meta = with lib; {
    description = "CLI tool to manage todo lists in todo.txt format";
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "wego";
-  version = "2.2";
+  version = "2.3";

  src = fetchFromGitHub {
    owner = "schachmat";
    repo = pname;
    rev = version;
-    sha256 = "sha256-bkbH3RewlYYNamAhAZGWQmzNdGB06K3m/D8ScsQP9ic=";
+    sha256 = "sha256-YGUll0Wi/oulNMXSrSFeAVe+aGpyFeyXRZTW4ngC3Zk=";
  };

  vendorHash = "sha256-aXrXw/7ZtSZXIKDMZuWPV2zAf0e0lU0QCBhua7tHGEY=";
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@ -1,8 +1,7 @@
 {
  config,
  pkgs,
-  # zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980)
-  useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin),
+  useMupdf ? true,
 }:

 let
--- a/pkgs/applications/networking/browsers/floorp/default.nix
+++ b/pkgs/applications/networking/browsers/floorp/default.nix
@ -1,71 +1,86 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, buildMozillaMach
-, nixosTests
-, python311
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  buildMozillaMach,
+  nixosTests,
+  python311,
 }:

-((buildMozillaMach rec {
-  pname = "floorp";
-  packageVersion = "11.17.5";
-  applicationName = "Floorp";
-  binaryName = "floorp";
-  branding = "browser/branding/official";
-  requireSigning = false;
-  allowAddonSideload = true;
+(
+  (buildMozillaMach rec {
+    pname = "floorp";
+    packageVersion = "11.17.7";
+    applicationName = "Floorp";
+    binaryName = "floorp";
+    branding = "browser/branding/official";
+    requireSigning = false;
+    allowAddonSideload = true;

-  # Must match the contents of `browser/config/version.txt` in the source tree
-  version = "128.1.0";
+    # Must match the contents of `browser/config/version.txt` in the source tree
+    version = "128.2.0";

-  src = fetchFromGitHub {
-    owner = "Floorp-Projects";
-    repo = "Floorp";
-    fetchSubmodules = true;
-    rev = "v${packageVersion}";
-    hash = "sha256-8uONEMQI801c9txDa1ZmHQE8xQCViAJbTkxtgYRmUDE=";
-  };
+    src = fetchFromGitHub {
+      owner = "Floorp-Projects";
+      repo = "Floorp";
+      fetchSubmodules = true;
+      rev = "v${packageVersion}";
+      hash = "sha256-IAzPt696AWBEyfxR5U5/Isd6urPoi3fHshT+Fl+o/Bg=";
+    };

-  extraConfigureFlags = [
-    "--with-app-name=${pname}"
-    "--with-app-basename=${applicationName}"
-    "--with-unsigned-addon-scopes=app,system"
-    "--enable-proxy-bypass-protection"
-  ];
+    extraConfigureFlags = [
+      "--with-app-name=${pname}"
+      "--with-app-basename=${applicationName}"
+      "--with-unsigned-addon-scopes=app,system"
+      "--enable-proxy-bypass-protection"
+    ];

-  extraPostPatch = ''
-    # Fix .desktop files for PWAs generated by Floorp
-    # The executable path returned by Services.dirsvc.get() is absolute and
-    # thus is the full /nix/store/[..] path. To avoid breaking PWAs with each
-    # update, rely on `floorp` being in $PATH, as before.
-    substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \
-      --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' '"floorp"'
-  '';
+    extraPostPatch = ''
+      # Fix .desktop files for PWAs generated by Floorp
+      # The executable path returned by Services.dirsvc.get() is absolute and
+      # thus is the full /nix/store/[..] path. To avoid breaking PWAs with each
+      # update, rely on `floorp` being in $PATH, as before.
+      substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \
+        --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' '"floorp"'
+    '';

-  updateScript = ./update.sh;
+    updateScript = ./update.sh;

-  meta = {
-    description = "Fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan";
-    homepage = "https://floorp.app/";
-    maintainers = with lib.maintainers; [ christoph-heiss ];
-    platforms = lib.platforms.unix;
-    badPlatforms = lib.platforms.darwin;
-    broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
-                                           # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
-    maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
-    license = lib.licenses.mpl20;
-    mainProgram = "floorp";
-  };
-  tests = [ nixosTests.floorp ];
-}).override {
-  # Upstream build configuration can be found at
-  # .github/workflows/src/linux/shared/mozconfig_linux_base
-  privacySupport = true;
-  webrtcSupport = true;
-  enableOfficialBranding = false;
-  googleAPISupport = true;
-  mlsAPISupport = true;
-}).overrideAttrs (prev: {
-  MOZ_DATA_REPORTING = "";
-  MOZ_TELEMETRY_REPORTING = "";
-})
+    meta = {
+      description = "Fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan";
+      homepage = "https://floorp.app/";
+      maintainers = with lib.maintainers; [ christoph-heiss ];
+      platforms = lib.platforms.unix;
+      badPlatforms = lib.platforms.darwin;
+      broken = stdenv.buildPlatform.is32bit;
+      # since Firefox 60, build on 32-bit platforms fails with "out of memory".
+      # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
+      maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
+      license = lib.licenses.mpl20;
+      mainProgram = "floorp";
+    };
+    tests = [ nixosTests.floorp ];
+  }).override
+  {
+    # Upstream build configuration can be found at
+    # .github/workflows/src/linux/shared/mozconfig_linux_base
+    privacySupport = true;
+    webrtcSupport = true;
+    enableOfficialBranding = false;
+    googleAPISupport = true;
+    mlsAPISupport = true;
+  }
+).overrideAttrs
+  (prev: {
+    MOZ_DATA_REPORTING = "";
+    MOZ_TELEMETRY_REPORTING = "";
+
+    # Upstream already includes some of the bugfix patches that are applied by
+    # `buildMozillaMach`. Pick out only the relevant ones for Floorp and override
+    # the list here.
+    patches = [
+      ../firefox/env_var_for_system_dir-ff111.patch
+      ../firefox/no-buildconfig-ffx121.patch
+    ];
+  })
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@ -1,11 +1,11 @@
 {
-  "packageVersion": "129.0.1-1",
+  "packageVersion": "129.0.2-1",
  "source": {
-    "rev": "129.0.1-1",
-    "sha256": "0pvv3v23q31hdjvqi1f3cqfyjrb8dbrrbfwxj2wacak1g0mzbxf4"
+    "rev": "129.0.2-1",
+    "sha256": "1zghj91bqy2746x4x6cwn503dkw1fmfv0wgq02wv2cwlp8mmd7j7"
  },
  "firefox": {
-    "version": "129.0.1",
-    "sha512": "27c463e8277994c62bab85cf0e2f0cea16a9b272694b61fa56a6b3bd7c70d6481774288386094836a54df54c1b1144d61be67f4f5eac418c05479d452221c027"
+    "version": "129.0.2",
+    "sha512": "f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13"
  }
 }
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@ -24,7 +24,7 @@ let
  vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
  pname = "vivaldi";
-  version = "6.8.3381.53";
+  version = "6.8.3381.57";

  suffix = {
    aarch64-linux = "arm64";
@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
  src = fetchurl {
    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
    hash = {
-      aarch64-linux = "sha256-wcfEaUcl/FUhhrp977/xg5+dE+93vy8wn5x6m8qX1EU=";
-      x86_64-linux = "sha256-6WLGvd9Kp6fRG1HxMOjK4MhK4eoYjwEgYGJROI7lM2Y=";
+      aarch64-linux = "sha256-Tehc9T9+7NHaMYu7l7qB/09ips41rTx1VDCalUyO6Nw=";
+      x86_64-linux = "sha256-PC5fzMRIC2bW8xmPCG2nNIwwz0wha6+VDLAV1ihbQkM=";
    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
  };

--- a/pkgs/applications/networking/cluster/cilium/default.nix
+++ b/pkgs/applications/networking/cluster/cilium/default.nix
@ -42,7 +42,7 @@ buildGoModule rec {
    description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium";
    license = lib.licenses.asl20;
    homepage = "https://www.cilium.io/";
-    maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly superherointj ];
+    maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly ];
    mainProgram = "cilium";
  };
 }
--- a/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md
+++ b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md
@ -26,7 +26,7 @@ If you cause a regression (we've all been there), you are responsible for fixing

 To merge code, you need to be a committer, or use the merge-bot, but currently the merge-bot only works for packages located at `pkgs/by-name/`, which means, K3s still need to be migrated there before you can use merge-bot for merging. As a non-committer, once you have approved a PR you need to forward the request to a committer. For deciding which committer, give preference initially to K3s committers, but any committer can commit. A committer usually has a green approval in PRs.

-K3s's committers currently are: superherointj, marcusramberg, Mic92.
+K3s's committers currently are: marcusramberg, Mic92.

@euank is often silent but still active and has always handled anything dreadful, internal parts of K3s/Kubernetes or architecture things, he initially packaged K3s for nixpkgs, think of him as a last resort, when we fail to accomplish a fix, he comes to rescue us from ourselves.

--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "pachyderm";
-  version = "2.11.0";
+  version = "2.11.1";

  src = fetchFromGitHub {
    owner = "pachyderm";
    repo = "pachyderm";
    rev = "v${version}";
-    hash = "sha256-tr/1A3kOYvprybqE2Ma7AUr7gdDWZly1H38qKfPQVTk=";
+    hash = "sha256-dg93x73Lg0JGE/q67ae+ugLrVXDRftsZRLslaPryui8=";
  };

  vendorHash = "sha256-d2MSMucGMGGPLE0wh8Y27AUVPkeyOCkCa0JSPawYQmc=";
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@ -2,30 +2,30 @@
 let
  versions =
    if stdenv.isLinux then {
-      stable = "0.0.64";
-      ptb = "0.0.98";
-      canary = "0.0.465";
+      stable = "0.0.65";
+      ptb = "0.0.101";
+      canary = "0.0.475";
      development = "0.0.24";
    } else {
-      stable = "0.0.313";
-      ptb = "0.0.127";
-      canary = "0.0.574";
-      development = "0.0.45";
+      stable = "0.0.316";
+      ptb = "0.0.130";
+      canary = "0.0.583";
+      development = "0.0.46";
    };
  version = versions.${branch};
  srcs = rec {
    x86_64-linux = {
      stable = fetchurl {
        url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-tBopyhGRNDmtOWSwwiNnPJJm82sk3s76cUun7erHRbM=";
+        hash = "sha256-kzYLZcjuG7k8RSjc5ooDlMKaAlMHvm0yCl5Krnhqq8A=";
      };
      ptb = fetchurl {
        url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-aJx5ruZRCnBTf/Qon1uFfxMX2a25Xg2AzbnN/UtDe8w=";
+        hash = "sha256-JesxPoYybVLVwTrDwG2kO6Pikq7qvn7CO8j+24dwjBc=";
      };
      canary = fetchurl {
        url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-h4ULLPRhtGy6FZHKfj3AF0hjPhidVvJEbHOVgCh+6JQ=";
+        hash = "sha256-suVIDCZhI6DwUVizBmTm104Clr6pH/olAIbOMNzFNss=";
      };
      development = fetchurl {
        url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
@ -35,19 +35,19 @@ let
    x86_64-darwin = {
      stable = fetchurl {
        url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-eQLPtwSX24+DOxvQcS2tFOMI6HNYedycl/U5GnzR6w0=";
+        hash = "sha256-ZJ2ybvKGGCm8CZhwGxmLXZWNUD1eAyg17zD/sBwViB4=";
      };
      ptb = fetchurl {
        url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-Z2b4I8WzBaubb5oGEGpqC6VlVvObyQwKOH+mxCPMuMw=";
+        hash = "sha256-mLfeMx5dQNpoLUyoOSCj8XtNxWjsBpVWdFv1obtHJak=";
      };
      canary = fetchurl {
        url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-ZKjZf716RPOcXkZEFzvb4ojafafccVpjlLoEZv/GGec=";
+        hash = "sha256-eIjkXOW07sR26iBttT0mGDxNnpLFKlVJtzSAtFcicBg=";
      };
      development = fetchurl {
        url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
-        hash = "sha256-KvomKLcDnHyRSGwKDxwb5AZbJqMwKpvP4BC0Sn7IVsk=";
+        hash = "sha256-nMihtf/xLIxwqAVrF1BSRewdS2WThx0LZ5HZUI+OzM0=";
      };
    };
    aarch64-darwin = x86_64-darwin;
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
    homepage = "https://sylpheed.sraoss.jp/en/";
    description = "Lightweight and user-friendly e-mail client";
    mainProgram = "sylpheed";
-    maintainers = with maintainers; [ eelco ];
+    maintainers = [ ];
    platforms = platforms.linux ++ platforms.darwin;
    license = licenses.gpl2;
  };
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@ -21,7 +21,7 @@ let
      description = "Full-featured e-mail client";
      homepage = "https://thunderbird.net/";
      mainProgram = "thunderbird";
-      maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ];
+      maintainers = with maintainers; [ lovesegfault pierron vcunat ];
      platforms = platforms.unix;
      badPlatforms = platforms.darwin;
      broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
    description = "GTK-based Usenet newsreader good at both text and binaries";
    mainProgram = "pan";
    homepage = "http://pan.rebelbase.com/";
-    maintainers = [ maintainers.eelco ];
+    maintainers = [ ];
    platforms = platforms.linux;
    license = with licenses; [ gpl2Only fdl11Only ];
  };
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@ -26,18 +26,15 @@

 stdenv.mkDerivation rec {
  pname = "nextcloud-client";
-  # make sure an official release has been published on
-  # https://github.com/nextcloud-releases/desktop/releases and re-check the
-  # hash afterwards
-  version = "3.13.2";
+  version = "3.13.3";

  outputs = [ "out" "dev" ];

  src = fetchFromGitHub {
-    owner = "nextcloud";
+    owner = "nextcloud-releases";
    repo = "desktop";
    rev = "v${version}";
-    hash = "sha256-hZjmAdh9QQ2bAIYL3K7scl59kz9Wxnv9f6rKMeuKb7U=";
+    hash = "sha256-Z2/WllEiz/Yj/GyIczfA4L2+3Hr8Jmo7X2W/hP1PmwI=";
  };

  patches = [
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@ -561,8 +561,9 @@ in stdenv.mkDerivation (finalAttrs: {
  ];

  postInstall = optionalString (variant != "collabora") ''
-    mkdir -p $out/share/icons
+    mkdir -p $out/{include,share/icons}

+    cp -r include/LibreOfficeKit $out/include/
    cp -r sysui/desktop/icons/hicolor $out/share/icons

    # Rename icons for consistency
--- a/pkgs/applications/office/morgen/default.nix
+++ b/pkgs/applications/office/morgen/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  pname = "morgen";
-  version = "3.5.1";
+  version = "3.5.5";

  src = fetchurl {
    url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
-    hash = "sha256-YvgVCviqAuGlT61ANktztzqRYBtROsVrScGMxY6IeEs=";
+    hash = "sha256-xT/mV54L2tXiQnUR7K/h61FsHtF16siEExM/I0mSy+8=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/office/paperless-ngx/default.nix
+++ b/pkgs/applications/office/paperless-ngx/default.nix
@ -25,13 +25,13 @@
 }:

 let
-  version = "2.11.4";
+  version = "2.11.6";

  src = fetchFromGitHub {
    owner = "paperless-ngx";
    repo = "paperless-ngx";
    rev = "refs/tags/v${version}";
-    hash = "sha256-qqOTW7qgaZfNFYgVIDdwVh9KlT3Z6g8EALMOv39aRVc=";
+    hash = "sha256-RNX+KS2h9zrOK8QzeQWH55pkNPTDW4gic2HLG+XXLRg=";
  };

  # subpath installation is broken with uvicorn >= 0.26
@ -76,7 +76,7 @@ let
      cd src-ui
    '';

-    npmDepsHash = "sha256-dze03mkWMA2o3v3aoPTrDtUndTdP7Tk4gvFp4nq80po=";
+    npmDepsHash = "sha256-ML1Yp3JIMbRF6kVu190ReoY7oDUtUfNkHE7dHF6YUAE=";

    nativeBuildInputs = [
      pkg-config
@ -261,7 +261,7 @@ python.pkgs.buildPythonApplication rec {

  passthru = {
    inherit python path frontend tesseract5;
-    nltkData = with nltk-data; [ punkt snowball_data stopwords ];
+    nltkData = with nltk-data; [ punkt_tab snowball_data stopwords ];
    tests = { inherit (nixosTests) paperless; };
  };

@ -271,6 +271,6 @@ python.pkgs.buildPythonApplication rec {
    changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}";
    license = licenses.gpl3Only;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ lukegb gador erikarvstedt leona ];
+    maintainers = with maintainers; [ leona SuperSandro2000 erikarvstedt ];
  };
 }
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@ -1,18 +1,19 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, fetchpatch
-, cmake
-, pkg-config
-, makeWrapper
-, libusb-compat-0_1
-, ncurses
-, usePython ? false
-, python ? null
-, swig2
-, extraPackages ? [ ]
-, buildPackages
-, testers
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  pkg-config,
+  makeWrapper,
+  libusb-compat-0_1,
+  ncurses,
+  usePython ? false,
+  python ? null,
+  swig3,
+  extraPackages ? [ ],
+  buildPackages,
+  testers,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -39,21 +40,19 @@ stdenv.mkDerivation (finalAttrs: {
    pkg-config
    makeWrapper
  ];
-  buildInputs = [
-    libusb-compat-0_1
-    ncurses
-  ] ++ lib.optionals usePython [
-    python
-    swig2
-  ];
+  buildInputs =
+    [
+      libusb-compat-0_1
+      ncurses
+    ]
+    ++ lib.optionals usePython [
+      python
+      swig3
+    ];

-  propagatedBuildInputs = lib.optionals usePython [
-    python.pkgs.numpy
-  ];
+  propagatedBuildInputs = lib.optionals usePython [ python.pkgs.numpy ];

-  cmakeFlags = lib.optionals usePython [
-    "-DUSE_PYTHON_CONFIG=ON"
-  ];
+  cmakeFlags = lib.optionals usePython [ "-DUSE_PYTHON_CONFIG=ON" ];

  postFixup = lib.optionalString (extraPackages != [ ]) (
    # Join all plugins via symlinking
@ -62,12 +61,11 @@ stdenv.mkDerivation (finalAttrs: {
        ${buildPackages.xorg.lndir}/bin/lndir -silent ${pkg} $out
      ''))
      lib.concatStrings
-    ] + ''
+    ]
+    + ''
      # Needed for at least the remote plugin server
      for file in $out/bin/*; do
-          wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.escapeShellArg (
-            lib.makeSearchPath finalAttrs.passthru.searchPath extraPackages
-          )}
+          wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.escapeShellArg (lib.makeSearchPath finalAttrs.passthru.searchPath extraPackages)}
      done
    ''
  );
--- a/pkgs/applications/science/chemistry/cp2k/default.nix
+++ b/pkgs/applications/science/chemistry/cp2k/default.nix
@ -10,6 +10,10 @@
 , libint
 , libvori
 , libxc
+, dftd4
+, mctc-lib
+, mstore
+, multicharge
 , mpi
 , gsl
 , scalapack
@ -54,13 +58,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "cp2k";
-  version = "2024.1";
+  version = "2024.2";

  src = fetchFromGitHub {
    owner = "cp2k";
    repo = "cp2k";
    rev = "v${version}";
-    hash = "sha256-6PB6wjdTOa55dXV7QIsjxI77hhc95WFEjNePfupBUJQ=";
+    hash = "sha256-KXxqzapdPZggFlxX1rkNcxEYb2+aQIPFclFspxII7aE=";
    fetchSubmodules = true;
  };

@ -80,6 +84,10 @@ stdenv.mkDerivation rec {
    libint
    libvori
    libxc
+    dftd4
+    mctc-lib
+    mstore
+    multicharge
    libxsmm
    mpi
    spglib
@ -154,6 +162,7 @@ stdenv.mkDerivation rec {
                 -D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \
                 -D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"} \
                 -D__PLUMED2 -D__HDF5 -D__GSL -D__SIRIUS -D__LIBVDWXC -D__SPFFT -D__SPLA \
+                 -D__DFTD4 \
                 ${lib.strings.optionalString (gpuBackend == "cuda") "-D__OFFLOAD_CUDA -D__ACC -D__DBCSR_ACC -D__NO_OFFLOAD_PW"} \
                 ${lib.strings.optionalString (gpuBackend == "rocm") "-D__OFFLOAD_HIP -D__DBCSR_ACC -D__NO_OFFLOAD_PW"}
    CFLAGS    = -fopenmp
@ -165,6 +174,7 @@ stdenv.mkDerivation rec {
                 -I${lib.getDev libint}/include  \
                 -I${lib.getDev sirius}/include/sirius \
                 -I${lib.getDev libxc}/include \
+                 -I${lib.getDev dftd4}/include/dftd4 \
                 -I${lib.getDev libxsmm}/include \
                 -I${lib.getDev hdf5-fortran}/include \
                 -fallow-argument-mismatch
@ -176,6 +186,7 @@ stdenv.mkDerivation rec {
                 -fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"} \
                 -lz -ldl ${lib.optionalString (mpi.pname == "openmpi") "$(mpicxx --showme:link)"} \
                 -lplumed -lhdf5_fortran -lhdf5_hl -lhdf5 -lgsl -lsirius -lspla -lspfft -lvdwxc \
+                 -ldftd4 -lmstore -lmulticharge -lmctc-lib \
                 ${lib.strings.optionalString (gpuBackend == "cuda") ''
                   -L${cudaPackages.cuda_cudart}/lib/stubs/ \
                   -lcudart -lnvrtc -lcuda -lcublas
--- a/pkgs/applications/science/math/cbc/default.nix
+++ b/pkgs/applications/science/math/cbc/default.nix
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "https://projects.coin-or.org/Cbc";
    license = lib.licenses.epl10;
-    maintainers = [ lib.maintainers.eelco ];
+    maintainers = [ ];
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
    description = "Mixed integer programming solver";
  };
--- a/pkgs/applications/science/math/eigenmath/default.nix
+++ b/pkgs/applications/science/math/eigenmath/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "eigenmath";
-  version = "3.27-unstable-2024-06-20";
+  version = "3.27-unstable-2024-08-24";

  src = fetchFromGitHub {
    owner = "georgeweigt";
    repo = pname;
-    rev = "c3e3da104dbef888c3e52659134d5e9bdc12764d";
-    hash = "sha256-fqCphnRQw79v7ZTCZU9ucm/R7BKY7yCZYDSnxD7uRS8=";
+    rev = "92ae1a3f9c9f6808f3faefa10ae66c0ff480dab2";
+    hash = "sha256-AHZ9p7yyYENHywNppsSTfaM3KFqpX5ehxfjPwocHv5Q=";
  };

  checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
--- a/pkgs/applications/terminal-emulators/iterm2/default.nix
+++ b/pkgs/applications/terminal-emulators/iterm2/default.nix
@ -11,11 +11,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "iterm2";
-  version = "3.5.2";
+  version = "3.5.4";

  src = fetchzip {
    url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
-    hash = "sha256-WiRRxklI3A/3MtJY63jAkUVe8qa5jfRACzUESfwAmmw=";
+    hash = "sha256-Sxj8OnaXh+UdAAf2hoHBQ8TuczYykhV37XvalNpwq7U=";
  };

  dontFixup = true;
--- a/pkgs/applications/version-management/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
@ -10,13 +10,13 @@

 buildPythonApplication rec {
  pname = "git-machete";
-  version = "3.28.0";
+  version = "3.29.0";

  src = fetchFromGitHub {
    owner = "virtuslab";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-INGJYUq5sW6er27kBjtz6BOWhnEtdnRuZgLnfEpO1uE=";
+    hash = "sha256-QEZF6bCNAXvGTC1KUMRyhIfgUBh4wjgfuoiBEG7jKFE=";
  };

  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@ -92,7 +92,7 @@ let
      downloadPage = "https://www.mercurial-scm.org/release/";
      changelog = "https://wiki.mercurial-scm.org/Release${versions.majorMinor version}";
      license = licenses.gpl2Plus;
-      maintainers = with maintainers; [ eelco lukegb pacien techknowlogick ];
+      maintainers = with maintainers; [ lukegb pacien techknowlogick ];
      platforms = platforms.unix;
      mainProgram = "hg";
    };
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
      '';

    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ eelco ];
+    maintainers = [ ];
    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/applications/version-management/stgit/default.nix
+++ b/pkgs/applications/version-management/stgit/default.nix
@ -18,15 +18,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "stgit";
-  version = "2.4.10";
+  version = "2.4.11";

  src = fetchFromGitHub {
    owner = "stacked-git";
    repo = "stgit";
    rev = "v${version}";
-    hash = "sha256-3z0MwqE7+jEuWK1/OUGDolUWzi9soKWvVtlhyA9zJEA=";
+    hash = "sha256-wmBbcK6oImIlgbJ1gMkCVPBLaHUUeN2y9szx8age7mo=";
  };
-  cargoHash = "sha256-9cfgKOIxnh1YLeUVLFnRQz6PqeLrz/6Sc2QybCXo6/w=";
+  cargoHash = "sha256-hw5pXmwcoi76XwPFdfQoai8S6ApDit48nVuII4ksCRM=";

  nativeBuildInputs = [
    pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@ -115,7 +115,7 @@ let
      license = licenses.asl20;
      homepage = "https://subversion.apache.org/";
      mainProgram = "svn";
-      maintainers = with maintainers; [ eelco lovek323 ];
+      maintainers = with maintainers; [ lovek323 ];
      platforms = platforms.linux ++ platforms.darwin;
    };

--- a/pkgs/applications/video/kodi/addons/youtube/default.nix
+++ b/pkgs/applications/video/kodi/addons/youtube/default.nix
@ -3,13 +3,13 @@
 buildKodiAddon rec {
  pname = "youtube";
  namespace = "plugin.video.youtube";
-  version = "7.0.8";
+  version = "7.0.9";

  src = fetchFromGitHub {
    owner = "anxdpanic";
    repo = "plugin.video.youtube";
    rev = "v${version}";
-    hash = "sha256-cWqAHC3UYDWk0cL/to9kCdH+SSN3ra+Ni6HTwposNkg=";
+    hash = "sha256-C2Xnz4V+jSwkBbroysG5ruidwdeE3V+NutQxW3Nfh6Y=";
  };

  propagatedBuildInputs = [
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
    description = "Movie player that supports many video formats";
    homepage = "http://mplayerhq.hu";
    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ eelco ];
+    maintainers = [ ];
    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];
  };
 }
--- a/pkgs/applications/video/mpv/scripts/default.nix
+++ b/pkgs/applications/video/mpv/scripts/default.nix
@ -111,6 +111,7 @@ let
      modernx-zydezu = callPackage ./modernx-zydezu.nix { };
      mpris = callPackage ./mpris.nix { };
      mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { };
+      mpv-discord = callPackage ./mpv-discord.nix { };
      mpv-notify-send = callPackage ./mpv-notify-send.nix { };
      mpv-osc-modern = callPackage ./mpv-osc-modern.nix { };
      mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { };
--- a/pkgs/applications/video/mpv/scripts/mpv-discord.nix
+++ b/pkgs/applications/video/mpv/scripts/mpv-discord.nix
@ -0,0 +1,44 @@
+{
+  fetchFromGitHub,
+  buildGoModule,
+  buildLua,
+  lib,
+}:
+let
+  version = "1.6.1";
+
+  src = fetchFromGitHub {
+    owner = "tnychn";
+    repo = "mpv-discord";
+    rev = "v${version}";
+    hash = "sha256-P1UaXGboOiqrXapfLzJI6IT3esNtflkQkcNXt4Umukc=";
+  };
+
+  core = buildGoModule {
+    name = "mpv-discord-core";
+    inherit version;
+
+    src = "${src}/mpv-discord";
+
+    vendorHash = "sha256-xe1jyWFQUD+Z4qBAVQ0SBY0gdxmi5XG9t29n3f/WKDs=";
+  };
+in
+buildLua {
+  pname = "mpv-discord";
+  inherit version src;
+
+  scriptPath = "scripts/discord.lua";
+
+  postInstall = ''
+    substituteInPlace $out/share/mpv/scripts/discord.lua \
+      --replace-fail 'binary_path = ""' 'binary_path = "${core}/bin/mpv-discord"'
+  '';
+
+  meta = {
+    description = "Cross-platform Discord Rich Presence integration for mpv with no external dependencies";
+    homepage = "https://github.com/tnychn/mpv-discord";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ bddvlpr ];
+  };
+}
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@ -296,7 +296,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://www.qemu.org/";
    description = "Generic and open source machine emulator and virtualizer";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ eelco qyliss ];
+    maintainers = with maintainers; [ qyliss ];
    platforms = platforms.unix;
  }
  # toolsOnly: Does not have qemu-kvm and there's no main support tool
--- a/pkgs/applications/virtualization/vmware-workstation/default.nix
+++ b/pkgs/applications/virtualization/vmware-workstation/default.nix
@ -79,20 +79,6 @@ let
    sha256 = "sha256-JSEW1gqQuLGRkathlwZU/TnG6dL/xWKW4//SfE+kO0A=";
  };

-  gdbm3 = gdbm.overrideAttrs (old: rec {
-    version = "1.8.3";
-
-    src = fetchurl {
-      url = "mirror://gnu/gdbm/gdbm-${version}.tar.gz";
-      sha256 = "sha256-zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck=";
-    };
-
-    installPhase = ''
-      mkdir -p $out/lib
-      cp .libs/libgdbm*.so* $out/lib/
-    '';
-  });
-
  vmware-unpack-env = buildFHSEnv rec {
    name = "vmware-unpack-env";
    targetPkgs = pkgs: [ zlib ];
@ -114,7 +100,7 @@ stdenv.mkDerivation rec {
    libxslt
    libxml2
    libuuid
-    gdbm3
+    gdbm
    readline
    xz
    cups
--- a/pkgs/build-support/trivial-builders/test/references/apath.txt
+++ b/pkgs/build-support/trivial-builders/test/references/apath.txt
@ -0,0 +1 @@
+Just some text
--- a/pkgs/build-support/trivial-builders/test/references/samples.nix
+++ b/pkgs/build-support/trivial-builders/test/references/samples.nix
@ -18,8 +18,8 @@
  norefsDup = writeText "hi" "hello";
  helloRef = writeText "hi" "hello ${hello}";
  helloRefDup = writeText "hi" "hello ${hello}";
-  path = ./samples.nix;
-  pathLike.outPath = ./samples.nix;
+  path = ./apath.txt;
+  pathLike.outPath = ./apath.txt;
  helloFigletRef = writeText "hi" "hello ${hello} ${figlet}";
  selfRef = runCommand "self-ref-1" { } "echo $out >$out";
  selfRef2 = runCommand "self-ref-2" { } ''echo "${figlet}, $out" >$out'';
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@ -310,7 +310,7 @@ rec {
  #   writeBash "example"
  #     {
  #       makeWrapperArgs = [
-  #         "--prefix" "PATH" ":" "${pkgs.hello}/bin"
+  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
  #       ];
  #     }
  #     ''
@ -336,7 +336,7 @@ rec {
  #  writeBashBin "example"
  #    {
  #      makeWrapperArgs = [
-  #        "--prefix", "PATH", ":", "${pkgs.hello}/bin",
+  #        "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
  #      ];
  #    }
  #    ''
@ -357,7 +357,7 @@ rec {
  #   writeDash "example"
  #     {
  #       makeWrapperArgs = [
-  #         "--prefix", "PATH", ":", "${pkgs.hello}/bin",
+  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
  #       ];
  #     }
  #     ''
@ -383,7 +383,7 @@ rec {
  #  writeDashBin "example"
  #    {
  #      makeWrapperArgs = [
-  #        "--prefix", "PATH", ":", "${pkgs.hello}/bin",
+  #        "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
  #      ];
  #    }
  #    ''
@ -404,7 +404,7 @@ rec {
  #   writeFish "example"
  #     {
  #       makeWrapperArgs = [
-  #         "--prefix", "PATH", ":", "${pkgs.hello}/bin",
+  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
  #       ];
  #     }
  #     ''
@ -439,7 +439,7 @@ rec {
  #   writeFishBin "example"
  #     {
  #       makeWrapperArgs = [
-  #         "--prefix", "PATH", ":", "${pkgs.hello}/bin",
+  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
  #       ];
  #     }
  #     ''
@ -496,7 +496,7 @@ rec {
  #   writeNu "example"
  #     {
  #       makeWrapperArgs = [
-  #         "--prefix", "PATH", ":", "${pkgs.hello}/bin",
+  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
  #       ];
  #     }
  #     ''
@ -524,7 +524,7 @@ rec {
  #   writeNuBin "example"
  #     {
  #       makeWrapperArgs = [
-  #         "--prefix", "PATH", ":", "${pkgs.hello}/bin",
+  #         "--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
  #       ];
  #     }
  #    ''
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@ -20,17 +20,17 @@

 buildGoModule rec {
  pname = "aaaaxy";
-  version = "1.5.173";
+  version = "1.5.183";

  src = fetchFromGitHub {
    owner = "divVerent";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-tCA4mmNbRCn48lN5U+x4mnHEsLbMf5jBDOU/jnRFkvE=";
+    hash = "sha256-uXu9z4J3ufe7thXsAGWGTSgb8LVPboM7CSTNf7NBw1Q=";
    fetchSubmodules = true;
  };

-  vendorHash = "sha256-4zQJUw0CQci/BPfo8V2LzuFc6MDQMXf06RCrqxg1G/c=";
+  vendorHash = "sha256-Z52g/ZSIYjHt8bjeAnQidkFyprJOO/IkNcrSFcKcv30=";

  buildInputs = [
    alsa-lib
--- a/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix
+++ b/pkgs/by-name/ad/adwaita-icon-theme-legacy/package.nix
@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  meson,
+  ninja,
+  gtk4,
+  gnome,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "adwaita-icon-theme-legacy";
+  version = "46.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/adwaita-icon-theme-legacy/${lib.versions.major finalAttrs.version}/adwaita-icon-theme-legacy-${finalAttrs.version}.tar.xz";
+    hash = "sha256-VISA9YWJpUty0Ygzt1WxX/vVZ+MYcknXTi4fj5nyL7Q=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    gtk4 # for gtk4-update-icon-cache
+  ];
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = "adwaita-icon-theme-legacy";
+    };
+  };
+
+  meta = with lib; {
+    description = "Fullcolor icon theme providing fallback for legacy apps";
+    homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy";
+    license = licenses.cc-by-sa-30;
+    maintainers = teams.gnome.members;
+    platforms = platforms.all;
+  };
+})
--- a/pkgs/by-name/al/alvr/package.nix
+++ b/pkgs/by-name/al/alvr/package.nix
@ -18,7 +18,7 @@ appimageTools.wrapType2 {
  extraInstallCommands = ''
    install -Dm444 ${appimageContents}/alvr.desktop -t $out/share/applications
    substituteInPlace $out/share/applications/alvr.desktop \
-      --replace 'Exec=alvr_dashboard' 'Exec=alvr'
+      --replace-fail 'Exec=alvr_dashboard' 'Exec=alvr'
    cp -r ${appimageContents}/usr/share/icons $out/share
  '';

--- a/pkgs/by-name/ap/application-title-bar/package.nix
+++ b/pkgs/by-name/ap/application-title-bar/package.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "application-title-bar";
-  version = "0.7.0";
+  version = "0.7.2";

  src = fetchFromGitHub {
    owner = "antroids";
    repo = "application-title-bar";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-4eSlhrh40L/32N7P7Q3/qqj8BlUQuDKqpuKGNwimeDU=";
+    hash = "sha256-0tSwjyKPVyOR0VJi1qqMFf/yVmWFmyue0xaNp9pYxDo=";
  };

  propagatedUserEnvPkgs = with kdePackages; [ kconfig ];
--- a/pkgs/by-name/ba/babeltrace/package.nix
+++ b/pkgs/by-name/ba/babeltrace/package.nix
@ -11,7 +11,7 @@
  elfutils,
  enablePython ? false,
  pythonPackages ? null,
-  swig2,
+  swig4,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
      pkg-config
    ]
    ++ lib.optionals enablePython [
-      swig2
+      swig4
      pythonPackages.setuptools
    ];
  buildInputs = [
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
    hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo=";
  };
  prePatch = ''
-    substituteInPlace cmake/FindGTK3.cmake --replace GTK3_CFLAGS_OTHER ""
+    substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER ""
  '' + lib.optionalString (!dbusSupport) ''
-    substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""
+    substituteInPlace cmake/modules.cmake --replace-fail 'list(APPEND MODULES ctrl_dbus)' ""
  '';
  nativeBuildInputs = [ cmake pkg-config ];
  buildInputs = [
--- a/pkgs/by-name/be/betterdiscordctl/package.nix
+++ b/pkgs/by-name/be/betterdiscordctl/package.nix
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {

  postPatch = ''
    substituteInPlace betterdiscordctl \
-      --replace "DISABLE_SELF_UPGRADE=" "DISABLE_SELF_UPGRADE=yes"
+      --replace-fail "DISABLE_SELF_UPGRADE=" "DISABLE_SELF_UPGRADE=yes"
  '';

  installPhase = ''
--- a/pkgs/by-name/bi/bitrise/package.nix
+++ b/pkgs/by-name/bi/bitrise/package.nix
@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
  pname = "bitrise";
-  version = "2.19.0";
+  version = "2.20.0";

  src = fetchFromGitHub {
    owner = "bitrise-io";
    repo = "bitrise";
    rev = version;
-    hash = "sha256-VjuDeRl/rqA7bdhn9REdxdjRon5WxHkFIveOYNpQqa8=";
+    hash = "sha256-kwM3TqXxkVq45oN9T+G7wmsBMdIJ/FN6ZoUysoM5PNY=";
  };

  # many tests rely on writable $HOME/.bitrise and require network access
--- a/pkgs/by-name/bl/blastem/package.nix
+++ b/pkgs/by-name/bl/blastem/package.nix
@ -12,12 +12,12 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "blastem";
-  version = "0.6.2-unstable-2024-03-31";
+  version = "0.6.2-unstable-2024-08-14";

  src = fetchhg {
    url = "https://www.retrodev.com/repos/blastem";
-    rev = "48ab1e3e5df5";
-    hash = "sha256-UZl5fIE7LJqxwS8kFJ3xr8BJyHF60dnRNeA5k7lAuxg=";
+    rev = "aa888682faa0";
+    hash = "sha256-0xw9O0o1pkJiXHyZer4nMJeLlRXS3Z4YYoLgfkrz3Yo=";
  };

  # will probably be fixed in https://github.com/NixOS/nixpkgs/pull/302481
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@ -48,10 +48,6 @@ rustPlatform.buildRustPackage rec {
    };
  };

-  postPatch = ''
-    substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
-  '';
-
  nativeBuildInputs = [ just pkg-config util-linuxMinimal ];
  buildInputs = [ dbus glib libinput libxkbcommon pulseaudio wayland udev ];

--- a/pkgs/by-name/co/cosmic-session/Cargo.lock
+++ b/pkgs/by-name/co/cosmic-session/Cargo.lock
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@ -11,38 +11,34 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "cosmic-session";
-  version = "0-unstable-2024-01-17";
+  version = "1.0.0-alpha.1";

  src = fetchFromGitHub {
    owner = "pop-os";
-    repo = pname;
-    rev = "8e73c0f6940288c4a24a102a7ba9f20eb6bd754f";
-    sha256 = "sha256-plglQ9i+kcG70v9ElCzwNMhO1xcuEAQiO0DeZfRjbcg=";
+    repo = "cosmic-session";
+    rev = "epoch-${version}";
+    sha256 = "sha256-5zfEBNsMxtKPJZcGYZth/SoXrsg0gpug15VR5fPbvt0=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "cosmic-notifications-util-0.1.0" = "sha256-GmTT7SFBqReBMe4GcNSym1YhsKtFQ/0hrDcwUqXkaBw=";
-      "launch-pad-0.1.0" = "sha256-tnbSJ/GP9GTnLnikJmvb9XrJSgnUnWjadABHF43L1zc=";
+      "launch-pad-0.1.0" = "sha256-c+uawTQlg5SW8x7DOBG2Idv/AfIaCFNtLQLUz8ifT2I=";
    };
  };

  postPatch = ''
    substituteInPlace Justfile \
-        --replace '#!/usr/bin/env' "#!$(command -v env)" \
-        --replace 'target/release/cosmic-session' "target/${
-          rust.lib.toRustTargetSpecShort stdenv.hostPlatform
-        }/release/cosmic-session"
+      --replace-fail '{{cargo-target-dir}}/release/cosmic-session' 'target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-session'
    substituteInPlace data/start-cosmic \
-        --replace '#!/bin/bash' "#!${lib.getBin bash}/bin/bash" \
-        --replace '/usr/bin/cosmic-session' "$out/bin/cosmic-session" \
-        --replace '/usr/bin/dbus-run-session' "${
-          lib.getBin dbus
-        }/bin/dbus-run-session"
-    substituteInPlace data/cosmic.desktop --replace '/usr/bin/start-cosmic' "$out/bin/start-cosmic"
+      --replace-fail '/usr/bin/cosmic-session' "${placeholder "out"}/bin/cosmic-session" \
+      --replace-fail '/usr/bin/dbus-run-session' "${lib.getBin dbus}/bin/dbus-run-session"
+    substituteInPlace data/cosmic.desktop \
+      --replace-fail '/usr/bin/start-cosmic' "${placeholder "out"}/bin/start-cosmic"
  '';

+  buildInputs = [ bash ];
  nativeBuildInputs = [ just ];

  dontUseJustBuild = true;
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [

 rustPlatform.buildRustPackage rec {
  pname = "diesel-cli";
-  version = "2.2.1";
+  version = "2.2.3";

  src = fetchCrate {
    inherit version;
    crateName = "diesel_cli";
-    hash = "sha256-B+AHTJgOBUGVc4J2VcwuqVwAbm0wpsFHc9+gc5g2RAM=";
+    hash = "sha256-pv75bvswi+JfeL7B8GPaQgXyNdNvzNgXs9VYgzKRn2U=";
  };

-  cargoHash = "sha256-HFhkePq2fZ7MxZfH0jLlS5B10jqf15+RUcGZnDbML5Q=";
+  cargoHash = "sha256-BMMh4BEoB1UhavoiQWfFhsSZsvfFSfEJhEewjA1ukLQ=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/by-name/di/dippi/package.nix
+++ b/pkgs/by-name/di/dippi/package.nix
@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  glib,
+  gtk4,
+  libadwaita,
+  wrapGAppsHook4,
+  appstream-glib,
+  desktop-file-utils,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "dippi";
+  version = "4.1.0";
+
+  src = fetchFromGitHub {
+    owner = "cassidyjames";
+    repo = "dippi";
+    rev = version;
+    hash = "sha256-BYI3WqMDxzERlqtq7ISQ+U1FTrpKh5OJBMo/AsdmdlQ=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    vala
+    pkg-config
+    wrapGAppsHook4
+    appstream-glib
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+  ];
+
+  meta = {
+    description = "Calculate display info like DPI and aspect ratio";
+    homepage = "https://github.com/cassidyjames/dippi";
+    mainProgram = "com.github.cassidyjames.dippi";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ zendo ];
+  };
+}
--- a/pkgs/by-name/fa/fail2ban/package.nix
+++ b/pkgs/by-name/fa/fail2ban/package.nix
@ -94,6 +94,6 @@ python3.pkgs.buildPythonApplication rec {
    homepage = "https://www.fail2ban.org/";
    description = "Program that scans log files for repeated failing login attempts and bans IP addresses";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ eelco lovek323 ];
+    maintainers = with maintainers; [ lovek323 ];
  };
 }
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@ -10,7 +10,7 @@
  ddcutil,
  glib,
  hwdata,
-  imagemagick_light,
+  imagemagick,
  libXrandr,
  libdrm,
  libglvnd,
@ -47,13 +47,13 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
  pname = "fastfetch";
-  version = "2.21.3";
+  version = "2.22.0";

  src = fetchFromGitHub {
    owner = "fastfetch-cli";
    repo = "fastfetch";
    rev = finalAttrs.version;
-    hash = "sha256-AnURAH5tSIwmbLtB7FjjrOODGxrXbMOIqVjIBwOU+lo=";
+    hash = "sha256-ncaBMSV7n4RVA2376ExBv+a8bzuvuMttv3GlNaOH23k=";
  };

  outputs = [
@ -71,7 +71,7 @@ stdenv'.mkDerivation (finalAttrs: {
  buildInputs =
    [
      chafa
-      imagemagick_light
+      imagemagick
      pcre
      pcre2
      sqlite
--- a/pkgs/by-name/fl/flashprog/package.nix
+++ b/pkgs/by-name/fl/flashprog/package.nix
@ -14,12 +14,12 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "flashprog";
-  version = "1.1";
+  version = "1.2";

  src = fetchgit {
    url = "https://review.sourcearcade.org/flashprog";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-CLwaGxVOo8FJaWfvrJ2hAm7XonP5nHT6YTsaw7scKCM=";
+    hash = "sha256-Z09hZ4a/G3DhWCmSkPyKs7ecSFBUfez7IWWxIhH3LyI=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/fl/flatpak/package.nix
+++ b/pkgs/by-name/fl/flatpak/package.nix
@ -7,6 +7,7 @@
  autoreconfHook,
  bison,
  bubblewrap,
+  buildPackages,
  bzip2,
  coreutils,
  curl,
@ -40,6 +41,7 @@
  p11-kit,
  pkg-config,
  polkit,
+  pkgsCross,
  python3,
  shared-mime-info,
  socat,
@ -205,8 +207,12 @@ stdenv.mkDerivation (finalAttrs: {
      PATH=${lib.makeBinPath [ vsc-py ]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler

      substituteInPlace configure.ac \
-        --replace-fail '$BWRAP --version' 'echo ${bubblewrap.version}' \
-        --replace-fail '$DBUS_PROXY --version' 'echo ${xdg-dbus-proxy.version}'
+        --replace-fail '$BWRAP --' ${
+          lib.escapeShellArg (stdenv.hostPlatform.emulator buildPackages + " $BWRAP --")
+        } \
+        --replace-fail '$DBUS_PROXY --' ${
+          lib.escapeShellArg (stdenv.hostPlatform.emulator buildPackages + " $DBUS_PROXY --")
+        }
    '';

  passthru = {
@ -218,6 +224,8 @@ stdenv.mkDerivation (finalAttrs: {
    updateScript = nix-update-script { };

    tests = {
+      cross = pkgsCross.aarch64-multiplatform.flatpak;
+
      installedTests = nixosTests.installed-tests.flatpak;

      validate-icon = runCommand "test-icon-validation" { } ''
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@ -81,7 +81,6 @@ buildGoModule rec {
    maintainers = with lib.maintainers; [
      bryanasdev000
      jlesquembre
-      superherointj
    ];
    mainProgram = "flux";
  };
--- a/pkgs/by-name/fy/fyne/package.nix
+++ b/pkgs/by-name/fy/fyne/package.nix
@ -17,16 +17,16 @@

 buildGoModule rec {
  pname = "fyne";
-  version = "2.5.0";
+  version = "2.5.1";

  src = fetchFromGitHub {
    owner = "fyne-io";
    repo = "fyne";
    rev = "refs/tags/v${version}";
-    hash = "sha256-DUXCaPFMb6f7ROI8DC2RVCX12xf5F9MEtBJyi8CuoE4=";
+    hash = "sha256-21/52Uub5+l0TcuWZ9QSyckgR1kKNfDvro1CF5QuZWA=";
  };

-  vendorHash = "sha256-Mz+p2kpPtqFb/wDkwOdIUQ2fCvzWqTH49YRjWmSlF4M=";
+  vendorHash = "sha256-+g11BRf9xRXjtF8InzdTHGOGOf8lJgLKEdBR5DcpEmo=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/ge/getmail6/package.nix
+++ b/pkgs/by-name/ge/getmail6/package.nix
@ -5,14 +5,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "getmail6";
-  version = "6.19.03";
+  version = "6.19.04";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "getmail6";
    repo = "getmail6";
    rev = "refs/tags/v${version}";
-    hash = "sha256-BBsQ3u8CL3Aom+hqjeOErOBtWB8imU2PGgzP8+dq4mM=";
+    hash = "sha256-mKYAk3rXWBMgyxXenVRTGXIUG6ruz5/CxLmh8rpinfI=";
  };

  build-system = with python3.pkgs; [
--- a/pkgs/by-name/gn/gnome-notes/package.nix
+++ b/pkgs/by-name/gn/gnome-notes/package.nix
@ -82,7 +82,10 @@ stdenv.mkDerivation rec {
  mesonFlags = [ "-Dupdate_mimedb=false" ];

  passthru = {
-    updateScript = gnome.updateScript { packageName = "bijiben"; };
+    updateScript = gnome.updateScript {
+      packageName = "bijiben";
+      attrPath = "gnome-notes";
+    };
  };

  meta = with lib; {
--- a/pkgs/by-name/go/godot_4/package.nix
+++ b/pkgs/by-name/go/godot_4/package.nix
@ -192,7 +192,6 @@ stdenv.mkDerivation rec {
    ];
    maintainers = with lib.maintainers; [
      shiryel
-      superherointj
    ];
    mainProgram = "godot4";
  };
--- a/pkgs/by-name/go/goflow2/package.nix
+++ b/pkgs/by-name/go/goflow2/package.nix
@ -4,7 +4,7 @@
  fetchFromGitHub,
 }:
 let
-  version = "2.2.0";
+  version = "2.2.1";
 in
 buildGoModule {
  pname = "goflow2";
@ -14,7 +14,7 @@ buildGoModule {
    owner = "netsampler";
    repo = "goflow2";
    rev = "v${version}";
-    hash = "sha256-kqoHYNuyzT1gsBR00KuMe/+D0YT3ZvXOvoceWGKg7G8=";
+    hash = "sha256-u2wdlmAwRqBPKD+aof34ud9O4aJ+4ccuMxyk8Cgpsp0=";
  };

  ldflags = [
--- a/pkgs/by-name/gr/graphite-cli/package-lock.json
+++ b/pkgs/by-name/gr/graphite-cli/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "@withgraphite/graphite-cli",
-  "version": "1.4.2",
+  "version": "1.4.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@withgraphite/graphite-cli",
-      "version": "1.4.2",
+      "version": "1.4.3",
      "hasInstallScript": true,
      "license": "None",
      "dependencies": {
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@ -7,14 +7,14 @@

 buildNpmPackage rec {
  pname = "graphite-cli";
-  version = "1.4.2";
+  version = "1.4.3";

  src = fetchurl {
    url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
-    hash = "sha256-bh5BSpzmxSMgr1wKOCrOTQSpsSdgaVtBcw9jiE4IzI8=";
+    hash = "sha256-ITROAsDlkNJx5z1DN41Y3kOQzlm2CmciPVn9IrtjCQc=";
  };

-  npmDepsHash = "sha256-gluPxs1NPVjv5K64FtED7b4zWmOXufVquuBHqz1JUzU=";
+  npmDepsHash = "sha256-G2J0yu/loihlrgGSMEJmVK496bVwJehLwYAPh0f8UbM=";

  postPatch = ''
    ln -s ${./package-lock.json} package-lock.json
--- a/pkgs/by-name/hc/hclfmt/package.nix
+++ b/pkgs/by-name/hc/hclfmt/package.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "hclfmt";
-  version = "2.21.0";
+  version = "2.22.0";

  src = fetchFromGitHub {
    owner = "hashicorp";
    repo = "hcl";
    rev = "v${version}";
-    hash = "sha256-izbctn5OqaDunQLovgCGTgqMzC9i227zXlXUNCEExvA=";
+    hash = "sha256-jIW2r8RWNbk4maWKeUSe1Kqll5jJYe72UCP2EEGfRYg=";
  };

  vendorHash = "sha256-F2i7ph9GL9Xo43da6jHPn9P9FdWC6eSgqCyHPBxdFJY=";
--- a/pkgs/by-name/he/hello/package.nix
+++ b/pkgs/by-name/he/hello/package.nix
@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://www.gnu.org/software/hello/manual/";
    changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}";
    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.eelco ];
+    maintainers = [ ];
    mainProgram = "hello";
    platforms = platforms.all;
  };
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@ -5,10 +5,10 @@
 }:
 let
  pname = "heptabase";
-  version = "1.35.3";
+  version = "1.35.4";
  src = fetchurl {
    url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-2HEBQI+C/LKrIUb+6qNmm+xjvTOxS+vk5WTsOZKz3+s=";
+    hash = "sha256-JFIC5a0W8pmiPxgkymE8d+iULM80U85xGOF0M2vu/PI=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };
--- a/pkgs/by-name/i2/i2p/package.nix
+++ b/pkgs/by-name/i2/i2p/package.nix
@ -13,7 +13,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "i2p";
-  version = "2.6.0";
+  version = "2.6.1";

  src = fetchzip {
    urls = [
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
      "https://files.i2p-projekt.de/"
      "https://download.i2p2.no/releases/"
    ]);
-    hash = "sha256-9f4L1JRDTT+sBCEI/GIM9q2u1VJuiZi7DI9qgJMftd0=";
+    hash = "sha256-ntjTXdpgcTReEVxzDEoq9r3NAqS7q4m+rlJXp7is1k0=";
  };

  strictDeps = true;
--- a/Show More
+++ b/Show More