Merge master into staging-next

2024-11-25 08:23:09 +00:00 · 2024-11-11 18:04:18 +00:00 · 2024-11-11 18:04:18 +00:00 · 88f2bd466e
commit 88f2bd466e
parent 1c3064c95b 71091397cc
70 changed files with 2978 additions and 264 deletions
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -236,6 +236,8 @@

 - `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes.

+- `mutmut` has been updated to version 3.0.5.
+
 - `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.

 - `bluemap` has changed the format used to store map tiles, and the database layout has been heavily modified. Upstream recommends a clean reinstallation: <https://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v5.2>. Unless you are using an SQL storage backend, this should only entail deleting the contents of `config.services.bluemap.coreSettings.data` (defaults to `/var/lib/bluemap`) and `config.services.bluemap.webRoot` (defaults to `/var/lib/bluemap/web`).
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@ -18,6 +18,8 @@ in

      enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";

+      package = lib.mkPackageOption pkgs "udisks2" {};
+
      mountOnMedia = lib.mkOption {
        type = lib.types.bool;
        default = false;
@ -67,11 +69,11 @@ in

  config = lib.mkIf config.services.udisks2.enable {

-    environment.systemPackages = [ pkgs.udisks2 ];
+    environment.systemPackages = [ cfg.package ];

    environment.etc = (lib.mapAttrs' (name: value: lib.nameValuePair "udisks2/${name}" { source = value; } ) configFiles) // (
    let
-      libblockdev = pkgs.udisks2.libblockdev;
+      libblockdev = cfg.package.libblockdev;
      majorVer = lib.versions.major libblockdev.version;
    in {
      # We need to make sure /etc/libblockdev/@major_ver@/conf.d is populated to avoid
@ -82,18 +84,18 @@ in

    security.polkit.enable = true;

-    services.dbus.packages = [ pkgs.udisks2 ];
+    services.dbus.packages = [ cfg.package ];

    systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]
      ++ lib.optional cfg.mountOnMedia "D! /media 0755 root root -";

-    services.udev.packages = [ pkgs.udisks2 ];
+    services.udev.packages = [ cfg.package ];

    services.udev.extraRules = lib.optionalString cfg.mountOnMedia ''
      ENV{ID_FS_USAGE}=="filesystem", ENV{UDISKS_FILESYSTEM_SHARED}="1"
    '';

-    systemd.packages = [ pkgs.udisks2 ];
+    systemd.packages = [ cfg.package ];
  };

 }
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@ -255,6 +255,7 @@ in
        Grafana settings. See <https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/>
        for available options. INI format is used.
      '';
+      default = { };
      type = types.submodule {
        freeformType = settingsFormatIni.type;

--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "caneda";
-  version = "0.3.1";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "Caneda";
    repo = "Caneda";
    rev = version;
-    sha256 = "0hx8qid50j9xvg2kpbpqmbdyakgyjn6m373m1cvhp70v2gp1v8l2";
+    sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "docker-compose";
-  version = "2.29.7";
+  version = "2.30.0";

  src = fetchFromGitHub {
    owner = "docker";
    repo = "compose";
    rev = "v${version}";
-    hash = "sha256-6ksZAGVAFnLwPnCXlCtp4cWfxzJRp/bfVkpvp3Z6fiQ=";
+    hash = "sha256-L31O/Hzn0jbu5VqVB18PZUSJPGfqU+73Jx3e1njxGiI=";
  };

  postPatch = ''
@ -16,7 +16,7 @@ buildGoModule rec {
    rm -rf e2e/
  '';

-  vendorHash = "sha256-B2ywdZjp7h7eFYNJ4wXmAdbOxc8ftGqHnLmDvzQASJE=";
+  vendorHash = "sha256-j9gV1PNTqVRctbhnYRydGwJvBpb9uQCxcdBrQCdbBrg=";

  ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

--- a/pkgs/build-support/php/builders/v1/build-composer-repository.nix
+++ b/pkgs/build-support/php/builders/v1/build-composer-repository.nix
@ -49,7 +49,7 @@ let
      composerNoScripts = previousAttrs.composerNoScripts or true;
      composerStrictValidation = previousAttrs.composerStrictValidation or true;

-      name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository";
+      name = "${previousAttrs.pname}-composer-repository-${previousAttrs.version}";

      # See https://github.com/NixOS/nix/issues/6660
      dontPatchShebangs = previousAttrs.dontPatchShebangs or true;
--- a/pkgs/build-support/php/builders/v2/build-composer-vendor.nix
+++ b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix
@ -34,7 +34,7 @@ let
      composerNoScripts = previousAttrs.composerNoScripts or true;
      composerStrictValidation = previousAttrs.composerStrictValidation or true;

-      name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository";
+      name = "${previousAttrs.pname}-composer-repository-${previousAttrs.version}";

      # See https://github.com/NixOS/nix/issues/6660
      dontPatchShebangs = previousAttrs.dontPatchShebangs or true;
--- a/pkgs/by-name/al/alejandra/package.nix
+++ b/pkgs/by-name/al/alejandra/package.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "alejandra";
-  version = "3.0.0";
+  version = "3.1.0";

  src = fetchFromGitHub {
    owner = "kamadorueda";
    repo = "alejandra";
    rev = version;
-    hash = "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI=";
+    hash = "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A=";
  };

-  cargoHash = "sha256-tF8E9mnvkTXoViVss9cNjpU4UkEsARp4RtlxKWq55hc=";
+  cargoHash = "sha256-s3932c/k9UTbJ79fBQBRDILN2VWNM1tNEV7cW4fQK74=";

  passthru.tests = {
    version = testers.testVersion { package = alejandra; };
--- a/pkgs/by-name/bo/bosh-cli/package.nix
+++ b/pkgs/by-name/bo/bosh-cli/package.nix
@ -8,13 +8,13 @@
 buildGoModule rec {
  pname = "bosh-cli";

-  version = "7.8.0";
+  version = "7.8.2";

  src = fetchFromGitHub {
    owner = "cloudfoundry";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-DiW7Vq1rfkOqMM3133mIRmRyFDjFITRkXqY34HMdZtc=";
+    sha256 = "sha256-ABoqJr2HDhox1ylTvAf5sQkYYzEWAnmXWavw0jXrRgo=";
  };
  vendorHash = null;

--- a/pkgs/by-name/cb/cbmp/package-lock.json
+++ b/pkgs/by-name/cb/cbmp/package-lock.json
--- a/pkgs/by-name/cb/cbmp/package.nix
+++ b/pkgs/by-name/cb/cbmp/package.nix
@ -0,0 +1,41 @@
+{
+  buildNpmPackage,
+  fetchFromGitHub,
+  lib,
+}:
+
+buildNpmPackage rec {
+  pname = "cbmp";
+  version = "1.1.1";
+
+  # note: updating notes
+  # - use `prefetch-npm-deps` package for src hash
+  # - use `npm install --package-lock-only`
+  #   in the cbmp repo for package-lock generation
+  # - update npmDepsHash
+
+  src = fetchFromGitHub {
+    owner = "ful1e5";
+    repo = "cbmp";
+    rev = "v${version}";
+    hash = "sha256-vOEz2KGJLCiiX+Or9y0JE9UF7sYbwaSCVm5iBv4jIdI=";
+  };
+
+  npmDepsHash = "sha256-zfZAZqnkKwsGkwGgfPvb3me4tFgAofE5H3d23mdAtqY=";
+
+  env = {
+    PUPPETEER_SKIP_DOWNLOAD = true;
+  };
+
+  postPatch = ''
+    cp ${./package-lock.json} package-lock.json
+  '';
+
+  meta = {
+    description = "CLI App for converting cursor svg file to png";
+    homepage = "https://github.com/ful1e5/cbmp";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.mrtnvgr ];
+    mainProgram = "cbmp";
+  };
+}
--- a/pkgs/by-name/co/composefs/package.nix
+++ b/pkgs/by-name/co/composefs/package.nix
@ -23,22 +23,30 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "composefs";
-  version = "1.0.6";
+  version = "1.0.7";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "composefs";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-9YEY7oTjWwVT2KbzTOOc6sJIGEAkdLSKDf1noF1cYuA=";
+    hash = "sha256-kbXmDdyRrtsERkUomjZUWP3QC2q27AWUTc/J2jCSXg4=";
  };

  strictDeps = true;
  outputs = [ "out" "lib" "dev" ];

-  postPatch = lib.optionalString installExperimentalTools ''
-    substituteInPlace tools/meson.build \
-      --replace-fail "install : false" "install : true"
-  '';
+  postPatch =
+    # 'both_libraries' as an install target always builds both versions.
+    #  This results in double disk usage for normal builds and broken static builds,
+    #  so we replace it with the regular library target.
+    ''
+      substituteInPlace libcomposefs/meson.build \
+        --replace-fail "both_libraries" "library"
+    ''
+    + lib.optionalString installExperimentalTools ''
+      substituteInPlace tools/meson.build \
+        --replace-fail "install : false" "install : true"
+    '';

  nativeBuildInputs = [ meson ninja go-md2man pkg-config ];
  buildInputs = [ openssl ]
@ -74,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
    description = "File system for mounting container images";
    homepage = "https://github.com/containers/composefs";
    changelog = "https://github.com/containers/composefs/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [ gpl3Plus lgpl21Plus ];
+    license = with lib.licenses; [ gpl2Only asl20 ];
    maintainers = with lib.maintainers; [ kiskae ];
    mainProgram = "mkcomposefs";
    pkgConfigModules = [ "composefs" ];
--- a/pkgs/by-name/cp/cppreference-doc/package.nix
+++ b/pkgs/by-name/cp/cppreference-doc/package.nix
@ -2,11 +2,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "cppreference-doc";
-  version = "20240610";
+  version = "20241110";

  src = fetchurl {
    url = "https://github.com/PeterFeicht/${pname}/releases/download/v${version}/html-book-${version}.tar.xz";
-    hash = "sha256-vCQSper39glNTrcPdlvfj2SeZUqKq/IBYMWoFpdoR2E=";
+    hash = "sha256-Qx6Ahi63D9R5OmDX07bBPIYFKEl4+eoFKVcuj9FWLMY=";
  };

  sourceRoot = ".";
--- a/pkgs/by-name/do/dooit/package.nix
+++ b/pkgs/by-name/do/dooit/package.nix
@ -5,53 +5,54 @@
  python311,
  testers,
  nix-update-script,
+  extraPackages ? [ ],
 }:
 let
  python3 = python311;
 in
 python3.pkgs.buildPythonApplication rec {
  pname = "dooit";
-  version = "2.2.0";
+  version = "3.0.2";
  pyproject = true;

  src = fetchFromGitHub {
-    owner = "kraanzu";
+    owner = "dooit-org";
    repo = "dooit";
-    rev = "v${version}";
-    hash = "sha256-GtXRzj+o+FClleh73kqelk0JrSyafZhf847lX1BiS9k=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-DPmCADFduGc5n+6q9zl0f4x9C6RmzLvBeYh2j0ZSpH0=";
  };

  build-system = with python3.pkgs; [ poetry-core ];

  pythonRelaxDeps = [
    "tzlocal"
+    "textual"
+    "sqlalchemy"
  ];

-  propagatedBuildInputs = with python3.pkgs; [
-    appdirs
-    pyperclip
-    python-dateutil
-    pyyaml
-    (textual.overridePythonAttrs (oldAttrs: {
-      version = "0.47.1";
-      src = fetchFromGitHub {
-        owner = "Textualize";
-        repo = "textual";
-        rev = "refs/tags/v0.47.1";
-        hash = "sha256-RFaZKQ+0o6ZvfZxx95a1FjSHVJ0VOIAfzkdxYQXYBKU=";
-      };
-      disabledTests = [
-        "test_tracked_slugs"
-        "test_textual_env_var"
-        "test_register_language"
-        "test_register_language_existing_language"
-      ];
-    }))
-    tzlocal
-  ];
+  propagatedBuildInputs =
+    with python3.pkgs;
+    [
+      pyperclip
+      textual
+      pyyaml
+      python-dateutil
+      sqlalchemy
+      platformdirs
+      tzlocal
+      click
+    ]
+    ++ extraPackages;

-  # No tests available
-  doCheck = false;
+  # /homeless-shelter
+  preBuild = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  checkInputs = with python3.pkgs; [
+    pytestCheckHook
+    faker
+  ];

  passthru = {
    tests.version = testers.testVersion {
@ -64,8 +65,8 @@ python3.pkgs.buildPythonApplication rec {

  meta = with lib; {
    description = "TUI todo manager";
-    homepage = "https://github.com/kraanzu/dooit";
-    changelog = "https://github.com/kraanzu/dooit/blob/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/dooit-org/dooit";
+    changelog = "https://github.com/dooit-org/dooit/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [
      khaneliman
--- a/pkgs/by-name/ec/ecs-agent/package.nix
+++ b/pkgs/by-name/ec/ecs-agent/package.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "amazon-ecs-agent";
-  version = "1.87.0";
+  version = "1.87.1";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "aws";
    repo = pname;
-    hash = "sha256-JFEpwzeg+mcMBUYBenyWhYGE2J6iARz8oICZFlH1Azw=";
+    hash = "sha256-thgFlfEyjetNciBCIx1XFW4U59BL9TpRT9E7v4bac6s=";
  };

  vendorHash = null;
--- a/pkgs/by-name/fl/flat-remix-gnome/package.nix
+++ b/pkgs/by-name/fl/flat-remix-gnome/package.nix
@ -7,25 +7,25 @@
 let
  # make install will use dconf to find desktop background file uri.
  # consider adding an args to allow specify pictures manually.
-  # https://github.com/daniruiz/flat-remix-gnome/blob/20240721/Makefile#L38
+  # https://github.com/daniruiz/flat-remix-gnome/blob/20240922/Makefile#L38
  fake-dconf = writeScriptBin "dconf" "echo -n";
 in
 stdenv.mkDerivation rec {
  pname = "flat-remix-gnome";
-  version = "20240721";
+  version = "20240922";

  src = fetchFromGitHub {
    owner = "daniruiz";
    repo = pname;
    rev = version;
-    hash = "sha256-eWZ5gwu/ovtnXZEFlUfaHfpQ7O4oInMnu0PQZpK/c9U=";
+    hash = "sha256-/Md1CbEDe+N8Nu0WPrIUkEudqMvEARmHD9NtgE7sPLQ=";
  };

  nativeBuildInputs = [ glib fake-dconf ];
  makeFlags = [ "PREFIX=$(out)" ];

  # make install will back up this file, it will fail if the file doesn't exist.
-  # https://github.com/daniruiz/flat-remix-gnome/blob/20240721/Makefile#L56
+  # https://github.com/daniruiz/flat-remix-gnome/blob/20240922/Makefile#L56
  preInstall = ''
    mkdir -p $out/share/gnome-shell/
    touch $out/share/gnome-shell/gnome-shell-theme.gresource
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@ -1,17 +1,22 @@
-{ buildGo123Module, fetchFromGitHub, lib, installShellFiles }:
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  installShellFiles,
+}:

-buildGo123Module rec {
+buildGoModule rec {
  pname = "golangci-lint";
-  version = "1.61.0";
+  version = "1.62.0";

  src = fetchFromGitHub {
    owner = "golangci";
    repo = "golangci-lint";
    rev = "v${version}";
-    hash = "sha256-2YzVNOdasal27R92l6eVdeS81mAp0ZU6kYsC/Jfvkcg=";
+    hash = "sha256-9CT9+8wBjXflIYPtqTTMKaPySpDYGa0yUAhApcLIQ1k=";
  };

-  vendorHash = "sha256-mFDCRxbLq08yRd0ko3CCPJD2BZiCB0Gwd1g+/1oR6w8=";
+  vendorHash = "sha256-U79OfGm5EPuB8yTxLSLQKIBHuj/zzO4p5pXlvs+pVrU=";

  subPackages = [ "cmd/golangci-lint" ];

@ -19,7 +24,6 @@ buildGo123Module rec {

  ldflags = [
    "-s"
-    "-w"
    "-X main.version=${version}"
    "-X main.commit=v${version}"
    "-X main.date=19700101-00:00:00"
@ -38,6 +42,9 @@ buildGo123Module rec {
    changelog = "https://github.com/golangci/golangci-lint/blob/v${version}/CHANGELOG.md";
    mainProgram = "golangci-lint";
    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ SuperSandro2000 mic92 ];
+    maintainers = with maintainers; [
+      SuperSandro2000
+      mic92
+    ];
  };
 }
--- a/pkgs/by-name/gr/gradle-completion/package.nix
+++ b/pkgs/by-name/gr/gradle-completion/package.nix
@ -1,16 +1,26 @@
-{ lib, stdenv, fetchFromGitHub }:
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  installShellFiles,
+  gitUpdater,
+}:

-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "gradle-completion";
  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "gradle";
    repo = "gradle-completion";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    sha256 = "15b0692i3h8h7b95465b2aw9qf5qjmjag5n62347l8yl7zbhv3l2";
  };

+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
  strictDeps = true;

  # we just move two files into $out,
@ -18,20 +28,25 @@ stdenv.mkDerivation rec {
  preferLocalBuild = true;

  dontBuild = true;
+
  installPhase = ''
    runHook preInstall

-    mkdir -p $out
-    install -Dm0644 ./_gradle $out/share/zsh/site-functions/_gradle
-    install -Dm0644 ./gradle-completion.bash $out/share/bash-completion/completions/gradle
+    installShellCompletion --name gradle \
+      --bash gradle-completion.bash \
+      --zsh _gradle

    runHook postInstall
  '';

-  meta = with lib; {
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+  };
+
+  meta = {
    description = "Gradle tab completion for bash and zsh";
    homepage = "https://github.com/gradle/gradle-completion";
-    license = licenses.mit;
-    maintainers = [ ] ++ teams.java.members;
+    license = lib.licenses.mit;
+    maintainers = [ ] ++ lib.teams.java.members;
  };
-}
+})
--- a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
+++ b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "grafana-dash-n-grab";
-  version = "0.6.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "esnet";
    repo = "gdg";
-    sha256 = "sha256-47zKZnq7ADIAti4fjGj6ctoM5Qo6UzAX1aLf87TknkQ=";
+    sha256 = "sha256-oJ0wXBfanpYS95ET+7lpKzLdQG5g/uKFs5+Qd+hPjHo=";
  };

-  vendorHash = "sha256-XJSi+p++1QFfGk57trfIgyv0nWUm38H0n/qbJgV8lEM=";
+  vendorHash = "sha256-jnPnWcow5SiFHGfoAxBR8ncGHLyS7sFKNJT8YuUTg88=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/hw/hwatch/package.nix
+++ b/pkgs/by-name/hw/hwatch/package.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "hwatch";
-  version = "0.3.15";
+  version = "0.3.16";

  src = fetchFromGitHub {
    owner = "blacknon";
    repo = pname;
    rev = "refs/tags/${version}";
-    sha256 = "sha256-UmNxdp9acRCKnUsKw7Z9z3knRvVkqQ5atxR/dqpGBYE=";
+    sha256 = "sha256-H9bZr5/XWS3MuGJOdxHYDlErpW0Tc7QkgkCIifDTlgM=";
  };

-  cargoHash = "sha256-pEhogmK2WBj/PxcDtJs/H0XZhPiz3zCQMX2eUcAfnTE=";
+  cargoHash = "sha256-QMLtO0OQ+17H3QwpMGP9Fy4PxjPYOCd3pQ9k1BEPA5c=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/lp/lprobe/package.nix
+++ b/pkgs/by-name/lp/lprobe/package.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "lprobe";
-  version = "0.1.3";
+  version = "0.1.4";

  src = fetchFromGitHub {
    owner = "fivexl";
    repo = "lprobe";
    rev = "refs/tags/v${version}";
-    hash = "sha256-q7lH0aLgQNM4jrrrq2ua+pt4/VknxlzKzDH5J4MwjfA=";
+    hash = "sha256-WC0MDTyd5tRtSQ1LQsYJgV9CwJwtvnIO6tQnPrjpfcY=";
  };

-  vendorHash = "sha256-B3lcE33Ny+XE7nK/QlVcV8yYgzYWNBfoecuL+AcavSk=";
+  vendorHash = "sha256-Ot9eePv/bjOZJfOjTCOJGXCaM8hoO4ZUPrpec8lT/JY=";

  buildInputs = [
    libpcap
--- a/pkgs/development/tools/language-servers/lua-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix
@ -2,11 +2,17 @@
  lib,
  stdenv,
  fetchFromGitHub,
+
+  # nativeBuildInputs
  ninja,
  makeWrapper,
-  CoreFoundation,
-  Foundation,
-  ditto,
+
+  # buildInputs
+  apple-sdk_11,
+  darwinMinVersionHook,
+  rsync,
+
+  versionCheckHook,
  nix-update-script,
 }:

@ -17,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "luals";
    repo = "lua-language-server";
-    rev = finalAttrs.version;
+    rev = "refs/tags/${finalAttrs.version}";
    hash = "sha256-wyQ4oXGemoT5QVZughFKd386RjzlW4ArtQL0ofMnhpU=";
    fetchSubmodules = true;
  };
@ -28,36 +34,49 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    CoreFoundation
-    Foundation
-    ditto
+    # aligned_alloc
+    apple-sdk_11
+    (darwinMinVersionHook "10.15")
+    rsync
  ];

  postPatch =
    ''
      # filewatch tests are failing on darwin
      # this feature is not used in lua-language-server
-      sed -i /filewatch/d 3rd/bee.lua/test/test.lua
+      substituteInPlace 3rd/bee.lua/test/test.lua \
+        --replace-fail 'require "test_filewatch"' ""

      # flaky tests on linux
      # https://github.com/LuaLS/lua-language-server/issues/2926
-      sed -i /load-relative-library/d test/tclient/init.lua
+      substituteInPlace test/tclient/init.lua \
+        --replace-fail "require 'tclient.tests.load-relative-library'" ""

      pushd 3rd/luamake
    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin (
      # This package uses the program clang for C and C++ files. The language
      # is selected via the command line argument -std, but this do not work
      # in combination with the nixpkgs clang wrapper. Therefor we have to
      # find all c++ compiler statements and replace $cc (which expands to
      # clang) with clang++.
-      sed -i compile/ninja/macos.ninja \
-        -e '/c++/s,$cc,clang++,' \
-        -e '/test.lua/s,= .*,= true,' \
-        -e '/ldl/s,$cc,clang++,'
-      sed -i scripts/compiler/gcc.lua \
-        -e '/cxx_/s,$cc,clang++,'
-    '';
+      ''
+        sed -i compile/ninja/macos.ninja \
+          -e '/c++/s,$cc,clang++,' \
+          -e '/test.lua/s,= .*,= true,' \
+          -e '/ldl/s,$cc,clang++,'
+        sed -i scripts/compiler/gcc.lua \
+          -e '/cxx_/s,$cc,clang++,'
+      ''
+      # Avoid relying on ditto (impure)
+      + ''
+        substituteInPlace compile/ninja/macos.ninja \
+          --replace-fail "ditto" "rsync -a"
+
+        substituteInPlace scripts/writer.lua \
+          --replace-fail "ditto" "rsync -a"
+      ''
+    );

  ninjaFlags = [
    "-fcompile/ninja/${if stdenv.hostPlatform.isDarwin then "macos" else "linux"}.ninja"
@ -91,19 +110,25 @@ stdenv.mkDerivation (finalAttrs: {
  # some tests require local networking
  __darwinAllowLocalNetworking = true;

+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
  passthru.updateScript = nix-update-script { };

-  meta = with lib; {
+  meta = {
    description = "Language server that offers Lua language support";
    homepage = "https://github.com/luals/lua-language-server";
    changelog = "https://github.com/LuaLS/lua-language-server/blob/${finalAttrs.version}/changelog.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
      figsoda
      gepbird
      sei40kr
    ];
    mainProgram = "lua-language-server";
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
 })
--- a/pkgs/by-name/ma/matugen/package.nix
+++ b/pkgs/by-name/ma/matugen/package.nix
@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
    owner = "InioX";
    repo = "matugen";
    rev = "refs/tags/v${version}";
-    hash = "sha256-SN4m0ka5VHLIQYTszhlCIB+2D+nyWMzJM5n5bZdkG/I=";
+    hash = "sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU=";
  };

  cargoHash = "sha256-FwQhhwlldDskDzmIOxhwRuUv8NxXCxd3ZmOwqcuWz64=";
--- a/pkgs/by-name/me/mermerd/package.nix
+++ b/pkgs/by-name/me/mermerd/package.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "mermerd";
-  version = "0.11.0";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "KarnerTh";
    repo = "mermerd";
    rev = "refs/tags/v${version}";
-    hash = "sha256-7oBN9EeF3JBrOFuIM3lkNR2WMZA8PNDaKqdsVPawHBE=";
+    hash = "sha256-18GM/mb32MPI128ytM/Im+LO+N9cW1HoZ7M4tP2+i0o=";
  };

-  vendorHash = "sha256-bd/1LT0Pw25NhbnwQH3nmuCm3m8jBKPOYGRIRpcOGQI=";
+  vendorHash = "sha256-r5/mztbAwj25QevcB1iYb6fJzNACPtJEurkbD1Iq7dM=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/mo/mopac/package.nix
+++ b/pkgs/by-name/mo/mopac/package.nix
@ -12,13 +12,13 @@ assert blas.isILP64 == lapack.isILP64;

 stdenv.mkDerivation rec {
  pname = "mopac";
-  version = "22.1.1";
+  version = "23.0.0";

  src = fetchFromGitHub {
    owner = "openmopac";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-tdVb/u89EBggfG3Ofz1ICBE2ug4fbMsUWAILwJP9Ito=";
+    hash = "sha256-5Ybhnq99609mb1BCf7SfBOu14VfG54aF1bEf96yhbVI=";
  };

  nativeBuildInputs = [ gfortran cmake ];
--- a/pkgs/by-name/mu/mutmut/package.nix
+++ b/pkgs/by-name/mu/mutmut/package.nix
@ -1,31 +1,35 @@
-{ lib
-, fetchFromGitHub
-, python3
-, testers
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
 }:

-let self = with python3.pkgs; buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "mutmut";
-  version = "2.2.0";
+  version = "3.2.0";

  src = fetchFromGitHub {
    repo = pname;
    owner = "boxed";
-    rev = version;
-    hash = "sha256-G+OL/9km2iUeZ1QCpU73CIWVWMexcs3r9RdCnAsESnY=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-+e2FmfpGtK401IW8LNqeHk0v8Hh5rF3LbZJkSOJ3yPY=";
  };

  postPatch = ''
-    substituteInPlace requirements.txt --replace 'junit-xml==1.8' 'junit-xml==1.9'
+    substituteInPlace requirements.txt --replace-fail 'junit-xml==1.8' 'junit-xml==1.9'
  '';

-  disabled = pythonOlder "3.7";
+  disabled = python3Packages.pythonOlder "3.7";

  doCheck = false;

-  propagatedBuildInputs = [ click glob2 parso pony junit-xml ];
-
-  passthru.tests.version = testers.testVersion { package = self; };
+  propagatedBuildInputs = with python3Packages; [
+    click
+    parso
+    junit-xml
+    setproctitle
+    textual
+  ];

  meta = with lib; {
    description = "mutation testing system for Python, with a strong focus on ease of use";
@ -33,7 +37,9 @@ let self = with python3.pkgs; buildPythonApplication rec {
    homepage = "https://github.com/boxed/mutmut";
    changelog = "https://github.com/boxed/mutmut/blob/${version}/HISTORY.rst";
    license = licenses.bsd3;
-    maintainers = with maintainers; [ synthetica ];
+    maintainers = with maintainers; [
+      l0b0
+      synthetica
+    ];
  };
-};
-in self
+}
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@ -28,13 +28,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pdal";
-  version = "2.8.0";
+  version = "2.8.1";

  src = fetchFromGitHub {
    owner = "PDAL";
    repo = "PDAL";
    rev = finalAttrs.version;
-    hash = "sha256-VHcUyYADmNzxZ+Ix56TNuaP9wG+vRlEl71cNM0uMaHg=";
+    hash = "sha256-aRWVBCMGr/FX3g8tF7PP3sarN2DHx7AG3vvGAkQTuAM=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/pr/printrun/package.nix
+++ b/pkgs/by-name/pr/printrun/package.nix
@ -2,13 +2,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "printrun";
-  version = "2.1.0";
+  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "kliment";
    repo = "Printrun";
    rev = "refs/tags/printrun-${version}";
-    hash = "sha256-MANgxE3z8xq8ScxdxhwfEVsLMF9lgcdSjJZ0qu5p3ps=";
+    hash = "sha256-INJNGAmghoPIiivQp6AV1XmhyIu8SjfKqL8PTpi/tkY=";
  };

  postPatch = ''
@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
  nativeBuildInputs = [ glib wrapGAppsHook3 ];

  propagatedBuildInputs = with python3Packages; [
-    appdirs cython dbus-python numpy six wxpython psutil pyglet pyopengl pyserial cffi cairosvg lxml
+    appdirs cython dbus-python numpy six wxpython psutil pyglet pyopengl pyserial cffi cairosvg lxml puremagic
  ];

  # pyglet.canvas.xlib.NoSuchDisplayException: Cannot connect to "None"
--- a/pkgs/by-name/py/pyload-ng/package.nix
+++ b/pkgs/by-name/py/pyload-ng/package.nix
@ -6,7 +6,7 @@
 }:

 python3.pkgs.buildPythonApplication rec {
-  version = "0.5.0b3.dev85";
+  version = "0.5.0b3.dev87";
  pname = "pyload-ng";
  pyproject = true;

@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
    inherit version;
    # The uploaded tarball uses an underscore in recent releases
    pname = "pyload_ng";
-    hash = "sha256-KLpfh53JKqe0kZLcQ1C4fXFFYeO5pPhia9fRxWsbIHY=";
+    hash = "sha256-LbixaUfsWeU8WVpZsSLJmFR/hVLhCr1DRsIeFYCcxFA=";
  };

  patches = [
--- a/pkgs/by-name/re/re-flex/package.nix
+++ b/pkgs/by-name/re/re-flex/package.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "re-flex";
-  version = "4.5.0";
+  version = "5.0.1";

  src = fetchFromGitHub {
    owner = "Genivia";
    repo = "RE-flex";
    rev = "v${version}";
-    hash = "sha256-Dc/nnzJtkLgfmYnilA9FtOPtlOwTqgXtNVWhypFu5hs=";
+    hash = "sha256-w3qL02I9nrOkEFqmMQU4noPRCamyvJTYpQJYJiUf4ec=";
  };

  outputs = [ "out" "bin" "dev" ];
--- a/pkgs/by-name/re/regclient/package.nix
+++ b/pkgs/by-name/re/regclient/package.nix
@ -11,16 +11,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in

 buildGoModule rec {
  pname = "regclient";
-  version = "0.7.1";
+  version = "0.7.2";
  tag = "v${version}";

  src = fetchFromGitHub {
    owner = "regclient";
    repo = "regclient";
    rev = tag;
-    sha256 = "sha256-QG0qwilYqsueyI3rzpNj9z8gYYRzIorlOID+baORgJU=";
+    sha256 = "sha256-Py/SmCptVfSJ8JA4mOxLcrkHcoiGgHHcDCdgophEOkw=";
  };
-  vendorHash = "sha256-gqnE3kfBLjV8CroYcJwa9QWCFOL/dBIblPQJZR2DW+4=";
+  vendorHash = "sha256-9nPavlBdrQqvXp6yl8wgZtt8Qo7BfqwISBrb8AeH150=";

  outputs = [ "out" ] ++ bins;

--- a/pkgs/by-name/re/revanced-cli/package.nix
+++ b/pkgs/by-name/re/revanced-cli/package.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "revanced-cli";
-  version = "4.6.0";
+  version = "5.0.0";

  src = fetchurl {
    url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar";
-    hash = "sha256-QQH7aEkfBULqAvJ0FsKFxrraFjg1m1JJnuDtyvLJXEk=";
+    hash = "sha256-KxxdMDybGBEgu2O0wozFDMszIDz4lHrdOQ2QD5/n8tg=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/by-name/si/simple64/package.nix
+++ b/pkgs/by-name/si/simple64/package.nix
@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "simple64";
-  version = "2024.09.1";
+  version = "2024.11.1";

  src = fetchFromGitHub {
    owner = "simple64";
    repo = "simple64";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-t3V7mvHlCP8cOvizR3N9DiCofnSvSHI6U0iXXkaMb34=";
+    hash = "sha256-wWBW+iYPY+5C3pvyyFYb4iIK8GlAyCbaAzr2Q5RL+n8=";
  };

  patches = [
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "slumber";
-  version = "2.1.0";
+  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "LucasPickering";
    repo = "slumber";
    rev = "refs/tags/v${version}";
-    hash = "sha256-W7KvIc6FqM4RUqUsMOzfwBD9kVIFdqPba8dz+Ysg4sY=";
+    hash = "sha256-/WMtAievM0l6rOw03EaZAZMWEJgtxTmtDuKBJM/lz1k=";
  };

-  cargoHash = "sha256-1PNf7EVr4UibxR1OM04tDr5jreEeFxvKfx6Qe3p6dJQ=";
+  cargoHash = "sha256-1br2LsxPnPpod5u6bvkB9nJTDMMAEU8TL71FDffegOU=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];

--- a/pkgs/by-name/st/stardust-xr-gravity/package.nix
+++ b/pkgs/by-name/st/stardust-xr-gravity/package.nix
@ -7,7 +7,7 @@

 rustPlatform.buildRustPackage rec {
  pname = "stardust-xr-gravity";
-  version = "0-unstable-2024-08-20";
+  version = "0-unstable-2024-08-21";

  src = fetchFromGitHub {
    owner = "stardustxr";
@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec {
  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "stardust-xr-0.45.0" = "sha256-1Bor53L+Fe18SU6MKwPLQXDGZq6E9++gtwDy4zkzZXw=";
      "color-rs-0.8.0" = "sha256-/p4wYiLryY0+h0HBJUo4OV2jdZpcVn2kqv+8XewM4gM=";
+      "stardust-xr-0.45.0" = "sha256-1Bor53L+Fe18SU6MKwPLQXDGZq6E9++gtwDy4zkzZXw=";
    };
  };

--- a/pkgs/by-name/st/stardust-xr-sphereland/package.nix
+++ b/pkgs/by-name/st/stardust-xr-sphereland/package.nix
@ -8,7 +8,7 @@

 rustPlatform.buildRustPackage rec {
  pname = "stardust-xr-sphereland";
-  version = "0-unstable-2023-11-06";
+  version = "0-unstable-2023-11-07";

  src = fetchFromGitHub {
    owner = "stardustxr";
--- a/pkgs/by-name/st/stunnel/package.nix
+++ b/pkgs/by-name/st/stunnel/package.nix
@ -6,17 +6,19 @@
 , stdenv
 , systemd
 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
+, mimalloc
+, mimallocSupport ? false
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "stunnel";
-  version = "5.72";
+  version = "5.73";

  outputs = [ "out" "doc" "man" ];

  src = fetchurl {
    url = "https://www.stunnel.org/archive/${lib.versions.major finalAttrs.version}.x/stunnel-${finalAttrs.version}.tar.gz";
-    hash = "sha256-PVMpQSga41MxlzUUTkrbmuSJoQt+MJxYpIFX8I9C6Uk=";
+    hash = "sha256-vJF8O82UOk1jI2DAZ5d6MeheOF9fSEX2l0m86IGDyzg=";
    # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256",
    # not the output of `nix-prefetch-url`
  };
@ -27,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
    openssl
  ] ++ lib.optionals systemdSupport [
    systemd
+  ] ++ lib.optionals mimallocSupport [
+    mimalloc
  ];

  configureFlags = [
--- a/pkgs/by-name/su/supercronic/package.nix
+++ b/pkgs/by-name/su/supercronic/package.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "supercronic";
-  version = "0.2.30";
+  version = "0.2.33";

  src = fetchFromGitHub {
    owner = "aptible";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-gey5d+Dxmk7TS0miWRjeWMxW+qYrAPVYGHcHNYrYwK4=";
+    hash = "sha256-tvDjjG8ym1wdQzQSO7T5BkbYbqD1M+EnPSPumbFKRhE=";
  };

-  vendorHash = "sha256-ebUsnPpvQ/AK3C7MbGnXWSiuoXrjhQ2uZhj1OtRGeWU=";
+  vendorHash = "sha256-SmmuHVf9nuqdT4jqhQDLl5gAHq/3qLKNpgwuwBBNfW4=";

  excludedPackages = [ "cronexpr/cronexpr" ];

@ -29,6 +29,8 @@ buildGoModule rec {
    substituteInPlace cron/cron_test.go --replace /bin/false ${coreutils}/bin/false
  '';

+  ldflags = [ "-X main.Version=${version}" ];
+
  meta = with lib; {
    description = "Cron tool designed for use in containers";
    homepage = "https://github.com/aptible/supercronic";
--- a/pkgs/by-name/tt/ttysvr/package.nix
+++ b/pkgs/by-name/tt/ttysvr/package.nix
@ -0,0 +1,72 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  versionCheckHook,
+  nix-update-script,
+  # Runtime deps:
+  alsa-lib,
+  udev,
+  libGL,
+  vulkan-headers,
+  vulkan-loader,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "ttysvr";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "cxreiff";
+    repo = "ttysvr";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-qUwnx+hwd3PRzz1TlQzPAppj6aTZZpTG2e5cBaA3zZI=";
+  };
+  cargoHash = "sha256-kIE8+FUS3i8Ulkj35lO1iRmFx5x+r89THVuzNzAv6tE=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    alsa-lib
+    udev
+    libGL
+    vulkan-headers
+    vulkan-loader
+  ];
+
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf $out/bin/ttysvr \
+      --add-rpath ${
+        lib.makeLibraryPath [
+          libGL
+          vulkan-loader
+        ]
+      }
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Screen saver for your terminal";
+    homepage = "https://github.com/cxreiff/ttysvr";
+    changelog = "https://github.com/cxreiff/ttysvr/releases/tag/v${version}";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [ griffi-gh ];
+    mainProgram = "ttysvr";
+    platforms = with lib.platforms; linux;
+  };
+}
--- a/pkgs/by-name/um/umoria/package.nix
+++ b/pkgs/by-name/um/umoria/package.nix
@ -1,6 +1,7 @@
 { lib
-, gcc9Stdenv
+, stdenv
 , fetchFromGitHub
+, fetchpatch
 , autoreconfHook
 , cmake
 , ncurses6
@ -10,7 +11,7 @@
 let
  savesDir = "~/.umoria";
 in
-gcc9Stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
  pname = "umoria";
  version = "5.7.15";

@ -21,6 +22,38 @@ gcc9Stdenv.mkDerivation rec {
    sha256 = "sha256-1j4QkE33UcTzM06qAjk1/PyK5uNA7E/kyDe3bZcFKUM=";
  };

+  patches = [
+    # gcc-13 support: https://github.com/dungeons-of-moria/umoria/pull/58
+    (fetchpatch {
+      name = "gcc-13.patch";
+      url = "https://github.com/dungeons-of-moria/umoria/commit/71dad4103b5c8f3e1f7723eb14d14425755e7ba5.patch";
+      hash = "sha256-5Ka3NTe0sJk6kReG+1hwZPEuB3R+Nn+2zxUXuOG7hm0=";
+    })
+    # clang support: https://github.com/dungeons-of-moria/umoria/pull/72
+    (fetchpatch {
+      name = "clang.patch";
+      url = "https://github.com/dungeons-of-moria/umoria/commit/f294e5880cd21d25c11eee820d629f4ff504ad10.patch";
+      hash = "sha256-se8G4n8codXA9gznyIy337IFyznLnpCY7KA6UryZDls=";
+    })
+    (fetchpatch {
+      name = "clang-p2.patch";
+      url = "https://github.com/dungeons-of-moria/umoria/commit/bf513b05dc34405665a8dd1386292cd70307dce0.patch";
+      hash = "sha256-FXj5Y4G0gnXheXC2bmRbIx3a1IixJ/aGfRMxl2S/vqM=";
+    })
+    # clang crash fix: https://github.com/dungeons-of-moria/umoria/pull/87
+    (fetchpatch {
+      name = "clang-crash.patch";
+      url = "https://github.com/dungeons-of-moria/umoria/commit/d073e8f867c49bb04a02c1995dd3efb0c5cc07e7.patch";
+      hash = "sha256-4uwO8fe4M5jt0IM0z6MjO8UaEezweMA5L+pusel4VUU=";
+    })
+  ];
+
+  postPatch = ''
+    # Do not apply blanket -Werror as it tends to fail on fresher
+    # toolchains.
+    substituteInPlace CMakeLists.txt --replace-fail '-Werror")' '-Wno-error")'
+  '';
+
  nativeBuildInputs = [ cmake ];
  buildInputs = [ ncurses6 ];
  enableParallelBuilding = true;
--- a/pkgs/by-name/ut/ut/package.nix
+++ b/pkgs/by-name/ut/ut/package.nix
@ -6,7 +6,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "ut";
-  version = "2.1.0";
+  version = "2.1.1";

  cmakeFlags = [
    "-DBOOST_UT_ALLOW_CPM_USE=OFF"
@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "boost-ext";
    repo = "ut";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-pO6tNliAbX1GxYdD6Y+koFUzcvPFrx7s6B0mM6soQM0=";
+    hash = "sha256-4AMUOkfbzw7+3fFZ2AT6gCN7kmhpZAdA1XD1aN8ki74=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/xf/xf86_input_wacom/package.nix
+++ b/pkgs/by-name/xf/xf86_input_wacom/package.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "xf86-input-wacom";
-  version = "1.2.2";
+  version = "1.2.3";

  src = fetchFromGitHub {
    owner = "linuxwacom";
    repo = pname;
    rev = "${pname}-${version}";
-    sha256 = "sha256-3w12OjjMdu03BhUVEjkyj1ngDFnp0Cp66L0nn3LuU8Q=";
+    sha256 = "sha256-0eDik4fhsg1HAL6lCZMll/0VAghpzMSHY0RoKxSOIbc=";
  };

  nativeBuildInputs = [ autoreconfHook pkg-config ];
--- a/pkgs/by-name/za/zap-chip/package.nix
+++ b/pkgs/by-name/za/zap-chip/package.nix
@ -4,6 +4,7 @@
  electron_31,
  fetchFromGitHub,
  writers,
+  withGui ? false,
 }:

 let
@ -50,25 +51,28 @@ buildNpmPackage rec {
      cat .version.json
    '';

-  postBuild = ''
+  postBuild = lib.optionalString withGui ''
    npm exec electron-builder -- \
      --dir \
      -c.electronDist=${electron.dist} \
      -c.electronVersion=${electron.version}
  '';

-  postInstall = ''
-    # this file is also used at runtime
-    install -m644 .version.json $out/lib/node_modules/zap/
-    # home-assistant chip-* python packages need the executable under the name zap-cli
-    ln -s $out/bin/zap $out/bin/zap-cli
-  '';
+  postInstall =
+    ''
+      # this file is also used at runtime
+      install -m644 .version.json $out/lib/node_modules/zap/
+    ''
+    + lib.optionalString (!withGui) ''
+      # home-assistant chip-* python packages need the executable under the name zap-cli
+      mv $out/bin/zap $out/bin/zap-cli
+    '';

  meta = {
    description = "Generic generation engine and user interface for applications and libraries based on Zigbee Cluster Library (ZCL)";
    changelog = "https://github.com/project-chip/zap/releases/tag/v${version}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ symphorien ];
-    mainProgram = "zap-cli";
+    mainProgram = "zap" + lib.optionalString (!withGui) "-cli";
  };
 }
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@ -16,7 +16,7 @@ let
  generic =
    {
      version,
-      sha256,
+      hash,
      patches ? [ ],
    }:
    stdenv.mkDerivation {
@ -32,7 +32,7 @@ let
        owner = "fmtlib";
        repo = "fmt";
        rev = version;
-        inherit sha256;
+        inherit hash;
      };

      inherit patches;
@ -70,21 +70,21 @@ in
 {
  fmt_8 = generic {
    version = "8.1.1";
-    sha256 = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308=";
+    hash = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308=";
  };

  fmt_9 = generic {
    version = "9.1.0";
-    sha256 = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0=";
+    hash = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0=";
  };

  fmt_10 = generic {
    version = "10.2.1";
-    sha256 = "sha256-pEltGLAHLZ3xypD/Ur4dWPWJ9BGVXwqQyKcDWVmC3co=";
+    hash = "sha256-pEltGLAHLZ3xypD/Ur4dWPWJ9BGVXwqQyKcDWVmC3co=";
  };

  fmt_11 = generic {
-    version = "11.0.1";
-    sha256 = "sha256-EPidbZxCvysrL64AzbpJDowiNxqy4ii+qwSWAFwf/Ps=";
+    version = "11.0.2";
+    hash = "sha256-IKNt4xUoVi750zBti5iJJcCk3zivTt7nU12RIf8pM+0=";
  };
 }
--- a/pkgs/development/python-modules/aiolifx-themes/default.nix
+++ b/pkgs/development/python-modules/aiolifx-themes/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "aiolifx-themes";
-  version = "0.5.5";
+  version = "0.5.6";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "Djelibeybi";
    repo = "aiolifx-themes";
    rev = "refs/tags/v${version}";
-    hash = "sha256-Q4PlEnbdEUWYG/odD+xSG975lsRQqhOgFb//hk+PWIw=";
+    hash = "sha256-q3PAQbx3ch3Cq3634wxR1V3sLQom17V+oiJyjU2F7wY=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/django-app-helper/default.nix
+++ b/pkgs/development/python-modules/django-app-helper/default.nix
@ -0,0 +1,63 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  django,
+  pythonOlder,
+  setuptools,
+  docopt,
+  dj-database-url,
+  python,
+  django-filer,
+  six,
+  django-app-helper,
+}:
+
+buildPythonPackage rec {
+  pname = "django-app-helper";
+  version = "3.3.4";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "nephila";
+    repo = "django-app-helper";
+    rev = "refs/tags/${version}";
+    hash = "sha256-4nFg8B1uxGJVY1jcGr0e2Oi14lqXcFOi0HJ+ogE2ikg=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    dj-database-url
+    docopt
+    six
+  ];
+
+  checkInputs = [ django-filer ];
+
+  # Tests depend on django-filer, which depends on this package.
+  # To avoid infinite recursion, we only enable tests when building passthru.tests.
+  doCheck = false;
+
+  checkPhase = ''
+    ${python.interpreter} helper.py
+  '';
+
+  pythonImportsCheck = [ "app_helper" ];
+
+  passthru.tests = {
+    runTests = django-app-helper.overrideAttrs (_: {
+      doCheck = true;
+    });
+  };
+
+  meta = {
+    description = "Helper for Django applications development";
+    homepage = "https://django-app-helper.readthedocs.io";
+    changelog = "https://github.com/nephila/django-app-helper/releases/tag/${version}";
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}
--- a/pkgs/development/python-modules/django-filer/default.nix
+++ b/pkgs/development/python-modules/django-filer/default.nix
@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  django,
+  pythonOlder,
+  pytestCheckHook,
+  django-polymorphic,
+  setuptools,
+  python,
+  easy-thumbnails,
+  pillow-heif,
+  django-app-helper,
+  distutils,
+}:
+
+buildPythonPackage rec {
+  pname = "django-filer";
+  version = "3.2.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "django-cms";
+    repo = "django-filer";
+    rev = "refs/tags/${version}";
+    hash = "sha256-PoUBnfNymighCsGoJE+iu31lxA9wqVXimFPCytQtPLg=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    django-polymorphic
+    easy-thumbnails
+  ];
+
+  optional-dependencies = {
+    heif = [ pillow-heif ];
+  };
+
+  checkInputs = [
+    distutils
+    django-app-helper
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} tests/settings.py
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "File management application for Django";
+    homepage = "https://github.com/django-cms/django-filer";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}
--- a/pkgs/development/python-modules/garminconnect/default.nix
+++ b/pkgs/development/python-modules/garminconnect/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "garminconnect";
-  version = "0.2.19";
+  version = "0.2.20";
  pyproject = true;

  disabled = pythonOlder "3.10";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "cyberjunky";
    repo = "python-garminconnect";
    rev = "refs/tags/${version}";
-    hash = "sha256-v3Z6cUHqE52BJUgfyWMojwdbxWIEyNR8c/oNS9QEFeA=";
+    hash = "sha256-PFasW2rOfKwAjkqd690UXE3NNIjO3njBVYy5m+aXcfk=";
  };

  build-system = [ pdm-backend ];
--- a/pkgs/development/python-modules/gtts/default.nix
+++ b/pkgs/development/python-modules/gtts/default.nix
@ -17,14 +17,14 @@

 buildPythonPackage rec {
  pname = "gtts";
-  version = "2.5.3";
+  version = "2.5.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pndurette";
    repo = "gTTS";
    rev = "refs/tags/v${version}";
-    hash = "sha256-8FPKAMVXqw/4X050tAnOAx/wGboZPPJs72VwwaOEamE=";
+    hash = "sha256-ryTR7cESDO9pH5r2FBz+6JuNMEQr39hil/FSklgaIGg=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@ -1,7 +1,6 @@
 {
  lib,
  buildPythonPackage,
-  docopt,
  fetchFromGitHub,
  pytestCheckHook,
  requests,
@ -17,7 +16,7 @@

 buildPythonPackage rec {
  pname = "internetarchive";
-  version = "4.1.0";
+  version = "5.0.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -26,14 +25,13 @@ buildPythonPackage rec {
    owner = "jjjake";
    repo = "internetarchive";
    rev = "refs/tags/v${version}";
-    hash = "sha256-CqfwAKhrq4VEBU258x19JT8+ay2vOYIzVoFWjAzh3wY=";
+    hash = "sha256-0+tD+CtbR9MdqXH2CXWsXxyr5YM9gToExFnDQZa+gWM=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    tqdm
-    docopt
    requests
    jsonpatch
    schema
--- a/pkgs/development/python-modules/nanobind/default.nix
+++ b/pkgs/development/python-modules/nanobind/default.nix
@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  buildPythonPackage,
  fetchFromGitHub,
  pythonOlder,
@ -52,6 +53,8 @@ buildPythonPackage rec {
    make -j $NIX_BUILD_CORES
  '';

+  # skip testing on platforms disabled for tensorflow-bin
+  doCheck = !(builtins.elem stdenv.hostPlatform.system tensorflow-bin.meta.badPlatforms);
  nativeCheckInputs = [
    pytestCheckHook
    numpy
--- a/pkgs/development/python-modules/pygreat/default.nix
+++ b/pkgs/development/python-modules/pygreat/default.nix
@ -1,41 +1,59 @@
 {
  lib,
  buildPythonPackage,
-  isPy3k,
  fetchFromGitHub,
+  setuptools,
+  pythonOlder,
  future,
  pyusb,
 }:

-buildPythonPackage {
+buildPythonPackage rec {
  pname = "pygreat";
-  version = "2019.5.1.dev0";
-  format = "setuptools";
+  version = "2024.0.2";
+  pyproject = true;
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "greatscottgadgets";
    repo = "libgreat";
-    rev = "14c00b7c8f036f4d467e4b1a324ffa3566b126fa";
-    sha256 = "1h0z83k1k4z8j36z936h61l8j3cjr3wsxr86k91v5c5h93g9dkqh";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yYp+2y4QIOykkrObWaXbZMMc2fsRn/+tGWqySA7V534=";
  };

-  propagatedBuildInputs = [
+  sourceRoot = "${src.name}/host";
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"setuptools-git-versioning<2"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRemoveDeps = [
+    "backports.functools-lru-cache"
+  ];
+
+  dependencies = [
    future
    pyusb
  ];

-  disabled = !isPy3k;
+  # has no tests
+  doCheck = false;

-  preBuild = ''
-    cd host
-    substituteInPlace setup.py --replace "'backports.functools_lru_cache'" ""
-    substituteInPlace pygreat/comms.py --replace "from backports.functools_lru_cache import lru_cache as memoize_with_lru_cache" "from functools import lru_cache as memoize_with_lru_cache"
-    echo "$version" > ../VERSION
-  '';
+  pythonImportsCheck = [
+    "pygreat"
+  ];

-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/greatscottgadgets/libgreat/releases/tag/v${version}";
    description = "Python library for talking with libGreat devices";
-    homepage = "https://greatscottgadgets.com/greatfet/";
-    license = with licenses; [ bsd3 ];
+    homepage = "https://github.com/greatscottgadgets/libgreat/";
+    license = with lib.licenses; [ bsd3 ];
+    maintainers = with lib.maintainers; [ carlossless ];
  };
 }
--- a/pkgs/development/tools/rust/duckscript/default.nix
+++ b/pkgs/development/tools/rust/duckscript/default.nix
@ -11,11 +11,11 @@

 rustPlatform.buildRustPackage rec {
  pname = "duckscript_cli";
-  version = "0.9.3";
+  version = "0.11.1";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-2ouEmI7BH9J+PEN7l3rE8nmd0Khe2Bjq1Bg9SgGnB4E=";
+    hash = "sha256-afxzZkmmYnprUBquH681VHMDs3Co9C71chNoKbu6lEY=";
  };

  nativeBuildInputs = [ pkg-config ];
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration libiconv ];

-  cargoHash = "sha256-bBqcHETEWooMgQeqPOZIK/77DdTtGq1JusBKoRj5K6w=";
+  cargoHash = "sha256-TX/Xi57fn85GjHc74icxhsQ6n7FwqzGIr3Qoc2o681E=";

  meta = with lib; {
    description = "Simple, extendable and embeddable scripting language";
--- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
@ -0,0 +1,113 @@
+{
+  lib,
+  autoreconfHook,
+  dejagnu,
+  mkAppleDerivation,
+  stdenv,
+  testers,
+  texinfo,
+
+  # test suite depends on dejagnu which cannot be used during bootstrapping
+  # dejagnu also requires tcl which can't be built statically at the moment
+  doCheck ? !(stdenv.hostPlatform.isStatic),
+}:
+
+mkAppleDerivation (finalAttrs: {
+  releaseName = "libffi";
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+    "info"
+  ];
+
+  patches = [
+    # Clang 18 requires that no non-private symbols by defined after cfi_startproc. Apply the upstream libffi fix.
+    ./patches/llvm-18-compatibility.patch
+  ];
+
+  # Make sure libffi is using the trampolines dylib in this package not the system one.
+  postPatch = ''
+    substituteInPlace src/closures.c --replace-fail /usr/lib "$out/lib"
+  '';
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    texinfo
+  ];
+
+  configurePlatforms = [
+    "build"
+    "host"
+  ];
+
+  configureFlags = [
+    "--with-gcc-arch=generic" # no detection of -march= or -mtune=
+    "--enable-pax_emutramp"
+  ];
+
+  # Make sure aarch64-darwin is using the trampoline dylib.
+  postConfigure = lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    echo '#define FFI_TRAMPOLINE_WHOLE_DYLIB 1' >> aarch64-apple-darwin/fficonfig.h
+  '';
+
+  postBuild = lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    $CC src/aarch64/trampoline.S -dynamiclib -o libffi-trampolines.dylib \
+      -Iinclude -Iaarch64-apple-darwin -Iaarch64-apple-darwin/include \
+      -install_name "$out/lib/libffi-trampoline.dylib" -Wl,-compatibility_version,1 -Wl,-current_version,1
+  '';
+
+  postInstall =
+    # The Darwin SDK puts the headers in `include/ffi`. Add a symlink for compatibility.
+    ''
+      ln -s "$dev/include" "$dev/include/ffi"
+    ''
+    # Install the trampoline dylib since it is build manually.
+    + lib.optionalString stdenv.hostPlatform.isAarch64 ''
+      cp libffi-trampolines.dylib "$out/lib/libffi-trampolines.dylib"
+    '';
+
+  preCheck = ''
+    # The tests use -O0 which is not compatible with -D_FORTIFY_SOURCE.
+    NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify3/}
+    NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
+  '';
+
+  dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling.
+
+  inherit doCheck;
+
+  nativeCheckInputs = [ dejagnu ];
+
+  passthru = {
+    tests = {
+      pkg-config = testers.hasPkgConfigModules {
+        package = finalAttrs.finalPackage;
+      };
+    };
+  };
+
+  meta = {
+    description = "Foreign function call interface library";
+    longDescription = ''
+      The libffi library provides a portable, high level programming
+      interface to various calling conventions.  This allows a
+      programmer to call any function specified by a call interface
+      description at run-time.
+
+      FFI stands for Foreign Function Interface.  A foreign function
+      interface is the popular name for the interface that allows code
+      written in one language to call code written in another
+      language.  The libffi library really only provides the lowest,
+      machine dependent layer of a fully featured foreign function
+      interface.  A layer must exist above libffi that handles type
+      conversions for values passed between the two languages.
+    '';
+    homepage = "https://github.com/apple-oss-distributions/libffi/";
+    license = lib.licenses.mit;
+    pkgConfigModules = [ "libffi" ];
+  };
+})
--- a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch
+++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch
@ -0,0 +1,34 @@
+diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S
+index eeaf3f8..329889c 100644
+--- a/src/aarch64/sysv.S
+++ b/src/aarch64/sysv.S
+@@ -76,8 +76,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
+    x5 closure
+ */
+ 
+-	cfi_startproc
+ CNAME(ffi_call_SYSV):
+	cfi_startproc
+ 	/* Sign the lr with x1 since that is where it will be stored */
+ 	SIGN_LR_WITH_REG(x1)
+ 
+@@ -268,8 +268,8 @@ CNAME(ffi_closure_SYSV_V):
+ #endif
+ 
+ 	.align	4
+-	cfi_startproc
+ CNAME(ffi_closure_SYSV):
+	cfi_startproc
+ 	SIGN_LR
+ 	stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
+ 	cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
+@@ -500,8 +500,8 @@ CNAME(ffi_go_closure_SYSV_V):
+ #endif
+ 
+ 	.align	4
+-	cfi_startproc
+ CNAME(ffi_go_closure_SYSV):
+	cfi_startproc
+ 	stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
+ 	cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
+ 	cfi_rel_offset (x29, 0)
--- a/pkgs/os-specific/darwin/apple-source-releases/versions.json
+++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json
@ -51,6 +51,10 @@
    "hash": "sha256-/79jS//IBZiQBumGA60lKDmddQCzl/r8QnviD6lGXNg=",
    "version": "448.0.3"
  },
+  "libffi": {
+    "hash": "sha256-tQJdKCz2OIwVtorHQapq9Xs2e1Ac96lGEzIWUXmsasY=",
+    "version": "35"
+  },
  "libiconv": {
    "hash": "sha256-4I70hci8SUQ5QERbImP3htjYCGXdZZ0a6RM7ggUnVa4=",
    "version": "107"
--- a/pkgs/servers/home-assistant/build-custom-component/default.nix
+++ b/pkgs/servers/home-assistant/build-custom-component/default.nix
@ -43,5 +43,9 @@ home-assistant.python.pkgs.buildPythonPackage (
      isHomeAssistantComponent = true;
    } // args.passthru or { };

-  } // builtins.removeAttrs args [ "nativeCheckInputs" "passthru" ]
+    meta = {
+      inherit (home-assistant.meta) platforms;
+    } // args.meta or { };
+
+  } // builtins.removeAttrs args [ "meta" "nativeCheckInputs" "passthru" ]
 )
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "collectd-exporter";
-  version = "0.6.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "prometheus";
    repo = "collectd_exporter";
    rev = "v${version}";
