Merge master into staging-next

2024-09-21 18:03:54 +00:00 · 2024-09-21 18:03:54 +00:00 · f2c1ad7ad5
commit f2c1ad7ad5
parent cbe6d18c73 3c8525a3b7
79 changed files with 1360 additions and 391 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -18080,6 +18080,12 @@
    githubId = 17805516;
    name = "Rohan Rao";
  };
+  rolfschr = {
+    email = "rolf.schr@posteo.de";
+    github = "rolfschr";
+    githubId = 1188465;
+    name = "Rolf Schröder";
+  };
  rollf = {
    email = "rolf.schroeder@limbus-medtec.com";
    github = "rollf";
--- a/nixos/doc/manual/development/testing-installer.chapter.md
+++ b/nixos/doc/manual/development/testing-installer.chapter.md
@ -6,13 +6,13 @@ tedious, so here is a quick way to see if the installer works properly:
 ```ShellSession
 # mount -t tmpfs none /mnt
 # nixos-generate-config --root /mnt
-$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install
+$ nix-build '<nixpkgs>' -A nixos-install
 # ./result/bin/nixos-install
 ```

 To start a login shell in the new NixOS installation in `/mnt`:

 ```ShellSession
-$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter
+$ nix-build '<nixpkgs>' -A nixos-enter
 # ./result/bin/nixos-enter
 ```
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@ -321,7 +321,7 @@ let format' = format; in let
      e2fsprogs
      lkl
      config.system.build.nixos-install
-      config.system.build.nixos-enter
+      nixos-enter
      nix
      systemdMinimal
    ]
--- a/nixos/lib/make-multi-disk-zfs-image.nix
+++ b/nixos/lib/make-multi-disk-zfs-image.nix
@ -124,7 +124,7 @@ let

  tools = lib.makeBinPath (
    with pkgs; [
-      config.system.build.nixos-enter
+      nixos-enter
      config.system.build.nixos-install
      dosfstools
      e2fsprogs
--- a/nixos/lib/make-single-disk-zfs-image.nix
+++ b/nixos/lib/make-single-disk-zfs-image.nix
@ -112,7 +112,7 @@ let

  tools = lib.makeBinPath (
    with pkgs; [
-      config.system.build.nixos-enter
+      nixos-enter
      config.system.build.nixos-install
      dosfstools
      e2fsprogs
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@ -3,8 +3,6 @@

 { config, lib, pkgs, ... }:

-with lib;
-
 let
  makeProg = args: pkgs.substituteAll (args // {
    dir = "bin";
@ -17,11 +15,6 @@ let
    '';
  });

-  inherit (pkgs) nixos-build-vms;
-
-  nixos-install = pkgs.nixos-install.override { nix = config.nix.package; };
-  nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };
-
  nixos-generate-config = makeProg {
    name = "nixos-generate-config";
    src = ./nixos-generate-config.pl;
@ -34,8 +27,6 @@ let
    manPage = ./manpages/nixos-generate-config.8;
  };

-  inherit (pkgs) nixos-option;
-
  nixos-version = makeProg {
    name = "nixos-version";
    src = ./nixos-version.sh;
@ -44,23 +35,141 @@ let
    inherit (config.system) configurationRevision;
    json = builtins.toJSON ({
      nixosVersion = config.system.nixos.version;
-    } // optionalAttrs (config.system.nixos.revision != null) {
+    } // lib.optionalAttrs (config.system.nixos.revision != null) {
      nixpkgsRevision = config.system.nixos.revision;
-    } // optionalAttrs (config.system.configurationRevision != null) {
+    } // lib.optionalAttrs (config.system.configurationRevision != null) {
      configurationRevision = config.system.configurationRevision;
    });
    manPage = ./manpages/nixos-version.8;
  };

-  inherit (pkgs) nixos-enter;
+  nixos-install = pkgs.nixos-install.override { nix = config.nix.package; };
+  nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; };
+
+  defaultConfigTemplate = ''
+    # Edit this configuration file to define what should be installed on
+    # your system. Help is available in the configuration.nix(5) man page, on
+    # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+    { config, lib, pkgs, ... }:
+
+    {
+      imports =
+        [ # Include the results of the hardware scan.
+          ./hardware-configuration.nix
+        ];
+
+    $bootLoaderConfig
+      # networking.hostName = "nixos"; # Define your hostname.
+      # Pick only one of the below networking options.
+      # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+      # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+
+      # Set your time zone.
+      # time.timeZone = "Europe/Amsterdam";
+
+      # Configure network proxy if necessary
+      # networking.proxy.default = "http://user:password\@proxy:port/";
+      # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+      # Select internationalisation properties.
+      # i18n.defaultLocale = "en_US.UTF-8";
+      # console = {
+      #   font = "Lat2-Terminus16";
+      #   keyMap = "us";
+      #   useXkbConfig = true; # use xkb.options in tty.
+      # };
+
+    $xserverConfig
+
+    $desktopConfiguration
+      # Configure keymap in X11
+      # services.xserver.xkb.layout = "us";
+      # services.xserver.xkb.options = "eurosign:e,caps:escape";
+
+      # Enable CUPS to print documents.
+      # services.printing.enable = true;
+
+      # Enable sound.
+      # hardware.pulseaudio.enable = true;
+      # OR
+      # services.pipewire = {
+      #   enable = true;
+      #   pulse.enable = true;
+      # };
+
+      # Enable touchpad support (enabled default in most desktopManager).
+      # services.libinput.enable = true;
+
+      # Define a user account. Don't forget to set a password with ‘passwd’.
+      # users.users.alice = {
+      #   isNormalUser = true;
+      #   extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+      #   packages = with pkgs; [
+      #     firefox
+      #     tree
+      #   ];
+      # };
+
+      # List packages installed in system profile. To search, run:
+      # \$ nix search wget
+      # environment.systemPackages = with pkgs; [
+      #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+      #   wget
+      # ];
+
+      # Some programs need SUID wrappers, can be configured further or are
+      # started in user sessions.
+      # programs.mtr.enable = true;
+      # programs.gnupg.agent = {
+      #   enable = true;
+      #   enableSSHSupport = true;
+      # };
+
+      # List services that you want to enable:
+
+      # Enable the OpenSSH daemon.
+      # services.openssh.enable = true;
+
+      # Open ports in the firewall.
+      # networking.firewall.allowedTCPPorts = [ ... ];
+      # networking.firewall.allowedUDPPorts = [ ... ];
+      # Or disable the firewall altogether.
+      # networking.firewall.enable = false;
+
+      # Copy the NixOS configuration file and link it from the resulting system
+      # (/run/current-system/configuration.nix). This is useful in case you
+      # accidentally delete configuration.nix.
+      # system.copySystemConfiguration = true;
+
+      # This option defines the first version of NixOS you have installed on this particular machine,
+      # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
+      #
+      # Most users should NEVER change this value after the initial install, for any reason,
+      # even if you've upgraded your system to a new NixOS release.
+      #
+      # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
+      # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
+      # to actually do that.
+      #
+      # This value being lower than the current NixOS release does NOT mean your system is
+      # out of date, out of support, or vulnerable.
+      #
+      # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
+      # and migrated your data accordingly.
+      #
+      # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
+      system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment?
+
+    }
+  '';
 in
-
 {
-
  options.system.nixos-generate-config = {
-    configuration = mkOption {
+    configuration = lib.mkOption {
      internal = true;
-      type = types.str;
+      type = lib.types.str;
+      default = defaultConfigTemplate;
      description = ''
        The NixOS module that `nixos-generate-config`
        saves to `/etc/nixos/configuration.nix`.
@ -74,9 +183,9 @@ in
      '';
    };

-    desktopConfiguration = mkOption {
+    desktopConfiguration = lib.mkOption {
      internal = true;
-      type = types.listOf types.lines;
+      type = lib.types.listOf lib.types.lines;
      default = [];
      description = ''
        Text to preseed the desktop configuration that `nixos-generate-config`
@ -92,9 +201,9 @@ in
    };
  };

-  options.system.disableInstallerTools = mkOption {
+  options.system.disableInstallerTools = lib.mkOption {
    internal = true;
-    type = types.bool;
+    type = lib.types.bool;
    default = false;
    description = ''
      Disable nixos-rebuild, nixos-generate-config, nixos-installer
@ -104,145 +213,48 @@ in
    '';
  };

-  config = lib.mkMerge [ (lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) {
+  imports = let
+    mkToolModule = { name, package ? pkgs.${name} }: { config, ... }: {
+      options.system.tools.${name}.enable = lib.mkEnableOption "${name} script" // {
+        default = true;
+        internal = true;
+      };

-    system.nixos-generate-config.configuration = mkDefault ''
-      # Edit this configuration file to define what should be installed on
-      # your system. Help is available in the configuration.nix(5) man page, on
-      # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-
-      { config, lib, pkgs, ... }:
-
-      {
-        imports =
-          [ # Include the results of the hardware scan.
-            ./hardware-configuration.nix
-          ];
-
-      $bootLoaderConfig
-        # networking.hostName = "nixos"; # Define your hostname.
-        # Pick only one of the below networking options.
-        # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-        # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-
-        # Set your time zone.
-        # time.timeZone = "Europe/Amsterdam";
-
-        # Configure network proxy if necessary
-        # networking.proxy.default = "http://user:password\@proxy:port/";
-        # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-        # Select internationalisation properties.
-        # i18n.defaultLocale = "en_US.UTF-8";
-        # console = {
-        #   font = "Lat2-Terminus16";
-        #   keyMap = "us";
-        #   useXkbConfig = true; # use xkb.options in tty.
-        # };
-
-      $xserverConfig
-
-      $desktopConfiguration
-        # Configure keymap in X11
-        # services.xserver.xkb.layout = "us";
-        # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
-        # Enable CUPS to print documents.
-        # services.printing.enable = true;
-
-        # Enable sound.
-        # hardware.pulseaudio.enable = true;
-        # OR
-        # services.pipewire = {
-        #   enable = true;
-        #   pulse.enable = true;
-        # };
-
-        # Enable touchpad support (enabled default in most desktopManager).
-        # services.libinput.enable = true;
-
-        # Define a user account. Don't forget to set a password with ‘passwd’.
-        # users.users.alice = {
-        #   isNormalUser = true;
-        #   extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-        #   packages = with pkgs; [
-        #     firefox
-        #     tree
-        #   ];
-        # };
-
-        # List packages installed in system profile. To search, run:
-        # \$ nix search wget
-        # environment.systemPackages = with pkgs; [
-        #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-        #   wget
-        # ];
-
-        # Some programs need SUID wrappers, can be configured further or are
-        # started in user sessions.
-        # programs.mtr.enable = true;
-        # programs.gnupg.agent = {
-        #   enable = true;
-        #   enableSSHSupport = true;
-        # };
-
-        # List services that you want to enable:
-
-        # Enable the OpenSSH daemon.
-        # services.openssh.enable = true;
-
-        # Open ports in the firewall.
-        # networking.firewall.allowedTCPPorts = [ ... ];
-        # networking.firewall.allowedUDPPorts = [ ... ];
-        # Or disable the firewall altogether.
-        # networking.firewall.enable = false;
-
-        # Copy the NixOS configuration file and link it from the resulting system
-        # (/run/current-system/configuration.nix). This is useful in case you
-        # accidentally delete configuration.nix.
-        # system.copySystemConfiguration = true;
-
-        # This option defines the first version of NixOS you have installed on this particular machine,
-        # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
-        #
-        # Most users should NEVER change this value after the initial install, for any reason,
-        # even if you've upgraded your system to a new NixOS release.
-        #
-        # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
-        # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
-        # to actually do that.
-        #
-        # This value being lower than the current NixOS release does NOT mean your system is
-        # out of date, out of support, or vulnerable.
-        #
-        # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-        # and migrated your data accordingly.
-        #
-        # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-        system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment?
-
-      }
-    '';
-
-    environment.systemPackages =
-      [ nixos-build-vms
-        nixos-install
-        nixos-rebuild
-        nixos-generate-config
-        nixos-option
-        nixos-version
-        nixos-enter
-      ];
-
-    documentation.man.man-db.skipPackages = [ nixos-version ];
-
-  })
-
-  # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.
-  ({
-    system.build = {
-      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter;
+      config = lib.mkIf config.system.tools.${name}.enable {
+        environment.systemPackages = [ package ];
+      };
    };
-  })];
+  in [
+    (mkToolModule { name = "nixos-build-vms"; })
+    (mkToolModule { name = "nixos-enter"; })
+    (mkToolModule { name = "nixos-generate-config"; package = nixos-generate-config; })
+    (mkToolModule { name = "nixos-install"; package = nixos-install; })
+    (mkToolModule { name = "nixos-option"; })
+    (mkToolModule { name = "nixos-rebuild"; package = nixos-rebuild; })
+    (mkToolModule { name = "nixos-version"; package = nixos-version; })
+  ];

+  config = lib.mkMerge [
+    (lib.mkIf config.system.disableInstallerTools {
+      system.tools = {
+        nixos-build-vms.enable = false;
+        nixos-enter.enable = false;
+        nixos-generate-config.enable = false;
+        nixos-install.enable = false;
+        nixos-option.enable = false;
+        nixos-rebuild.enable = false;
+        nixos-version.enable = false;
+      };
+    })
+    {
+      documentation.man.man-db.skipPackages = [ nixos-version ];
+
+      # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.
+      system.build = {
+        inherit nixos-generate-config nixos-install nixos-rebuild;
+        nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option;
+        nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter;
+      };
+    }
+  ];
 }
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@ -656,6 +656,11 @@ in {
  };

  config = mkIf (fd_cfg.enable || sd_cfg.enable || dir_cfg.enable) {
+    systemd.slices.system-bacula = {
+      description = "Bacula Slice";
+      documentation = [ "man:bacula(8)" "https://www.bacula.org/" ];
+    };
+
    systemd.services.bacula-fd = mkIf fd_cfg.enable {
      after = [ "network.target" ];
      description = "Bacula File Daemon";
@ -666,6 +671,7 @@ in {
        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
        LogsDirectory = "bacula";
        StateDirectory = "bacula";
+        Slice = "system-bacula.slice";
      };
    };

@ -679,6 +685,7 @@ in {
        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
        LogsDirectory = "bacula";
        StateDirectory = "bacula";
+        Slice = "system-bacula.slice";
      };
    };

@ -694,6 +701,7 @@ in {
        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
        LogsDirectory = "bacula";
        StateDirectory = "bacula";
+        Slice = "system-bacula.slice";
      };
      preStart = ''
        if ! test -e "${libDir}/db-created"; then
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@ -509,6 +509,11 @@ in
        else lib.unique (lib.forEach cfg.upsd.listen (listen: listen.port));
    };

+    systemd.slices.system-ups = {
+      description = "Network UPS Tools (NUT) Slice";
+      documentation = [ "https://networkupstools.org/" ];
+    };
+
    systemd.services.upsmon = let
      secrets = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}") cfg.upsmon.monitor;
      createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" secrets;
@ -523,6 +528,7 @@ in
        ExecStart = "${pkgs.nut}/sbin/upsmon";
        ExecReload = "${pkgs.nut}/sbin/upsmon -c reload";
        LoadCredential = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}:${monitor.passwordFile}") cfg.upsmon.monitor;
+        Slice = "system-ups.slice";
      };
      environment = envVars;
    };
@ -542,6 +548,7 @@ in
        ExecStart = "${pkgs.nut}/sbin/upsd -u root";
        ExecReload = "${pkgs.nut}/sbin/upsd -c reload";
        LoadCredential = lib.mapAttrsToList (name: user: "upsdusers_password_${name}:${user.passwordFile}") cfg.users;
+        Slice = "system-ups.slice";
      };
      environment = envVars;
      restartTriggers = [
@ -559,6 +566,7 @@ in
        RemainAfterExit = true;
        # TODO: replace 'root' by another username.
        ExecStart = "${pkgs.nut}/bin/upsdrvctl -u root start";
+        Slice = "system-ups.slice";
      };
      environment = envVars;
      restartTriggers = [
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@ -120,6 +120,8 @@ let tests = {
      xfce4-terminal.pkg = p: p.xfce.xfce4-terminal;

      xterm.pkg = p: p.xterm;
+
+      zutty.pkg = p: p.zutty;
    };
 in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}", colourTest ? true, pinkValue ? "#FF0087", kill ? false }: makeTest
 {
--- a/pkgs/applications/audio/faustPhysicalModeling/default.nix
+++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix
@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
  pname = "faustPhysicalModeling";
-  version = "2.74.6";
+  version = "2.75.7";

  src = fetchFromGitHub {
    owner = "grame-cncm";
    repo = "faust";
    rev = version;
-    sha256 = "sha256-2qgw7pauDZBvEb5iySNiq2Fq+T+qw+AjVTwxaSQ9Eko=";
+    sha256 = "sha256-j5Qg/H7aMBZ6A8gh6v6+ICxmCZ7ya2tVF2FjueVtvHo=";
  };

  buildInputs = [ faust2jaqt faust2lv2 ];
--- a/pkgs/applications/misc/mob/default.nix
+++ b/pkgs/applications/misc/mob/default.nix
@ -9,13 +9,13 @@

 buildGoModule rec {
  pname = "mob";
-  version = "5.1.1";
+  version = "5.2.0";

  src = fetchFromGitHub {
    owner = "remotemobprogramming";
    repo = "mob";
    rev = "v${version}";
-    hash = "sha256-+v48znHCfu2qBFB0JhYT1vnce0wSHMULTlwaLv0237Q=";
+    hash = "sha256-LktA7GMOWAl12PRLgX8VTyYZ00sh6AHsgw9NdyjAJ64=";
  };

  vendorHash = null;
--- a/pkgs/applications/misc/organicmaps/default.nix
+++ b/pkgs/applications/misc/organicmaps/default.nix
@ -30,13 +30,13 @@ let
  };
 in stdenv.mkDerivation rec {
  pname = "organicmaps";
-  version = "2024.08.16-5";
+  version = "2024.09.08-7";

  src = fetchFromGitHub {
    owner = "organicmaps";
    repo = "organicmaps";
    rev = "${version}-android";
-    hash = "sha256-qVLeZySVdncHEwA0aTiScGJ/RAIpvVVVse3O/sXLto0=";
+    hash = "sha256-X1dmk1IBjqM2AUVkvSDNZyVtV5Ens9ninZvMvsRc334=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/pkgs/applications/networking/browsers/ladybird/default.nix
@ -10,6 +10,7 @@
 , cmake
 , ninja
 , pkg-config
+, curl
 , libavif
 , libjxl
 , libwebp
@ -57,13 +58,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "ladybird";
-  version = "0-unstable-2024-09-08";
+  version = "0-unstable-2024-09-21";

  src = fetchFromGitHub {
    owner = "LadybirdWebBrowser";
    repo = "ladybird";
-    rev = "8d6f36f8d6c0aea0253df8c84746f8c99bf79b4d";
-    hash = "sha256-EB26SAh9eckpq/HrO8O+PivMMmLpFtCdCNkOJcLQvZw=";
+    rev = "44f672bacf6779f6bbe5972d84e210f953f14598";
+    hash = "sha256-Qku6W1kETOXQh8Kxn0wabe0Xc4gkpxrGbDFwIik34eY=";
  };

  postPatch = ''
@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = with qt6Packages; [
+    curl
    ffmpeg
    libavif
    libjxl
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "jx";
-  version = "3.10.154";
+  version = "3.10.155";

  src = fetchFromGitHub {
    owner = "jenkins-x";
    repo = "jx";
    rev = "v${version}";
-    sha256 = "sha256-BrCErGsHJq9h2AijwhG8MwCxXGJ9sCDpCOqazsmi8hs=";
+    sha256 = "sha256-9dRYPeVWwJCbxkjPVI0B4FLaFNHRyGIdKd/ubJbP9tI=";
  };

  vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14=";
--- a/pkgs/applications/networking/diswall/default.nix
+++ b/pkgs/applications/networking/diswall/default.nix
@ -5,20 +5,20 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "diswall";
-  version = "0.5.2";
+  version = "0.5.3";

  src = fetchFromGitHub {
    owner = "dis-works";
    repo = "diswall-rs";
    rev = "v${version}";
-    sha256 = "sha256-HoIkozwRV0xz14mOTM4BXDzPShRAp8a3quhvtWwnQ2I=";
+    sha256 = "sha256-iZln/cgYGSFYwXDvD1CkQdfwBDXj897X1il1m5HfFJs=";
  };

  buildInputs = lib.optionals stdenv.isDarwin [
    Security
  ];

-  cargoHash = "sha256-KA2hwaEhY2G+H4+xVgin6xhmRfnGcJBBWj9xWtD0h9I=";
+  cargoHash = "sha256-5PPI7fnG71xkQCY+OLLk83XZb+4DoPX81bAtKRp/H8U=";

  doCheck = false;

--- a/pkgs/applications/terminal-emulators/rio/default.nix
+++ b/pkgs/applications/terminal-emulators/rio/default.nix
@ -55,16 +55,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "rio";
-  version = "0.1.13";
+  version = "0.1.15";

  src = fetchFromGitHub {
    owner = "raphamorim";
    repo = "rio";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-JrmjQjKpL9di66z4IYTcWhNBL0CgalqOhQgVDpkh6b0=";
+    rev = "v${version}";
+    hash = "sha256-aLqWhRaNqi7gMDxBITLU/Tj//h7RURycLSZXOOq83As=";
  };

-  cargoHash = "sha256-KWdkpQY1F0RU3JViFrXEp+JW6xdaofEmp2SlAkzPMPU=";
+  cargoHash = "sha256-4nqJbz2vauO4jRuUSDjBV1pVrAJMhIP4+eUwS1+GecU=";

  nativeBuildInputs = [
    ncurses
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@ -9,11 +9,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "arc-browser";
-  version = "1.58.1-53264";
+  version = "1.61.0-53949";

  src = fetchurl {
    url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-xX2Wn0bhPeTn/flz5GiDJ8pnQj3HREc8wqJDlsjI+hs=";
+    hash = "sha256-FuRWi4+vPt31bd3muMDEn3Fu20h9oWEd1XuPJU7W1OU=";
  };

  nativeBuildInputs = [ undmg ];
--- a/pkgs/by-name/ci/cirrus-cli/package.nix
+++ b/pkgs/by-name/ci/cirrus-cli/package.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "cirrus-cli";
-  version = "0.126.0";
+  version = "0.126.1";

  src = fetchFromGitHub {
    owner = "cirruslabs";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-9HjZI3MQBI24Ut3CI2hMOlRtZExoJtMXfd/HmSSICx0=";
+    hash = "sha256-A894AUmsJjCCvN6cI2qoTPyOeQx6h2uukzxtlvWZVn8=";
  };

  vendorHash = "sha256-PecNBlSoo8WN2FKXN/UpkqpqbsJkOPHKILy76YWgNlw=";
--- a/pkgs/by-name/di/disko/package.nix
+++ b/pkgs/by-name/di/disko/package.nix
@ -4,7 +4,7 @@
 , fetchFromGitHub
 , bash
 , nix
-, nixos-install-tools
+, nixos-install
 , coreutils
 }:

@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    for i in disko disko-install; do
      sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i"
      chmod 755 "$out/bin/$i"
-      wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install-tools ]}
+      wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install ]}
    done
    runHook postInstall
  '';