-    sha256 = "sha256-8oibunEHPtNdbhVgF3CL6D/xE7bR8hee6+D2IJMzaqY=";
+    sha256 = "sha256-MxgHJ9+e94ReY/8ISPfGEX9Z9ZHDyNsV0AqlPfsjXvc=";
  };

-  vendorHash = "sha256-fQO2fiotqv18xewXVyh6sA4zx5ZNUR6mCebYenryrKI=";
+  vendorHash = "sha256-kr8mHprIfXc/Yj/w2UKBkqIYZHmWtBLjqYDvKSXlozQ=";

  ldflags = [ "-s" "-w" ];

--- a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "graphite-exporter";
-  version = "0.15.2";
+  version = "0.16.0";

  src = fetchFromGitHub {
    owner = "prometheus";
    repo = "graphite_exporter";
    rev = "v${version}";
-    hash = "sha256-GiXg4FkEDveKI3JPRJ5bYmdfmcum5abN70ESwH0S7EA=";
+    hash = "sha256-Dr7I4+gQXZYKUMnf/P9DgLYRb4SRaDnvqvDwHfMpAn0=";
  };

-  vendorHash = "sha256-SXxjCXWJcVAyTjH77ga1pFdudUjQfDJCD78fiDlw9Y0=";
+  vendorHash = "sha256-f/ZJi3C11O+xAfXo544tlJcAt0MnTknuRmw01JXj82k=";

  checkFlags =
    let
--- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "mysqld_exporter";
-  version = "0.15.1";
+  version = "0.16.0";

  src = fetchFromGitHub {
    owner = "prometheus";
    repo = "mysqld_exporter";
    rev = "v${version}";
-    sha256 = "sha256-P7EoWa0BWuAr3sjtrUxzofwlklhRLpzwpGVe31hFo7Q=";
+    sha256 = "sha256-2D868CSRoJjgDh0SkpDCTLTVbJ/0kWmLQJMyAKh6s/8=";
  };

-  vendorHash = "sha256-GEL9sMwwdGqpklm4yKNqzSOM6I/JzZjg3+ZB2ix2M8w=";
+  vendorHash = "sha256-9mrvqY0wtoMVAL0PEJ/NWtFzaQPcQDAJvYPluwd2Nx4=";

  ldflags = let t = "github.com/prometheus/common/version"; in [
    "-s" "-w"
--- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix
@ -2,16 +2,16 @@

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

  src = fetchFromGitHub {
    owner = "prometheus-community";
    repo = "postgres_exporter";
    rev = "v${version}";
-    sha256 = "sha256-fxVU2z1RGgI8AoKiJb+3LIEa1KDhPptmdP21/ESzmgw=";
+    sha256 = "sha256-zsSqZGgvhi7K9eKFGkfFP2CAkKBn9ZS4p+qQjrVjuyw=";
  };

-  vendorHash = "sha256-/AL9Qkcrp5Kvj2epJMuNrtwqBbyCy4P6oVGUfODXS/Q=";
+  vendorHash = "sha256-FQ9fh6SJ1ebDOfneSJh/EKHGEM5nId518q5HG9YlSYk=";

  ldflags =
    let
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@ -59,20 +59,20 @@ let
 in
 {
  nextcloud28 = generic {
-    version = "28.0.11";
-    hash = "sha256-S6rs7GpvFFgy28PGNdcuIM1IBKytmmZOanS5CnmB40g=";
+    version = "28.0.12";
+    hash = "sha256-KgDKT3mTYPCYf8vIXZmywlj30sz35vfgxMzxehJ/AQU=";
    packages = nextcloud28Packages;
  };

  nextcloud29 = generic {
-    version = "29.0.8";
-    hash = "sha256-CrVLUX92zSbyvTi2/hhLn7rtMvc0JGxYwaz4NHPApLk=";
+    version = "29.0.9";
+    hash = "sha256-8U6PSXxtaysNpc0K0RbwyZ9yDE6wXmRDL72G4Jz7QUE=";
    packages = nextcloud29Packages;
  };

  nextcloud30 = generic {
-    version = "30.0.1";
-    hash = "sha256-eewv+tYjG9j8xKuqzBLlrFHmcNCJr/s3lINZLNoP3Ms=";
+    version = "30.0.2";
+    hash = "sha256-kpu4BF6WIW/iKmXc1mJ55b17oauynZm/QB1CO2RqRF8=";
    packages = nextcloud30Packages;
  };

--- a/pkgs/servers/nextcloud/packages/28.json
+++ b/pkgs/servers/nextcloud/packages/28.json
@ -270,9 +270,9 @@
    ]
  },
  "spreed": {
-    "hash": "sha256-pOnL5uz8FcuHUFn7otp9NQinOqm+oCmXRHx4TM2NukI=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.12/spreed-v18.0.12.tar.gz",
-    "version": "18.0.12",
+    "hash": "sha256-8Y6bBj9IiGkLbxyNUhVRpBuDqDU1ZCAbXxk9/Oi3yGM=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.13/spreed-v18.0.13.tar.gz",
+    "version": "18.0.13",
    "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
    "homepage": "https://github.com/nextcloud/spreed",
    "licenses": [
@ -330,9 +330,9 @@
    ]
  },
  "user_oidc": {
-    "hash": "sha256-tF68YonuCQ90XuZvZnS7NmJApk3P2741XhFjnyb7TSQ=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.0/user_oidc-v6.1.0.tar.gz",
-    "version": "6.1.0",
+    "hash": "sha256-hdFEruRfEFL5PQykOpHHb19NOKh+p5hGOMo0tPVg0eE=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.2/user_oidc-v6.1.2.tar.gz",
+    "version": "6.1.2",
    "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
    "homepage": "https://github.com/nextcloud/user_oidc",
    "licenses": [
--- a/pkgs/servers/nextcloud/packages/29.json
+++ b/pkgs/servers/nextcloud/packages/29.json
@ -140,8 +140,8 @@
    ]
  },
  "maps": {
-    "hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=",
-    "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz",
+    "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=",
+    "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz",
    "version": "1.4.0",
    "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
    "homepage": "https://github.com/nextcloud/maps",
@ -260,9 +260,9 @@
    ]
  },
  "spreed": {
-    "hash": "sha256-CWmVARbiZAjgMpZKofWU9FTy/LCz8zXuQdGM6UMHjZ4=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.10/spreed-v19.0.10.tar.gz",
-    "version": "19.0.10",
+    "hash": "sha256-sCt3wVj0jbQyQtTK483AupJtb7a6+FWznpjLoz9mEaM=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.11/spreed-v19.0.11.tar.gz",
+    "version": "19.0.11",
    "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
    "homepage": "https://github.com/nextcloud/spreed",
    "licenses": [
@ -320,9 +320,9 @@
    ]
  },
  "user_oidc": {
-    "hash": "sha256-tF68YonuCQ90XuZvZnS7NmJApk3P2741XhFjnyb7TSQ=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.0/user_oidc-v6.1.0.tar.gz",
-    "version": "6.1.0",
+    "hash": "sha256-hdFEruRfEFL5PQykOpHHb19NOKh+p5hGOMo0tPVg0eE=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.2/user_oidc-v6.1.2.tar.gz",
+    "version": "6.1.2",
    "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
    "homepage": "https://github.com/nextcloud/user_oidc",
    "licenses": [
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@ -139,6 +139,16 @@
      "agpl"
    ]
  },