--- a/pkgs/by-name/he/hextazy/package.nix
+++ b/pkgs/by-name/he/hextazy/package.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "hextazy";
-  version = "0.6";
+  version = "0.7";

  src = fetchFromGitHub {
    owner = "0xfalafel";
    repo = "hextazy";
    rev = "${version}";
-    hash = "sha256-unZAW5ErHaEPpPwlo20/3//qhTpCjcmj0ses9FKgVJc=";
+    hash = "sha256-j8KY8OTYG+Hl86OppbMyAFBSA89TO7hc8mcNgTGTlgM=";
  };

-  cargoHash = "sha256-4JpgUGthCbXSn98f4RrPoTcaGSCyZeuJqMVdLH7gKgs=";
+  cargoHash = "sha256-Ue7ukYkpNkoD9IRy/EWMsB5kMzwWny8onVNeN+3WWgQ=";

  meta = {
    description = "TUI hexeditor in Rust with colored bytes";
--- a/pkgs/by-name/ho/hoppscotch/package.nix
+++ b/pkgs/by-name/ho/hoppscotch/package.nix
@ -4,7 +4,6 @@
  fetchurl,
  appimageTools,
  undmg,
-  copyDesktopItems,
 }:

 let
@ -39,7 +38,7 @@ let
    '';
    homepage = "https://hoppscotch.com";
    downloadPage = "https://hoppscotch.com/downloads";
-    changelog = "https://github.com/hoppscotch/hoppscotch/releases/tag/2024.8.1";
+    changelog = "https://github.com/hoppscotch/hoppscotch/releases/tag/20${lib.head (lib.splitString "-" version)}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ DataHearth ];
    mainProgram = "hoppscotch";
--- a/pkgs/by-name/hy/hyprland-activewindow/package.nix
+++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "hyprland-activewindow";
-  version = "1.0.3";
+  version = "1.0.4";

  src = fetchFromGitHub {
    owner = "FieldOfClay";
    repo = "hyprland-activewindow";
    rev = "v${version}";
-    hash = "sha256-kRxA2DLbbABPJFwv/L7yeNJ8eqNUbuV6U/PB5iJNoAw=";
+    hash = "sha256-2pIOZMBPqheqAz3YEvHP2ehLXhqIclOXXAFa5EXXZPk=";
  };

-  cargoHash = "sha256-s3Ho0+OzuLuWqFvaBu9NLXoasByHSuun9eJGAAISOJc=";
+  cargoHash = "sha256-5JhNBgP6VQX7TVPaFUGvknDWrn6F06Mm3mGfuajg9yQ=";

  meta = with lib; {
    description = "Multi-monitor-aware Hyprland workspace widget helper";
--- a/pkgs/by-name/ni/nixos-enter/nixos-enter.sh
+++ b/pkgs/by-name/ni/nixos-enter/nixos-enter.sh
@ -3,6 +3,8 @@

 set -e

+export PATH=@path@:$PATH
+
 # Re-exec ourselves in a private mount namespace so that our bind
 # mounts get cleaned up automatically.
 if [ -z "$NIXOS_ENTER_REEXEC" ]; then
--- a/pkgs/by-name/ni/nixos-enter/package.nix
+++ b/pkgs/by-name/ni/nixos-enter/package.nix
@ -24,5 +24,11 @@ substituteAll {
    installManPage ${./nixos-enter.8}
  '';

-  meta.mainProgram = "nixos-enter";
+  meta = {
+    description = "Run a command in a NixOS chroot environment";
+    homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-install";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "nixos-enter";
+  };
 }
--- a/pkgs/by-name/ni/nixos-install/package.nix
+++ b/pkgs/by-name/ni/nixos-install/package.nix
@ -29,5 +29,10 @@ substituteAll {
    installManPage ${./nixos-install.8}
  '';

-  meta.mainProgram = "nixos-install";
+  meta = {
+    description = "Install bootloader and NixOS";
+    homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-install";
+    license = lib.licenses.mit;
+    mainProgram = "nixos-install";
+  };
 }
--- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
+++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
@ -1,39 +1,40 @@
-{ stdenv
-, lib
-, fetchurl
-, buildFHSEnv
+{
+  stdenv,
+  lib,
+  fetchurl,
+  buildFHSEnv,
  # Alphabetic ordering below
-, alsa-lib
-, at-spi2-atk
-, atk
-, autoPatchelfHook
-, cairo
-, curl
-, dbus
-, dconf
-, dpkg
-, fontconfig
-, gcc-unwrapped
-, gdk-pixbuf
-, glib
-, glibc
-, gsettings-desktop-schemas
-, gst_all_1
-, gtk2
-, gtk3
-, libpulseaudio
-, libudev0-shim
-, libdrm
-, makeWrapper
-, mesa
-, noto-fonts-cjk-sans
-, nspr
-, nss
-, pulseaudio
-, qt5
-, wrapGAppsHook3
-, xkeyboard_config
-, xorg
+  alsa-lib,
+  at-spi2-atk,
+  atk,
+  autoPatchelfHook,
+  cairo,
+  curl,
+  dbus,
+  dconf,
+  dpkg,
+  fontconfig,
+  gcc-unwrapped,
+  gdk-pixbuf,
+  glib,
+  glibc,
+  gsettings-desktop-schemas,
+  gst_all_1,
+  gtk2,
+  gtk3,
+  libpulseaudio,
+  libudev0-shim,
+  libdrm,
+  makeWrapper,
+  mesa,
+  noto-fonts-cjk-sans,
+  nspr,
+  nss,
+  pulseaudio,
+  qt5,
+  wrapGAppsHook3,
+  xkeyboard_config,
+  xorg,
 }:
 let

@ -65,11 +66,11 @@ let

  derivation = stdenv.mkDerivation rec {
    pname = "onlyoffice-desktopeditors";
-    version = "8.1.0";
+    version = "8.1.1";
    minor = null;
    src = fetchurl {
      url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
-      hash = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js=";
+      hash = "sha256-RwWIYcbYljDqWRJcXCDODjVeYnp9xreNGO2l2aqWJ9w=";
    };

    nativeBuildInputs = [
@ -184,15 +185,17 @@ buildFHSEnv {

  passthru.updateScript = ./update.sh;

-  meta = with lib; {
+  meta = {
    description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents";
-    mainProgram = "onlyoffice-desktopeditors";
    homepage = "https://www.onlyoffice.com/";
    downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases";
    changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md";
    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ nh2 gtrunsec ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
+      nh2
+      gtrunsec
+    ];
  };
 }
--- a/pkgs/by-name/on/onlyoffice-desktopeditors/update.sh
+++ b/pkgs/by-name/on/onlyoffice-desktopeditors/update.sh
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@ -7,7 +7,7 @@

 let
  pname = "openfga";
-  version = "1.6.0";
+  version = "1.6.1";
 in

 buildGoModule {
@ -17,10 +17,10 @@ buildGoModule {
    owner = "openfga";
    repo = "openfga";
    rev = "v${version}";
-    hash = "sha256-Y0ffBbNQFPGoLq2B9HtImU1tH0JqhvPYgftNCUQtcJo=";
+    hash = "sha256-NdMv81XUHawey/xO7UUsTpbBF/4F77N7VtyYCKZjjkU=";
  };

-  vendorHash = "sha256-+awhoYHstxLarPRDIzETAx0wR8TqoyDz3iFSQxH2vG4=";
+  vendorHash = "sha256-4f681Qq6cAAQpla+xcvDXCYwa0ZBqsYSWWDyq5jbdd0=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/os/osm2pgsql/package.nix
+++ b/pkgs/by-name/os/osm2pgsql/package.nix
@ -2,7 +2,7 @@
 , fetchFromGitHub
 , cmake
 , expat
-, fmt
+, fmt_11
 , proj
 , bzip2
 , cli11
@ -23,13 +23,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "osm2pgsql";
-  version = "1.11.0";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "osm2pgsql-dev";
    repo = "osm2pgsql";
    rev = finalAttrs.version;
-    hash = "sha256-95B4WVaf3AwaC+S6dCJpUq/1J47rOZjWUBxmRqHCu4w=";
+    hash = "sha256-YtG/cwEyCIsNjoEhDikMoI/SUqx8fEtPuolpNkLGTlE=";
  };

  postPatch = ''
@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
    bzip2
    cli11
    expat
-    fmt
+    fmt_11
    libosmium
    nlohmann_json
    opencv
--- a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
  pname = "elasticsearch_exporter";
-  version = "1.7.0";
+  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "prometheus-community";
    repo = "elasticsearch_exporter";
    rev = "v${version}";
-    hash = "sha256-a70huy6J0Ob9LkLuCSVZqJChTo/4cPufbkq1v/QcKE4=";
+    hash = "sha256-8WPDBlp6ftBmY/lu0wuuvs3A9KAzEM/A6RqSvYYLm7w=";
  };

-  vendorHash = "sha256-5uQfeDRi7EMcUCkXdbNlSe1IUpv6e5ueXtZ4C5SWAmw=";
+  vendorHash = "sha256-jbPFxwrXWwxPamMnbBxFvGBrt38YG7N5fTweAYULEYQ=";

  meta = with lib; {
    description = "Elasticsearch stats exporter for Prometheus";
--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "rasm";
-  version = "2.2.6";
+  version = "2.2.7";

  src = fetchFromGitHub {
    owner = "EdouardBERGE";
    repo = "rasm";
    rev = "v${version}";
-    hash = "sha256-DX+i9G+HK0Iek6qmsYQFbieHUtRazKkcyv+gYQ748X0=";
+    hash = "sha256-X3GEQJdfw4znqVyUIi2teUkQZpOV5X1EpF5Zob9g8PI=";
  };

  # by default the EXEC variable contains `rasm.exe`
--- a/pkgs/by-name/s3/s3scanner/package.nix
+++ b/pkgs/by-name/s3/s3scanner/package.nix
@ -2,18 +2,18 @@

 buildGoModule rec {
  pname = "s3scanner";
-  version = "3.1.0";
+  version = "3.1.1";

  src = fetchFromGitHub {
    owner = "sa7mon";
    repo = "s3scanner";
    rev = "v${version}";
-    hash = "sha256-yQymMtXQam/PMNZMBeKWtDtdrFikjvE/Nh5K61NUaYI=";
+    hash = "sha256-RS/+m/snJIm8OxCgvh/Bn1u9ghvRgS8tYvy1v1DV02I=";
  };

  ldflags = [ "-s -w" ];

-  vendorHash = "sha256-Y7eIvZIUtp+sOENiaG/eliZEl41qTHN2k3vJCXsjlIw=";
+  vendorHash = "sha256-Ik5B01QnbhFQISAY3Bdb1g85Din+Ifcg1vbGZcbb1OY=";

  # Requires networking
  doCheck = false;
--- a/pkgs/by-name/si/sieve-editor-gui/package.nix
+++ b/pkgs/by-name/si/sieve-editor-gui/package.nix
@ -0,0 +1,70 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  electron,
+  nodejs_20,
+  nodePackages,
+  makeDesktopItem,
+  copyDesktopItems,
+}:
+buildNpmPackage rec {
+  pname = "sieve-editor-gui";
+  version = "0.6.1-unstable-2024-01-06";
+  nodejs = nodejs_20;
+
+  src = fetchFromGitHub {
+    owner = "thsmi";
+    repo = "sieve";
+    rev = "5879679ed8d16a34af760ee56bfec16a1a322b4e";
+    hash = "sha256-wl6dwKoGan+DrpXk2p1fD/QN/C2qT4h/g3N73gF8sOI=";
+  };
+
+  npmDepsHash = "sha256-a2I9csxFZJekG1uCOHqdRaLLi5v/BLTz4SU+uBd855A=";
+
+  nativeBuildInputs = [
+    electron
+    copyDesktopItems
+    nodePackages.gulp
+  ];
+
+  dontNpmBuild = true;
+
+  buildPhase = ''
+    gulp -LLLL app:package
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mv build/ $out
+    runHook postInstall
+  '';
+
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+  };
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "sieve-editor-gui";
+      exec = "sieve-editor-gui";
+      desktopName = "Sieve Editor";
+      icon = "sieve-editor-gui";
+      categories = [ "Utility" ];
+    })
+  ];
+
+  postInstall = ''
+    makeWrapper ${lib.getExe electron} $out/bin/sieve-editor-gui \
+      --add-flags $out/electron/resources/main_esm.js
+  '';
+
+  meta = {
+    description = "Activate, edit, delete and add Sieve scripts with a convenient interface";
+    homepage = "https://github.com/thsmi/sieve";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ Silver-Golden ];
+    platforms = lib.platforms.linux;
+    mainProgram = "sieve-editor-gui";
+  };
+}
--- a/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch
+++ b/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch
@ -1,12 +0,0 @@
-diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
-index 7d6fd62..2cca01d 100644
--- a/src/ports/SkFontMgr_fontconfig.cpp
-+++ b/src/ports/SkFontMgr_fontconfig.cpp
-@@ -16,6 +16,7 @@
- #include "include/core/SkString.h"
- #include "include/core/SkTypeface.h"
- #include "include/core/SkTypes.h"
-+#include "include/ports/SkFontMgr_fontconfig.h"
- #include "include/private/base/SkDebug.h"
- #include "include/private/base/SkMutex.h"
- #include "include/private/base/SkTArray.h"
--- a/pkgs/by-name/sk/skia/package.nix
+++ b/pkgs/by-name/sk/skia/package.nix
@ -26,22 +26,15 @@ stdenv.mkDerivation (finalAttrs: {
  # Version from https://skia.googlesource.com/skia/+/refs/heads/main/RELEASE_NOTES.md
  # or https://chromiumdash.appspot.com/releases
  # plus date of the tip of the corresponding chrome/m$version branch
-  version = "124-unstable-2024-05-22";
+  version = "129-unstable-2024-09-18";

  src = fetchgit {
    url = "https://skia.googlesource.com/skia.git";
    # Tip of the chrome/m$version branch
-    rev = "a747f7ea37db6ea3871816dbaf2eb41b5776c826";
-    hash = "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY=";
+    rev = "dda581d538cb6532cda841444e7b4ceacde01ec9";
+    hash = "sha256-NZiZFsABebugszpYsBusVlTYnYda+xDIpT05cZ8Jals=";
  };

-  patches = [
-    # Package ladybird uses SkFontMgr_New_FontConfig, but this version of skia
-    # does not export it.
-    # https://skia.googlesource.com/skia/+/4bf56844d4a661d7317882cc545ecd978715a11e%5E!/?
-    ./export-SkFontMgr_New_FontConfig.patch
-  ];
-
  postPatch = ''
    # System zlib detection bug workaround
    substituteInPlace BUILD.gn \
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@ -11,16 +11,16 @@

 buildGoModule rec {
  pname = "stackit-cli";
-  version = "0.15.0";
+  version = "0.16.0";

  src = fetchFromGitHub {
    owner = "stackitcloud";
    repo = "stackit-cli";
    rev = "v${version}";
-    hash = "sha256-dyMkqD2Fdopv620p9bzOXxiG3vp4t0H+x5UDelbpMko=";
+    hash = "sha256-9s7F3pcamzwAESA/mKnCnSPpSmAX+L81fDoDpR71gzA=";
  };

-  vendorHash = "sha256-FLMF0JTSTSkwI86i4StkY1r/W+x43TwlcLsmNYO7YnE=";
+  vendorHash = "sha256-QNi98VRy5BtML8jTxaDR3ZQfkXqjmfCf5IrcvGKE+rc=";

  subPackages = [ "." ];

--- a/pkgs/by-name/te/termsonic/package.nix
+++ b/pkgs/by-name/te/termsonic/package.nix
@ -7,14 +7,14 @@
 }:
 buildGoModule rec {
  name = "termsonic";
-  version = "0-unstable-2024-02-02";
+  version = "0-unstable-2024-09-15";

  src = fetchzip {
-    url = "https://git.sixfoisneuf.fr/termsonic/snapshot/termsonic-7a3aabee59e1a427aff755fc69759265ad9d0adc.zip";
-    hash = "sha256-C5/4679qw4CAdUt9lXpPIR3yejrPdddvmjgbpLF3SvA=";
+    url = "https://git.sixfoisneuf.fr/termsonic/snapshot/termsonic-93328e0ca6c0ed2424550c7a164b4b1212a554b6.zip";
+    hash = "sha256-qn0EB1lCU8nvgwcIuZ0Xt9yGTBz5bSnJelPF8mG6D1k=";
  };

-  vendorHash = "sha256-wCtQD9f1mbN/0qUZnamPoVn9p4Ra5dQ34vlT+XjPF3k=";
+  vendorHash = "sha256-hBYgRKL9ZFzYy/wLCWacw8I6aqtD5O7lLsB9U5RmLjw=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/ti/tippecanoe/package.nix
+++ b/pkgs/by-name/ti/tippecanoe/package.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "tippecanoe";
-  version = "2.62.2";
+  version = "2.62.3";

  src = fetchFromGitHub {
    owner = "felt";
    repo = "tippecanoe";
    rev = finalAttrs.version;
-    hash = "sha256-x8+UJZYdtiwYAoMgJeDKtXbrT0A96jRu5pbkA6WOce4=";
+    hash = "sha256-1rj2nfp18EZL9aSiUs1ASJnAqHyM9lztsfkak7Ipy6o=";
  };

  buildInputs = [ sqlite zlib ];
--- a/pkgs/by-name/zu/zutty/package.nix
+++ b/pkgs/by-name/zu/zutty/package.nix
@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchgit,
+  pkg-config,
+  freetype,
+  wafHook,
+  python3,
+  libXmu,
+  glew,
+  ucs-fonts,
+  nixosTests,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zutty";
+  version = "0.16-unstable-2024-08-18";
+
+  src = fetchgit {
+    url = "https://git.hq.sig7.se/zutty.git";
+    rev = "04b2ca3b3aaa070c41583247f8112c31b6003886"; # 20240818
+    hash = "sha256-izUbn2B3RqIIOW9tuL7DFLqJdektCftxnpQssJMYxC8=";
+  };
+
+  postPatch =
+    let
+      fontpaths = [
+        "/run/current-system/sw/share/X11/fonts" # available if fonts.fontDir.enable = true
+        "${ucs-fonts}/share/fonts"
+      ];
+    in
+    ''
+      substituteInPlace src/options.h \
+        --replace-fail /usr/share/fonts ${builtins.concatStringsSep ":" fontpaths}
+    '';
+
+  nativeBuildInputs = [
+    pkg-config
+    wafHook
+    python3
+  ];
+
+  buildInputs = [
+    freetype
+    libXmu
+    glew
+  ];
+
+  passthru = {
+    tests = lib.optionalAttrs stdenv.isLinux { default = nixosTests.terminal-emulators.zutty; };
+  };
+
+  meta = {
+    homepage = "https://tomscii.sig7.se/zutty/";
+    description = "X terminal emulator rendering through OpenGL ES Compute Shaders";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.rolfschr ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/development/python-modules/blackrenderer/default.nix
+++ b/pkgs/development/python-modules/blackrenderer/default.nix
@ -0,0 +1,61 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  fonttools,
+  uharfbuzz,
+  pycairo,
+  pillow,
+}:
+
+buildPythonPackage rec {
+  pname = "blackrenderer";
+  version = "0.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "BlackFoundryCom";
+    repo = "black-renderer";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-b2W0M32Y4HUyxObjvh0yMUBe5gfcSDXnw1GfhW7hoZk=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    fonttools
+    uharfbuzz
+  ];
+
+  optional-dependencies = {
+    cairo = [ pycairo ];
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pillow
+  ];
+
+  disabledTestPaths = [
+    # Wants None existing fonts
+    "Tests/test_mainprog.py"
+    "Tests/test_glyph_render.py"
+  ];
+
+  pythonImportsCheck = [ "blackrenderer" ];
+
+  meta = {
+    description = "Renderer for OpenType COLR fonts, with multiple backends";
+    homepage = "https://github.com/BlackFoundryCom/black-renderer";
+    changelog = "https://github.com/BlackFoundryCom/black-renderer/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    mainProgram = "blackrenderer";
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
--- a/pkgs/applications/version-management/bump2version/default.nix
+++ b/pkgs/applications/version-management/bump2version/default.nix
@ -1,24 +1,29 @@
-{ lib
-, buildPythonApplication
-, fetchFromGitHub
-, pytestCheckHook
-, pythonOlder
-, testfixtures
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  testfixtures,
 }:

-buildPythonApplication rec {
+buildPythonPackage rec {
  pname = "bump2version";
  version = "1.0.1";
+  pyproject = true;

  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "c4urself";
-    repo = pname;
-    rev = "v${version}";
+    repo = "bump2version";
+    rev = "refs/tags/v${version}";
    sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU=";
  };

+  build-system = [ setuptools ];
+
  nativeCheckInputs = [
    pytestCheckHook
    testfixtures
@ -40,6 +45,7 @@ buildPythonApplication rec {
      all version strings in your source code by the correct increment.
    '';
    homepage = "https://github.com/c4urself/bump2version";
+    changelog = "https://github.com/c4urself/bump2version/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ jefflabonte ];
  };
--- a/pkgs/development/python-modules/bumpfontversion/default.nix
+++ b/pkgs/development/python-modules/bumpfontversion/default.nix
@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonRelaxDepsHook,
+  poetry-core,
+  fonttools,
+  openstep-plist,
+  ufolib2,
+  glyphslib,
+  bump2version,
+}:
+
+buildPythonPackage rec {
+  pname = "bumpfontversion";
+  version = "0.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simoncozens";
+    repo = "bumpfontversion";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-qcKZGv/KeeSRBq4SdnuZlurp0CUs40iEQjw9/1LltUg=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'poetry>=' 'poetry-core>=' \
+      --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api'
+  '';
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+
+  pythonRelaxDeps = [ "glyphslib" ];
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    fonttools
+    openstep-plist
+    ufolib2
+    glyphslib
+    bump2version
+  ];
+
+  meta = {
+    description = "Version-bump your font sources";
+    homepage = "https://github.com/simoncozens/bumpfontversion";
+    license = lib.licenses.asl20;
+    mainProgram = "bumpfontversion";
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
--- a/pkgs/development/python-modules/diffenator2/default.nix
+++ b/pkgs/development/python-modules/diffenator2/default.nix
@ -0,0 +1,95 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonRelaxDepsHook,
+  pytestCheckHook,
+  poetry-core,
+  poetry-dynamic-versioning,
+  blackrenderer,
+  fonttools,
+  freetype-py,
+  gflanguages,
+  glyphsets,
+  jinja2,
+  ninja,
+  pillow,
+  protobuf,
+  pyahocorasick,
+  python-bidi,
+  selenium,
+  tqdm,
+  uharfbuzz,
+  unicodedata2,
+  youseedee,
+  numpy,
+}:
+
+buildPythonPackage rec {
+  pname = "diffenator2";
+  version = "0.4.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "diffenator2";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-zeNcNR14ieY6Inp4kOwIPXd6S+/wFdMFp6wbiqgB/iA=";
+  };
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+
+  pythonRelaxDeps = [ "protobuf" ];
+
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = [
+    blackrenderer
+    fonttools
+    freetype-py
+    gflanguages
+    glyphsets
+    jinja2
+    ninja
+    pillow
+    protobuf
+    pyahocorasick
+    python-bidi
+    selenium
+    tqdm
+    uharfbuzz
+    unicodedata2
+    youseedee
+    numpy
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTests = [
+    # requires internet
+    "test_download_google_fonts_family_to_file"
+    "test_download_google_fonts_family_to_bytes"
+    "test_download_google_fonts_family_not_existing"
+    "test_download_latest_github_release"
+  ];
+
+  disabledTestPaths = [
+    # Want the files downloaded by the tests above
+    "tests/test_functional.py"
+    "tests/test_html.py"
+    "tests/test_matcher.py"
+    "tests/test_font.py"
+  ];
+
+  meta = {
+    description = "Font comparison tool that will not stop until your fonts are exhaustively compared";
+    homepage = "https://github.com/googlefonts/diffenator2";
+    changelog = "https://github.com/googlefonts/diffenator2/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    mainProgram = "diffenator2";
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
--- a/pkgs/development/python-modules/gftools/default.nix
+++ b/pkgs/development/python-modules/gftools/default.nix
@ -0,0 +1,207 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  absl-py,
+  afdko,
+  axisregistry,
+  babelfont,
+  beautifulsoup4,
+  black,
+  brotli,
+  bumpfontversion,
+  coreutils,
+  diffenator2,
+  font-v,
+  fontbakery,
+  fontfeatures,
+  fontmake,
+  fonttools,
+  gflanguages,
+  gfsubsets,
+  glyphsets,
+  glyphslib,
+  harfbuzz,
+  jinja2,
+  nanoemoji,
+  networkx,
+  ninja,
+  opentype-feature-freezer,
+  ots-python,
+  packaging,
+  paintcompiler,
+  pillow,
+  protobuf,
+  pycairo,
+  pygit2,
+  pygithub,
+  pytest,
+  pyyaml,
+  requests,
+  rich,
+  ruamel-yaml,
+  skia-pathops,
+  statmake,
+  strictyaml,
+  tabulate,
+  ttfautohint-py,
+  ufomerge,
+  unidecode,
+  vharfbuzz,
+  vttlib,
+  python,
+}:
+
+let
+  fontmake' = python.withPackages (ps: [ ps.fontmake ] ++ ps.fontmake.optional-dependencies.json);
+  fonttools' = python.withPackages (ps: [ ps.fonttools ] ++ ps.fonttools.optional-dependencies.ufo);
+in
+buildPythonPackage rec {
+  pname = "gftools";
+  version = "0.9.68";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "gftools";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-xdpfRCtZDxRmrGodXUg8J0T5l5gd7Mvl290BXwNLzvY=";
+  };
+
+  postPatch = ''
+    substituteInPlace \
+      Lib/gftools/builder/operations/{buildTTF,glyphs2ds,buildVariable,buildOTF}.py \
+      --replace-fail '"fontmake' '"${lib.getExe' fontmake' "fontmake"}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/instantiateUfo.py \
+      --replace-fail "'fontmake" "'${lib.getExe' fontmake' "fontmake"}"
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/{compress,subspace}.py \
+      --replace-fail '"fonttools' '"${lib.getExe' fonttools' "fonttools"}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/hbsubset.py \
+      --replace-fail '"pyftsubset"' '"${lib.getExe' fonttools' "pyftsubset"}"' \
+      --replace-fail '"hb-subset"' '"${lib.getExe' harfbuzz "hb-subset"}"'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/autohintOTF.py \
+      --replace-fail '"otfautohint' '"${lib.getExe' afdko "otfautohint"}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/paintcompiler.py \
+      --replace-fail '"paintcompiler' '"${lib.getExe paintcompiler}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/featureFreeze.py \
+      --replace-fail '"pyftfeatfreeze' '"${lib.getExe opentype-feature-freezer}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/copy.py \
+      --replace-fail '"cp' '"${lib.getExe' coreutils "cp"}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/{fix,remap,autohint,buildStat,addSubset,remapLayout,buildVTT}.py \
+      --replace-fail '"gftools' '"${placeholder "out"}/bin/gftools'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/rename.py \
+      --replace-fail "'gftools" "'${placeholder "out"}t/bin/gftools"
+  '';
+
+  pythonRelaxDeps = [
+    "protobuf"
+    "pygit2"
+  ];
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    absl-py
+    afdko
+    axisregistry
+    babelfont
+    beautifulsoup4
+    brotli
+    bumpfontversion
+    font-v
+    fontfeatures
+    fontmake
+    fonttools
+    gflanguages
+    gfsubsets
+    glyphsets
+    glyphslib
+    jinja2
+    nanoemoji
+    networkx
+    ninja
+    ots-python
+    packaging
+    pillow
+    protobuf
+    pygit2
+    pygithub
+    pyyaml
+    requests
+    rich
+    ruamel-yaml
+    setuptools
+    skia-pathops
+    statmake
+    strictyaml
+    tabulate
+    ttfautohint-py
+    ufomerge
+    unidecode
+    vharfbuzz
+    vttlib
+  ] ++ fonttools.optional-dependencies.ufo ++ fontmake.optional-dependencies.json;
+
+  optional-dependencies = {
+    qa = [
+      diffenator2
+      fontbakery
+      pycairo
+    ];
+    test = [
+      black
+      pytest
+    ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTestPaths = [
+    # Wants none exsiting module
+    "bin/test_args.py"
+    # Requires internet
+    "tests/push/test_items.py"
+    "tests/test_gfgithub.py"
+    "tests/test_usage.py"
+    "tests/push/test_servers.py"
+    # Can't find directory
+    "tests/test_builder.py"
+    "tests/test_dependencies.py"
+    "tests/test_fix.py"
+  ];
+
+  pythonImportsCheck = [ "gftools" ];
+
+  meta = with lib; {
+    description = "Misc tools for working with the Google Fonts library";
+    homepage = "https://github.com/googlefonts/gftools";
+    changelog = "https://github.com/googlefonts/gftools/releases/tag/v${version}";
+    license = licenses.asl20;
+    mainProgram = "gftools";
+    maintainers = with maintainers; [ jopejoe1 ];
+  };
+}
--- a/pkgs/development/python-modules/great-tables/default.nix
+++ b/pkgs/development/python-modules/great-tables/default.nix
@ -31,14 +31,14 @@

 buildPythonPackage rec {
  pname = "great-tables";
-  version = "0.11.0";
+  version = "0.11.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "posit-dev";
    repo = "great-tables";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ccS//fSFa6sytKv0izRxIdnHoNICr7P90Eo+v62RmVA=";
+    hash = "sha256-IlukgnhOT8NF1WxRJCnNuNEI31DByWoNzbk/x458atA=";
  };

  build-system = [
--- a/pkgs/development/python-modules/mozart-api/default.nix
+++ b/pkgs/development/python-modules/mozart-api/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "mozart-api";
-  version = "3.4.1.8.7";
+  version = "3.4.1.8.8";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -26,7 +26,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "mozart_api";
    inherit version;
-    hash = "sha256-RMhc/rFXFGt2GBium3NlPg3TYIMxvpEAb1Hqj1oVqpM=";
+    hash = "sha256-Lonv9f7/FSEdisKOuL+T1gKbxpog22DcNZTaK9L84Mc=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/nanoemoji/default.nix
+++ b/pkgs/development/python-modules/nanoemoji/default.nix
@ -1,19 +1,38 @@
-{ lib
-, python3
-, fetchFromGitHub
-, resvg
-, pngquant
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  resvg,
+  pngquant,
+  absl-py,
+  fonttools,
+  lxml,
+  ninja,
+  picosvg,
+  pillow,
+  regex,
+  toml,
+  tomlkit,
+  ufo2ft,
+  ufolib2,
+  zopfli,
 }:
-python3.pkgs.buildPythonApplication rec {
+
+buildPythonPackage rec {
  pname = "nanoemoji";
  version = "0.15.1";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "googlefonts";
-    repo = pname;
-    rev = "v${version}";
+    repo = "nanoemoji";
+    rev = "refs/tags/v${version}";
    hash = "sha256-P/lT0PnjTdYzyttICzszu4OL5kj+X8GHZ8doL3tpXQM=";
  };
+
  patches = [
    # this is necessary because the tests clear PATH/PYTHONPATH otherwise
    ./test-pythonpath.patch
@ -21,17 +40,23 @@ python3.pkgs.buildPythonApplication rec {
    ./fix-test.patch
  ];

-  nativeBuildInputs = with python3.pkgs; [
+  build-system = [
+    setuptools
    setuptools-scm
+  ];

+  nativeBuildInputs = [
    pngquant
    resvg
  ];

  # these two packages are just prebuilt wheels containing the respective binaries
-  pythonRemoveDeps = [ "pngquant-cli" "resvg-cli" ];
+  pythonRemoveDeps = [
+    "pngquant-cli"
+    "resvg-cli"
+  ];

-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = [
    absl-py
    fonttools
    lxml
@ -46,15 +71,19 @@ python3.pkgs.buildPythonApplication rec {
    zopfli
  ];

-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = [
    pytestCheckHook
-
    ninja
    picosvg
  ];

  makeWrapperArgs = [
-    "--prefix PATH : ${lib.makeBinPath [ pngquant resvg ]}"
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        pngquant
+        resvg
+      ]
+    }"
  ];

  preCheck = ''
@ -65,6 +94,7 @@ python3.pkgs.buildPythonApplication rec {
  meta = with lib; {
    description = "Wee tool to build color fonts";
    homepage = "https://github.com/googlefonts/nanoemoji";
+    changelog = "https://github.com/googlefonts/nanoemoji/releases/tag/v${version}";
    license = licenses.asl20;
    maintainers = with maintainers; [ _999eagle ];
  };
--- a/pkgs/development/python-modules/nanoemoji/fix-test.patch
+++ b/pkgs/development/python-modules/nanoemoji/fix-test.patch
--- a/pkgs/development/python-modules/nanoemoji/test-pythonpath.patch
+++ b/pkgs/development/python-modules/nanoemoji/test-pythonpath.patch
--- a/pkgs/development/python-modules/nodriver/default.nix
+++ b/pkgs/development/python-modules/nodriver/default.nix
@ -1,7 +1,7 @@
 {
  lib,
  buildPythonPackage,
-  fetchFromGitHub,
+  fetchPypi,
  pythonOlder,
  deprecated,
  mss,
@ -9,16 +9,14 @@
  setuptools,
 }:

-buildPythonPackage {
+buildPythonPackage rec {
  pname = "nodriver";
  version = "0.37";
  pyproject = true;

-  src = fetchFromGitHub {
-    owner = "ultrafunkamsterdam";
-    repo = "nodriver";
-    rev = "1bb6003c7f0db4d3ec05fdf3fc8c8e0804260103";
-    hash = "sha256-8q+9RX9ugrT6/fjlTSIecVcR6lPdZwg7nF+cSTSLlEc=";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-FF/E0hNZvo26Urtgw+nBH5Rmk7UCaqAsckCLDMuCK0A=";
  };

  disabled = pythonOlder "3.9";
--- a/pkgs/development/python-modules/notobuilder/default.nix
+++ b/pkgs/development/python-modules/notobuilder/default.nix
@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  setuptools,
+  setuptools-scm,
+  fonttools,
+  ufomerge,
+  fontmake,
+  glyphslib,
+  ttfautohint-py,
+  ufo2ft,
+  gftools,
+  fontbakery,
+  diffenator2,
+  chevron,
+  sh,
+  ninja,
+}:
+
+buildPythonPackage {
+  pname = "notobuilder";
+  version = "0-unstable-2024-08-03";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "notofonts";
+    repo = "notobuilder";
+    rev = "d7bcfc8e5c5ee9b273e7b1eeb2dd6d619da68c33";
+    hash = "sha256-1tdHbJixd1s1grGh0enqXhp+u5TEic6/W88X/f8vagM=";
+  };
+
+  postPatch = ''
+    substituteInPlace Lib/notobuilder/__main__.py \
+      --replace-fail '"ninja"' '"${lib.getExe ninja}"'
+  '';
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    fonttools
+    ufomerge
+    fontmake
+    glyphslib
+    ttfautohint-py
+    ufo2ft
+    gftools
+    fontbakery
+    diffenator2
+    chevron
+    sh
+  ] ++ gftools.optional-dependencies.qa;
+
+  pythonImportsCheck = [
+    "notobuilder"
+    "notoqa"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Python module for building Noto fonts";
+    homepage = "https://github.com/notofonts/notobuilder";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
--- a/pkgs/development/python-modules/opentype-feature-freezer/default.nix
+++ b/pkgs/development/python-modules/opentype-feature-freezer/default.nix
@ -0,0 +1,63 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  pytestCheckHook,
+  fonttools,
+  poetry-core,
+  configparser,
+  biplist,
+}:
+
+buildPythonPackage {
+  pname = "opentype-feature-freezer";
+  version = "0-unstable-2022-07-09";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "twardoch";
+    repo = "fonttools-opentype-feature-freezer";
+    rev = "2ae16853bc724c3e377726f81d9fc661d3445827";
+    hash = "sha256-mIWQF9LTVKxIkwHLCTVK1cOuiaduJyX8pyBZ/0RKIVE=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail poetry.masonry.api poetry.core.masonry.api \
+      --replace-fail "poetry>=" "poetry-core>="
+  '';
+
+  build-system = [
+    poetry-core
+    configparser
+  ];
+
+  dependencies = [ fonttools ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    biplist
+  ];
+
+  disabledTestPaths = [
+    # Wants to check path outside of nix store
+    "src/opentype_feature_freezer/cli.py"
+    # NameError: name 'defines' is not defined
+    "app/dmgbuild_settings.py"
+    # Missing module
+    "app/OTFeatureFreezer.py"
+    # AttributeError: 'types.SimpleNamespace' object has no attribute 'suffix'
+    "tests/test_rename.py"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Permanently \"apply\" OpenType features to fonts, by remapping their Unicode assignments";
+    homepage = "https://github.com/twardoch/fonttools-opentype-feature-freezer";
+    license = lib.licenses.asl20;
+    mainProgram = "pyftfeatfreeze";
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
--- a/pkgs/development/python-modules/paintcompiler/default.nix
+++ b/pkgs/development/python-modules/paintcompiler/default.nix
@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  fonttools,
+  black,
+}:
+
+buildPythonPackage rec {
+  pname = "paintcompiler";
+  version = "0.3.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simoncozens";
+    repo = "paintcompiler";
+    rev = "v${version}";
+    hash = "sha256-dmVBQUUyFc71zq8fXBQ4ii/llrGdtUCOponCzSeut6g=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    fonttools
+    black
+  ];
+
+  pythonImportsCheck = [
+    "paintcompiler"
+    "paintdecompiler"
+  ];
+
+  meta = {
+    description = "Paint compiler for COLRv1 fonts";
+    homepage = "https://github.com/simoncozens/paintcompiler";
+    license = lib.licenses.asl20;
+    mainProgram = "paintcompiler";
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "pysmlight";
-  version = "0.1.0";
+  version = "0.1.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "smlight-tech";
    repo = "pysmlight";
    rev = "refs/tags/v${version}";
-    hash = "sha256-qpE2bKEuCfhELKtYEstGAL5h01J/8qH3mE5c0LQtaHE=";
+    hash = "sha256-b1f17jOEDQFtwBJa2zhbI8j2rRoMNJy8/WsVWanf6BI=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/pysqueezebox/default.nix
+++ b/pkgs/development/python-modules/pysqueezebox/default.nix
@ -1,29 +1,36 @@
 {
  lib,
  aiohttp,
+  async-timeout,
  buildPythonPackage,
  fetchFromGitHub,
  pytest-asyncio,
  pytestCheckHook,
  pythonAtLeast,
  pythonOlder,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "pysqueezebox";
-  version = "0.8.1";
-  format = "setuptools";
+  version = "0.9.2";
+  pyproject = true;

-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.10";

  src = fetchFromGitHub {
    owner = "rajlaud";
-    repo = pname;
+    repo = "pysqueezebox";
    rev = "refs/tags/v${version}";
-    hash = "sha256-d+8/YyA6tTBxZpiR9pu/5K1v0FOiSrR7RZ7MMBwOzdA=";
+    hash = "sha256-gHv1dSWU0erzesneodMhCR1LQYutpDVithZ5M1lgk3I=";
  };

-  propagatedBuildInputs = [ aiohttp ];
+  build-system = [ setuptools ];
+
+  dependencies = [
+    async-timeout
+    aiohttp
+  ];

  nativeCheckInputs = [
    pytest-asyncio
@ -45,6 +52,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Asynchronous library to control Logitech Media Server";
    homepage = "https://github.com/rajlaud/pysqueezebox";
+    changelog = "https://github.com/rajlaud/pysqueezebox/releases/tag/v${version}";
    license = licenses.asl20;
    maintainers = with maintainers; [ nyanloutre ];
  };
--- a/pkgs/development/python-modules/python-gnupg/default.nix
+++ b/pkgs/development/python-modules/python-gnupg/default.nix
@ -9,13 +9,13 @@

 buildPythonPackage rec {
  pname = "python-gnupg";
-  version = "0.5.2";
+  version = "0.5.3";

  format = "pyproject";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-AdgBOTHJ+j9Fgku+pwVMA9bhHyWKcufghuFo28uRhUw=";
+    hash = "sha256-KQ2N25zWPfls/pKEubJl8Z/W4UXlWC3Fj9cnHwJtCkc=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/ufomerge/default.nix
+++ b/pkgs/development/python-modules/ufomerge/default.nix
@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonRelaxDepsHook,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  fonttools,
+  fontfeatures,
+  ufolib2,
+}:
+
+buildPythonPackage rec {
+  pname = "ufomerge";
+  version = "1.7.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "ufomerge";
+    rev = "refs/tags/${version}";
+    hash = "sha256-0izeb2PeGIYbzzQ+/K0Dz/9fVWFcPizQI39X/EQF5bU=";
+  };
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+
+  pythonRelaxDeps = [ "fonttools" ];
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    fonttools
+    ufolib2
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    fontfeatures
+  ];
+
+  disabledTestPaths = [
+    # Failing due to fonttools being to old
+    "tests/test_layout.py"
+  ];
+
+  pythonImportsCheck = [ "ufomerge" ];
+
+  meta = {
+    description = "Command line utility and Python library that merges two UFO source format fonts into a single file";
+    homepage = "https://github.com/googlefonts/ufomerge";
+    changelog = "https://github.com/googlefonts/ufomerge/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
--- a/pkgs/development/python-modules/vttlib/default.nix
+++ b/pkgs/development/python-modules/vttlib/default.nix
@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  fonttools,
+  pyparsing,
+  ufolib2,
+  ufo2ft,
+}:
+
+buildPythonPackage rec {
+  pname = "vttlib";
+  version = "0.12.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "daltonmaag";
+    repo = "vttLib";
+    rev = "v${version}";
+    hash = "sha256-ChsuzeFRQFDYGlAE4TWzE+et7yGLOfha1VqGcOdayOs=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    fonttools
+    pyparsing
+    ufolib2
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    ufo2ft
+  ];
+
+  pythonImportsCheck = [ "vttLib" ];
+
+  meta = {
+    description = "Dump, merge and compile Visual TrueType data in UFO3 with FontTools";
+    homepage = "https://github.com/daltonmaag/vttLib";
+    changelog = "https://github.com/daltonmaag/vttLib/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
--- a/pkgs/development/tools/protoc-gen-connect-go/default.nix
+++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "protoc-gen-connect-go";
-  version = "1.16.2";
+  version = "1.17.0";

  src = fetchFromGitHub {
    owner = "connectrpc";
    repo = "connect-go";
    rev = "refs/tags/v${version}";
-    hash = "sha256-Ej8ya2sKtRVRQdMr63YpPbqzwtV0ZsqO+7xiif3gFr0=";
+    hash = "sha256-GF7J21Y27LmKuDjuk2omQo2xV5pDo2GQXyu9SLwG0fs=";
  };

-  vendorHash = "sha256-OKTRxExgJ2V3736fIVvQX3FEa44jGngwCi2D/uk0F58=";
+  vendorHash = "sha256-j5T1Ho3K0kPZOo5LA6Md06W/gF6DmEElGt9BvceBtTo=";

  subPackages = [
    "cmd/protoc-gen-connect-go"
--- a/pkgs/development/tools/twilio-cli/default.nix
+++ b/pkgs/development/tools/twilio-cli/default.nix
@ -2,11 +2,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "twilio-cli";
-  version = "5.22.0";
+  version = "5.22.1";

  src = fetchzip {
    url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-6VGxfbo/44iOuG5VG1uevgeRrgP0ThyrNts1iR5VLCk=";
+    hash = "sha256-PxAc9sC44HBcm3Zv5dsN35cTZWfSYP0F46PFZ48xhrw=";
  };

  buildInputs = [ nodejs-slim ];
--- a/pkgs/games/gogdl/default.nix
+++ b/pkgs/games/gogdl/default.nix
@ -10,14 +10,14 @@

 buildPythonApplication rec {
  pname = "gogdl";
-  version = "1.1.1";
+  version = "1.1.2";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "Heroic-Games-Launcher";
    repo = "heroic-gogdl";
-    rev = "b1d9792f4b6c60382a88f09d03d6ed63afcc0310";
-    hash = "sha256-/J50pRbc3iua86HES/3RUIeamz/abh8wo0c/yegC4cM=";
+    rev = "1ff09820915f855ea764c6e49ea2def63e86b3bb";
+    hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0=";
  };

  disabled = pythonOlder "3.8";
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@ -6,11 +6,11 @@

 stdenv.mkDerivation rec {
  pname = "sgt-puzzles";
-  version = "20240909.53ceb98";
+  version = "20240911.cd97968";

  src = fetchurl {
    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-    hash = "sha256-BRbTm6dnogzkAVYZjQ8/YTEB4A8edNa2yymR3KlqAE4=";
+    hash = "sha256-l1QDe/PRQnaEBenR3NcSthtDzCcQ1ZOGz6RCserGfjs=";
  };

  sgt-puzzles-menu = fetchurl {
--- a/pkgs/os-specific/darwin/raycast/default.nix
+++ b/pkgs/os-specific/darwin/raycast/default.nix
@ -11,12 +11,12 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "raycast";
-  version = "1.82.5";
+  version = "1.83.1";

  src = fetchurl {
    name = "Raycast.dmg";
    url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
-    hash = "sha256-wqX61h6iF3yhZePLvtGL+gsGOrRIwZ1w2i1F7M52bsw=";
+    hash = "sha256-3EJAhjMEkQgyGMshCeV7Ci//tflEbhcOOFIdAsTIfh0=";
  };

  dontPatch = true;
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix
@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
  owner = "AlexxIT";
  domain = "xiaomi_gateway3";
-  version = "4.0.5";
+  version = "4.0.6";

  src = fetchFromGitHub {
    owner = "AlexxIT";
    repo = "XiaomiGateway3";
    rev = "v${version}";
-    hash = "sha256-C8aY23e6iWANbhCRQYNHx+3fomVO+7qdxj+qfv+K3JM=";
+    hash = "sha256-E3BekX0Xbp1R36+dYmOlsI2BTrdGjFsMoYYRIiBi1qU=";
  };

  propagatedBuildInputs = [ zigpy ];
@ -25,7 +25,7 @@ buildHomeAssistantComponent rec {
  passthru.updateScript = nix-update-script { };

  meta = with lib; {
-    changelog = "https://github.com/AlexxIT/XiaomiGateway3/releases/tag/v{version}";
+    changelog = "https://github.com/AlexxIT/XiaomiGateway3/releases/tag/v${version}";
    description = "Home Assistant custom component for control Xiaomi Multimode Gateway (aka Gateway 3), Xiaomi Multimode Gateway 2, Aqara Hub E1 on default firmwares over LAN";
    homepage = "https://github.com/AlexxIT/XiaomiGateway3";
    maintainers = with maintainers; [ azuwis ];
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@ -12,16 +12,16 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.40.5.8921-836b34c27";
+  version = "1.41.0.8992-8463ad060";
  pname = "plexmediaserver";

  # Fetch the source
  src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
    url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-    sha256 = "1jf47mmwvvj4c64ksbvnx3g14x7qn9h08p3xbixha7nk4nhxpqcv";
+    sha256 = "1hv8bg2cy1s6cn1yp5s75kma5v2fr3dncbslglvpn3srba1xafgz";
  } else fetchurl {
    url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-    sha256 = "0fia2d6gxlxv1my5031wnp3ihc3knfra1yrwadz44khh03zkvxq7";
+    sha256 = "0gwwlh47rfnayra3k8lwi794wiayl30crjjvzhqkg5zad77lkl4m";
  };

  outputs = [ "out" "basedb" ];
--- a/pkgs/tools/backup/conserve/default.nix
+++ b/pkgs/tools/backup/conserve/default.nix
@ -5,16 +5,23 @@

 rustPlatform.buildRustPackage rec {
  pname = "conserve";
-  version = "23.11.0";
+  version = "24.8.0";

  src = fetchFromGitHub {
    owner = "sourcefrog";
    repo = "conserve";
    rev = "v${version}";
-    hash = "sha256-Ck2+3etwfZiDMZHzI2hIBuUKn7L0ZTGEe9yJjXjoRIM=";
+    hash = "sha256-rdZTx0wFFtWt3EcpvWHY6m+8TEHEj53vhVpdRp5wbos=";
  };

-  cargoHash = "sha256-tMj1icGNTFpouts1TE6BIiABexV3vmOW9r5Y/7ynUMM=";
+  cargoHash = "sha256-IP9x3n5RdI+TKOhMBWEfw9P2CROcC0SmEsmMVaXjiDE=";
+
+  checkFlags = [
+    # expected to panic if unix user has no secondary group,
+    # which is the case in the nix sandbox
+    "--skip=test_fixtures::test::arbitrary_secondary_group_is_found"
+    "--skip=chgrp_reported_as_changed"
+  ];

  meta = with lib; {
    description = "Robust portable backup tool in Rust";
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@ -1,26 +1,46 @@
-{ lib, stdenv, fetchurl, makeWrapper
-, gawk, gnused, util-linux, file
-, wget, python3, qemu-utils
-, e2fsprogs, cdrkit
-, gptfdisk }:
-
+{ lib
+, stdenv
+, fetchFromGitHub
+, gitUpdater
+, makeWrapper
+, gawk
+, gnused
+, util-linux
+, file
+, wget
+, python3
+, qemu-utils
+, e2fsprogs
+, cdrkit
+, gptfdisk
+}:
 let
  # according to https://packages.debian.org/sid/cloud-image-utils + https://packages.debian.org/sid/admin/cloud-guest-utils
  guestDeps = [
-    e2fsprogs gptfdisk gawk gnused util-linux
+    e2fsprogs
+    gptfdisk
+    gawk
+    gnused
+    util-linux
  ];
  binDeps = guestDeps ++ [
-    wget file qemu-utils cdrkit
+    wget
+    file
+    qemu-utils
+    cdrkit
  ];
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
  # NOTICE: if you bump this, make sure to run
  # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
  # growpart is needed in initrd in nixos/system/boot/grow-partition.nix
  pname = "cloud-utils";
-  version = "0.32";
-  src = fetchurl {
-    url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz";
-    sha256 = "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk";
+  version = "0.33";
+  src = fetchFromGitHub {
+    owner = "canonical";
+    repo = "cloud-utils";
+    rev = "refs/tags/${version}";
+    hash = "sha256-YqfkmYclPZu6Mc2bFYxtiuH7uvfa3V4YlD0aHuKn1hw=";
  };
  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ python3 ];
@ -29,7 +49,7 @@ in stdenv.mkDerivation rec {
  # $guest output contains all executables needed for cloud-init and $out the rest + $guest
  # This is similar to debian's package split into cloud-image-utils and cloud-guest-utils
  # The reason is to reduce the closure size
-  outputs = [ "out" "guest"];
+  outputs = [ "out" "guest" ];

  postFixup = ''
    moveToOutput bin/ec2metadata $guest
@ -48,7 +68,11 @@ in stdenv.mkDerivation rec {

  dontBuild = true;

+  passthru.updateScript = gitUpdater { };
+
  meta = with lib; {
+    description = "Useful set of utilities for interacting with a cloud";
+    homepage = "https://github.com/canonical/cloud-utils";
    platforms = platforms.unix;
    license = licenses.gpl3;
  };
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@ -21,14 +21,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
  pname = "esphome";
-  version = "2024.8.3";
+  version = "2024.9.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-AeiEP1D2u2u8LMNKdBvoA2M3uO6Z9oSG2i5HwGin80M=";
+    hash = "sha256-K28H2kbfiebJfW31CF3M+Vi823wFPWNk6qLPlSaljkk=";
  };

  nativeBuildInputs = with python.pkgs; [
--- a/pkgs/tools/misc/ytarchive/default.nix
+++ b/pkgs/tools/misc/ytarchive/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "ytarchive";
-  version = "0.4.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "Kethsar";
    repo = "ytarchive";
    rev = "v${version}";
-    hash = "sha256-mQgpwuTIEHeDv/PzBHpK1sraxFj8Ef3y8vN5bLw5E94=";
+    hash = "sha256-Y1frd7iJJuNFvLL/C1Y+RrqYC/1LF7P3J9rkPAThp9c=";
  };

-  vendorHash = "sha256-sjwQ/zEYJRkeWUDB7TzV8z+kET8lVRnQkXYbZbcUeHY=";
+  vendorHash = "sha256-hVAiWJKdDQB+6UlARFdjVATCMiGrEK2US62KAxCquvU=";

  nativeBuildInputs = [ makeBinaryWrapper ];

--- a/pkgs/tools/networking/sing-box/default.nix
+++ b/pkgs/tools/networking/sing-box/default.nix
@ -11,13 +11,13 @@

 buildGoModule rec {
  pname = "sing-box";
-  version = "1.9.5";
+  version = "1.9.6";

  src = fetchFromGitHub {
    owner = "SagerNet";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-yPIlijm5NBtBT2+bkS0sJvPb/Lwqq/ZOcl5g848BvRA=";
+    hash = "sha256-A9FfATNCS3UaW6YLORIApsgj0VK2jPyg+Ha2gcq6Keo=";
  };

  vendorHash = "sha256-/lp+3mPkGMABpvnxqpuC/7NiKrmcEWYQ80Wb7Ng1eBI=";
--- a/pkgs/tools/nix/nixos-install-tools/default.nix
+++ b/pkgs/tools/nix/nixos-install-tools/default.nix
@ -6,6 +6,8 @@
  # TODO: replace indirect self-reference by proper self-reference
  #       https://github.com/NixOS/nixpkgs/pull/119942
  nixos-install-tools,
+  nixos-install,
+  nixos-enter,
  runCommand,
  nixosTests,
  binlore,
@ -18,9 +20,8 @@ in
  name = "nixos-install-tools-${version}";
  paths = lib.attrValues {
    # See nixos/modules/installer/tools/tools.nix
-    inherit (config.system.build)
-      nixos-install nixos-generate-config nixos-enter;
-
+    inherit (config.system.build) nixos-generate-config;
+    inherit nixos-install nixos-enter;
    inherit (config.system.build.manual) nixos-configuration-reference-manpage;
  };

--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@ -3,7 +3,6 @@
 , fetchFromGitHub
 , bzip2
 , nixVersions
-, perl
 , makeWrapper
 , nixosTests
 , fetchpatch
@ -13,6 +12,7 @@ let
  rev = "77ffa33d83d2c7c6551c5e420e938e92d72fec24";
  sha256 = "sha256-MJRdVO2pt7wjOu5Hk0eVeNbk5bK5+Uo/Gh9XfO4OlMY=";
  nix = nixVersions.nix_2_24;
+  inherit (nix.perl-bindings) perl;
 in

 stdenv.mkDerivation {
--- a/pkgs/tools/package-management/nix/nix-perl.nix
+++ b/pkgs/tools/package-management/nix/nix-perl.nix
@ -87,4 +87,6 @@ in stdenv.mkDerivation (finalAttrs: {
  ];

  preConfigure = "export NIX_STATE_DIR=$TMPDIR";
+
+  passthru = { inherit perl; };
 })
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@ -10,13 +10,13 @@

 buildGoModule rec {
  pname = "gitleaks";
-  version = "8.19.0";
+  version = "8.19.2";

  src = fetchFromGitHub {
    owner = "zricethezav";
    repo = "gitleaks";
    rev = "refs/tags/v${version}";
-    hash = "sha256-p4Va6qI/khXetN1ECRvFrsza5vqPVKKoUobhERWxDhI=";
+    hash = "sha256-VC8Bf6jcxXdBws7IParh9Srk34JiYVx5Tk2LLilrNJ4=";
  };

  vendorHash = "sha256-DgCtWRo5KNuFCdhGJvzoH2v8n7mIxNk8eHyZFPUPo24=";
--- a/pkgs/tools/security/graphw00f/default.nix
+++ b/pkgs/tools/security/graphw00f/default.nix
@ -1,23 +1,22 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:

 python3.pkgs.buildPythonApplication rec {
  pname = "graphw00f";
-  version = "1.1.17";
+  version = "1.1.18";
  format = "other";

  src = fetchFromGitHub {
    owner = "dolevf";
-    repo = pname;
+    repo = "graphw00f";
    rev = "refs/tags/${version}";
-    hash = "sha256-VeTFwn4PANGoW2Cb/IJ1KJb4YkjjDpaU7DLv0YwRwDU=";
+    hash = "sha256-gM6I3TLCuVKO1dTHl2jrXtmLOv29pTqrV18nGW5TYFY=";
  };

-  propagatedBuildInputs = with python3.pkgs; [
-    requests
-  ];
+  dependencies = with python3.pkgs; [ requests ];

  installPhase = ''
    runHook preInstall
@ -28,11 +27,12 @@ python3.pkgs.buildPythonApplication rec {

    runHook postInstall
  '';
+
  meta = with lib; {
    description = "GraphQL Server Engine Fingerprinting utility";
-    mainProgram = "graphw00f";
    homepage = "https://github.com/dolevf/graphw00f";
    license = licenses.bsd3;
    maintainers = with maintainers; [ fab ];
+    mainProgram = "graphw00f";
  };
 }
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchpatch, fetchurl, boost, updateAutotoolsGnuConfigScriptsHook }:
+{ lib, stdenv, fetchpatch, fetchurl, boost, updateAutotoolsGnuConfigScriptsHook, llvmPackages }:

 stdenv.mkDerivation rec {
  pname = "source-highlight";
@ -46,7 +46,10 @@ stdenv.mkDerivation rec {
  # necessary to build on FreeBSD native pending inclusion of
  # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
  nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
-  buildInputs = [ boost ];
+  buildInputs = [ boost ]
+    ++ lib.optional (stdenv.targetPlatform.useLLVM or false) (llvmPackages.compiler-rt.override {
+      doFakeLibgcc = true;
+    });

  configureFlags = [
    "--with-boost=${boost.out}"
@ -71,4 +74,7 @@ stdenv.mkDerivation rec {
    platforms = platforms.unix;
    maintainers = with maintainers; [ SuperSandro2000 ];
  };
+} // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) {
+  # Force linking to "libgcc" so tests pass
+  NIX_CFLAGS_COMPILE = "-lgcc";
 }
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -1181,6 +1181,7 @@ mapAliases ({
  optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12
  orchis = orchis-theme; # Added 2021-06-09
  oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15
+  onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20
  onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03
  onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
  onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -2116,7 +2116,7 @@ with pkgs;

  bitbucket-server-cli = callPackage ../applications/version-management/bitbucket-server-cli { };

-  bump2version = python3Packages.callPackage ../applications/version-management/bump2version { };
+  bump2version = with python3Packages; toPythonApplication bump2version;

  cgit = callPackage ../applications/version-management/cgit { };

@ -9499,7 +9499,7 @@ with pkgs;
    pythonPackages = python3Packages;
  };

-  nanoemoji = python3Packages.callPackage ../tools/misc/nanoemoji { };
+  nanoemoji = with python3Packages; toPythonApplication nanoemoji;

  nagelfar = callPackage ../development/tools/nagelfar { };

--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -1671,6 +1671,8 @@ self: super: with self; {

  black-macchiato = callPackage ../development/python-modules/black-macchiato { };

+  blackrenderer = callPackage ../development/python-modules/blackrenderer { };
+
  bleach = callPackage ../development/python-modules/bleach { };

  bleach-allowlist = callPackage ../development/python-modules/bleach-allowlist { };
@ -1910,6 +1912,10 @@ self: super: with self; {

  buildcatrust = callPackage ../development/python-modules/buildcatrust { };

+  bump2version = callPackage ../development/python-modules/bump2version { };
+
+  bumpfontversion = callPackage ../development/python-modules/bumpfontversion { };
+
  bumps = callPackage ../development/python-modules/bumps { };

  bunch = callPackage ../development/python-modules/bunch { };
@ -3142,6 +3148,8 @@ self: super: with self; {

  diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };

+  diffenator2 = callPackage ../development/python-modules/diffenator2 { };
+
  diffimg = callPackage ../development/python-modules/diffimg { };

  diffsync = callPackage ../development/python-modules/diffsync { };
@ -5004,6 +5012,8 @@ self: super: with self; {

  gfsubsets = callPackage ../development/python-modules/gfsubsets { };

+  gftools = callPackage ../development/python-modules/gftools { };
+
  gguf = callPackage ../development/python-modules/gguf { };

  ghapi = callPackage ../development/python-modules/ghapi { };
@ -8673,6 +8683,8 @@ self: super: with self; {

  nanobind = callPackage ../development/python-modules/nanobind { };

+  nanoemoji = callPackage ../development/python-modules/nanoemoji { };
+
  nanoid = callPackage ../development/python-modules/nanoid { };

  nanoleaf = callPackage ../development/python-modules/nanoleaf { };
@ -8983,6 +8995,8 @@ self: super: with self; {
    inherit (pkgs) notmuch;
  };

+  notobuilder = callPackage ../development/python-modules/notobuilder { };
+
  nototools = callPackage ../development/python-modules/nototools { };

  notus-scanner = callPackage ../development/python-modules/notus-scanner { };
@ -9510,6 +9524,8 @@ self: super: with self; {
  paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { };
  paho-mqtt = paho-mqtt_1;

+  paintcompiler = callPackage ../development/python-modules/paintcompiler { };
+
  palace = callPackage ../development/python-modules/palace { };

  palettable = callPackage ../development/python-modules/palettable { };
@ -9846,6 +9862,8 @@ self: super: with self; {

  openapi-core = callPackage ../development/python-modules/openapi-core { };

+  opentype-feature-freezer = callPackage ../development/python-modules/opentype-feature-freezer { };
+
  openusd = callPackage ../development/python-modules/openusd {
    alembic = pkgs.alembic;
  };
@ -16798,6 +16816,8 @@ self: super: with self; {

  ufolint = callPackage ../development/python-modules/ufolint { };

+  ufomerge = callPackage ../development/python-modules/ufomerge { };
+
  ufonormalizer = callPackage ../development/python-modules/ufonormalizer { };

  ufoprocessor = callPackage ../development/python-modules/ufoprocessor { };
@ -17171,6 +17191,8 @@ self: super: with self; {
    enablePython = true;
  });

+  vttlib = callPackage ../development/python-modules/vttlib { };
+
  vulcan-api = callPackage ../development/python-modules/vulcan-api { };

  vultr = callPackage ../development/python-modules/vultr { };