+  "maps": {
+    "hash": "sha256-Rsg+26VNEX4lAHESfWQgbxvsAO/krvrml8pqBGfDXts=",
+    "url": "https://github.com/nextcloud/maps/releases/download/v1.5.0-1-nightly/maps-1.5.0-1-nightly.tar.gz",
+    "version": "1.5.0",
+    "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
+    "homepage": "https://github.com/nextcloud/maps",
+    "licenses": [
+      "agpl"
+    ]
+  },
  "memories": {
    "hash": "sha256-VMaOC+sCh84SsKjJk/pC3BwYRWRkqbCJPRgptI9dppA=",
    "url": "https://github.com/pulsejet/memories/releases/download/v7.4.1/memories.tar.gz",
@ -250,9 +260,9 @@
    ]
  },
  "spreed": {
-    "hash": "sha256-mUJmbOMMIkm/83a+7xcW59TTar58D4l0Ek+kZoRdxG8=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.0.1/spreed-v20.0.1.tar.gz",
-    "version": "20.0.1",
+    "hash": "sha256-LSU++gw715ub6OGZBZtL/NnLkoz3c+vR7/2Dii3WnOo=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.0.2/spreed-v20.0.2.tar.gz",
+    "version": "20.0.2",
    "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
    "homepage": "https://github.com/nextcloud/spreed",
    "licenses": [
@ -290,9 +300,9 @@
    ]
  },
  "user_oidc": {
-    "hash": "sha256-tF68YonuCQ90XuZvZnS7NmJApk3P2741XhFjnyb7TSQ=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.0/user_oidc-v6.1.0.tar.gz",
-    "version": "6.1.0",
+    "hash": "sha256-hdFEruRfEFL5PQykOpHHb19NOKh+p5hGOMo0tPVg0eE=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.1.2/user_oidc-v6.1.2.tar.gz",
+    "version": "6.1.2",
    "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
    "homepage": "https://github.com/nextcloud/user_oidc",
    "licenses": [
--- a/pkgs/tools/misc/chafa/default.nix
+++ b/pkgs/tools/misc/chafa/default.nix
@ -4,14 +4,14 @@
 }:

 stdenv.mkDerivation rec {
-  version = "1.14.4";
+  version = "1.14.5";
  pname = "chafa";

  src = fetchFromGitHub {
    owner = "hpjansson";
    repo = "chafa";
    rev = version;
-    sha256 = "sha256-jrLlhpPWsc1aOEH36W6MbikAj1nAX8CinHKG+iRk+18=";
+    sha256 = "sha256-9RkN0yZnHf5cx6tsp3P6jsi0/xtplWxMm3hYCPjWj0M=";
  };

  nativeBuildInputs = [ autoconf
--- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix
@ -8,18 +8,18 @@

 buildGoModule rec {
  pname = "opentelemetry-collector-contrib";
-  version = "0.110.0";
+  version = "0.112.0";

  src = fetchFromGitHub {
    owner = "open-telemetry";
    repo = "opentelemetry-collector-contrib";
    rev = "v${version}";
-    hash = "sha256-bDtP7EFKus0NJpLccbD+HlzEusc+KAbKWmS/KGthtwY=";
+    hash = "sha256-EWmSN9PfbNxEyRCz07pVQa1b0eQ9eq7LsrF2euWmz7E=";
  };

  # proxy vendor to avoid hash mismatches between linux and macOS
  proxyVendor = true;
-  vendorHash = "sha256-pDDEqtXu167b+J1+k7rC1BE5/ehxzG0ZAkhxqmJpHsg=";
+  vendorHash = null;

  # there is a nested go.mod
  sourceRoot = "${src.name}/cmd/otelcontribcol";
--- a/pkgs/tools/misc/shadowenv/default.nix
+++ b/pkgs/tools/misc/shadowenv/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "shadowenv";
-  version = "2.1.2";
+  version = "3.0.1";

  src = fetchFromGitHub {
    owner = "Shopify";
    repo = pname;
    rev = version;
-    hash = "sha256-SYVVP1WOadsgucHo3z5QxbGtzczfiej4C3/EmbrHOhg=";
+    hash = "sha256-9K04g2DCADkRwjo55rDwVwkvmypqujdN1fqOmHmC09E=";
  };

-  cargoHash = "sha256-x4OQa84cIKzx29lMx56GfqSFE216jD897g4VhkiV4Kc=";
+  cargoHash = "sha256-GBqxA49H3KG63hn8QfM4U8m9uZ1YAhJio6bGziyLvV0=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -7943,11 +7943,6 @@ with pkgs;

  fortran-language-server = python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server { };

-  lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/lua-language-server {
-    inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation;
-    inherit (darwin) ditto;
-  };
-
  inherit (callPackages ../development/tools/language-servers/nixd {
    llvmPackages = llvmPackages_16;
    nix = nixVersions.nix_2_19;
@ -19108,6 +19103,8 @@ with pkgs;

  yandex-browser-corporate = yandex-browser.override { edition = "corporate"; };

+  zap-chip-gui = zap-chip.override { withGui = true; };
+
  myEnvFun = callPackage ../misc/my-env {
    inherit (stdenv) mkDerivation;
  };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -3333,6 +3333,8 @@ self: super: with self; {

  django-appconf = callPackage ../development/python-modules/django-appconf { };

+  django-app-helper = callPackage ../development/python-modules/django-app-helper { };
+
  django-auditlog = callPackage ../development/python-modules/django-auditlog { };

  django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { };
@ -3413,6 +3415,8 @@ self: super: with self; {

  django-extensions = callPackage ../development/python-modules/django-extensions { };

+  django-filer = callPackage ../development/python-modules/django-filer { };
+
  django-filter = callPackage ../development/python-modules/django-filter { };

  django-formtools = callPackage ../development/python-modules/django-formtools { };
@ -5825,7 +5829,7 @@ self: super: with self; {

  home-assistant-bluetooth = callPackage ../development/python-modules/home-assistant-bluetooth { };

-  home-assistant-chip-wheels = callPackage ../development/python-modules/home-assistant-chip-wheels { };
+  home-assistant-chip-wheels = toPythonModule (callPackage ../development/python-modules/home-assistant-chip-wheels { });

  home-assistant-chip-clusters = callPackage ../development/python-modules/home-assistant-chip-clusters { };