Merge remote-tracking branch 'origin/staging-next' into staging

Conflicts: - pkgs/development/python-modules/mlflow/default.nix - pkgs/development/python-modules/napari/default.nix
2024-11-21 22:43:01 +00:00 · 2024-10-13 15:36:55 +02:00 · 2024-10-13 15:36:55 +02:00 · db13b6d4c4
commit db13b6d4c4
parent bb02d6c33d d44298d679
53 changed files with 2010 additions and 1266 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -11710,6 +11710,13 @@
    githubId = 168301;
    name = "Victor Engmark";
  };
+  l33tname = {
+    name = "l33tname";
+    email = "hi@l33t.name";
+
+    github = "Fliiiix";
+    githubId = 1682954;
+  };
  l3af = {
    email = "L3afMeAlon3@gmail.com";
    matrix = "@L3afMe:matrix.org";
--- a/nixos/tests/endlessh-go.nix
+++ b/nixos/tests/endlessh-go.nix
@ -44,15 +44,19 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
        server.wait_for_unit("endlessh-go.service")
        server.wait_for_open_port(2222)
        server.wait_for_open_port(9229)
+        server.fail("curl -sSf server:9229/metrics | grep -q endlessh_client_closed_count_total")
        client.succeed("nc -dvW5 server 2222")
-        client.succeed("curl -kv server:9229/metrics")
+        server.succeed("curl -sSf server:9229/metrics | grep -q endlessh_client_closed_count_total")
+        client.fail("curl -sSfm 5 server:9229/metrics")

    with subtest("Privileged"):
        activate_specialisation("privileged")
        server.wait_for_unit("endlessh-go.service")
        server.wait_for_open_port(22)
        server.wait_for_open_port(92)
+        server.fail("curl -sSf server:92/metrics | grep -q endlessh_client_closed_count_total")
        client.succeed("nc -dvW5 server 22")
-        client.succeed("curl -kv server:92/metrics")
+        server.succeed("curl -sSf server:92/metrics | grep -q endlessh_client_closed_count_total")
+        client.fail("curl -sSfm 5 server:92/metrics")
  '';
 })
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@ -44,13 +44,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "strawberry";
-  version = "1.1.2";
+  version = "1.1.3";

  src = fetchFromGitHub {
    owner = "jonaski";
    repo = pname;
    rev = version;
-    hash = "sha256-86AMmp8R9/NibTsMFTTFcMeIqZ5x8din9RcBvhGO9xg=";
+    hash = "sha256-yca1BJWhSUVamqSKfvEzU3xbzdR+kwfSs0pyS08oUR0=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -18624,5 +18624,17 @@ final: prev:
    meta.homepage = "https://github.com/jhradilek/vim-snippets/";
  };

+  cmp-nixpkgs-maintainers = buildVimPlugin {
+    pname = "cmp-nixpkgs-maintainers";
+    version = "2024-10-12";
+    src = fetchFromGitHub {
+      owner = "GaetanLepage";
+      repo = "cmp-nixpkgs-maintainers";
+      rev = "da6a5050bc6be7a55c333d0009ae87d909e30b3f";
+      sha256 = "sha256-z/k7lC2tZvll+BlXoj5N7EwOGN3f3Lu4gT6YWocCL8c=";
+    };
+    meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/";
+  };
+

 }
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -370,6 +370,11 @@ in
    nvimRequireCheck = "cmp_neosnippet";
  };

+  cmp-nixpkgs-maintainers = super.cmp-nixpkgs-maintainers.overrideAttrs {
+    dependencies = with self; [ nvim-cmp ];
+    nvimRequireCheck = "cmp_nixpkgs_maintainers";
+  };
+
  cmp-npm = super.cmp-npm.overrideAttrs {
    dependencies = with self; [
      nvim-cmp
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -159,6 +159,7 @@ https://github.com/max397574/cmp-greek/,HEAD,
 https://github.com/kdheepak/cmp-latex-symbols/,,
 https://github.com/octaltree/cmp-look/,HEAD,
 https://github.com/notomo/cmp-neosnippet/,HEAD,
+https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/,HEAD,
 https://github.com/David-Kunz/cmp-npm/,HEAD,
 https://github.com/hrsh7th/cmp-nvim-lsp/,,
 https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,,
--- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix
@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "vscode-wakatime";
    publisher = "WakaTime";
-    version = "18.0.5";
-    hash = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs=";
+    version = "24.2.0";
+    hash = "sha256-1AAerJsgmXJGiEOlxQRRo00JxYBm1Y8xI4rMQUcdv6k=";
  };

  meta = {
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -1547,8 +1547,8 @@ let
          # semver scheme, contrary to preview versions which are listed on
          # the VSCode Marketplace and use a calver scheme. We should avoid
          # using preview versions, because they expire after two weeks.
-          version = "15.1.0";
-          hash = "sha256-xGgm/WNJDIh/Bs11fLYwHQ9ULiZBWbKw4QYl/l4KYJ4=";
+          version = "15.6.0";
+          hash = "sha256-s6ur76DyNhwuZOYma2zPfYEs3lMliRuhdmZhITCSCPE=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
@ -4684,6 +4684,21 @@ let
        };
      };

+      tauri-apps.tauri-vscode = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "tauri-vscode";
+          publisher = "tauri-apps";
+          version = "0.2.9";
+          hash = "sha256-ySfsmKAReKTLl6lHax2fnPu9paQ2pBSEMUoeGtGJelA=";
+        };
+        meta = {
+          description = "Enhances the experience of Tauri apps development";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode";
+          homepage = "https://github.com/tauri-apps/tauri-vscode";
+          license = lib.licenses.mit;
+        };
+      };
+
      teabyii.ayu = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "ayu";
--- a/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix
@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "magic-racket";
    publisher = "evzen-wybitul";
-    version = "0.6.4";
-    hash = "sha256-Hxa4VPm3QvJICzpDyfk94fGHu1hr+YN9szVBwDB8X4U=";
+    version = "0.6.7";
+    hash = "sha256-1A4j8710AYuV8gA+sybv6WSavPVcCPMvI71h4n4Jx0w=";
  };
  nativeBuildInputs = [
    jq
--- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
@ -1,25 +1,51 @@
-{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, writeScript, python3, runCommand
-, branch
-, withOpenASAR ? false, openasar
-, withVencord ? false, vencord }:
+{
+  pname,
+  version,
+  src,
+  meta,
+  stdenv,
+  binaryName,
+  desktopName,
+  lib,
+  undmg,
+  makeWrapper,
+  writeScript,
+  python3,
+  runCommand,
+  branch,
+  withOpenASAR ? false,
+  openasar,
+  withVencord ? false,
+  vencord,
+}:

 let
-  disableBreakingUpdates = runCommand "disable-breaking-updates.py"
-    {
-      pythonInterpreter = "${python3.interpreter}";
-      configDirName = lib.toLower binaryName;
-      meta.mainProgram = "disable-breaking-updates.py";
-    } ''
-    mkdir -p $out/bin
-    cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
-    substituteAllInPlace $out/bin/disable-breaking-updates.py
-    chmod +x $out/bin/disable-breaking-updates.py
-  '';
+  disableBreakingUpdates =
+    runCommand "disable-breaking-updates.py"
+      {
+        pythonInterpreter = "${python3.interpreter}";
+        configDirName = lib.toLower binaryName;
+        meta.mainProgram = "disable-breaking-updates.py";
+      }
+      ''
+        mkdir -p $out/bin
+        cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
+        substituteAllInPlace $out/bin/disable-breaking-updates.py
+        chmod +x $out/bin/disable-breaking-updates.py
+      '';
 in
 stdenv.mkDerivation {
-  inherit pname version src meta;
+  inherit
+    pname
+    version
+    src
+    meta
+    ;

-  nativeBuildInputs = [ undmg makeWrapper ];
+  nativeBuildInputs = [
+    undmg
+    makeWrapper
+  ];

  sourceRoot = ".";

@ -37,14 +63,16 @@ stdenv.mkDerivation {
    runHook postInstall
  '';

-  postInstall = lib.strings.optionalString withOpenASAR ''
-    cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar
-  '' + lib.strings.optionalString withVencord ''
-    mv $out/Applications/${desktopName}.app/Contents/Resources/app.asar $out/Applications/${desktopName}.app/Contents/Resources/_app.asar
-    mkdir $out/Applications/${desktopName}.app/Contents/Resources/app.asar
-    echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json
-    echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js
-  '';
+  postInstall =
+    lib.strings.optionalString withOpenASAR ''
+      cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar
+    ''
+    + lib.strings.optionalString withVencord ''
+      mv $out/Applications/${desktopName}.app/Contents/Resources/app.asar $out/Applications/${desktopName}.app/Contents/Resources/_app.asar
+      mkdir $out/Applications/${desktopName}.app/Contents/Resources/app.asar
+      echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json
+      echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js
+    '';

  passthru = {
    # make it possible to run disableBreakingUpdates standalone
@ -56,7 +84,9 @@ stdenv.mkDerivation {
      set -eou pipefail;
      url=$(curl -sI -o /dev/null -w '%header{location}' "https://discord.com/api/download/${branch}?platform=osx&format=dmg")
      version=$(echo $url | grep -oP '/\K(\d+\.){2}\d+')
-      update-source-version ${lib.optionalString (!stdenv.buildPlatform.isDarwin) "pkgsCross.aarch64-darwin."}${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch}
+      update-source-version ${
+        lib.optionalString (!stdenv.buildPlatform.isDarwin) "pkgsCross.aarch64-darwin."
+      }${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch}
    '';
  };
 }
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@ -1,17 +1,26 @@
-{ branch ? "stable", callPackage, fetchurl, lib, stdenv }:
+{
+  branch ? "stable",
+  callPackage,
+  fetchurl,
+  lib,
+  stdenv,
+}:
 let
  versions =
-    if stdenv.hostPlatform.isLinux then {
-      stable = "0.0.71";
-      ptb = "0.0.110";
-      canary = "0.0.502";
-      development = "0.0.30";
-    } else {
-      stable = "0.0.322";
-      ptb = "0.0.140";
-      canary = "0.0.611";
-      development = "0.0.53";
-    };
+    if stdenv.hostPlatform.isLinux then
+      {
+        stable = "0.0.71";
+        ptb = "0.0.111";
+        canary = "0.0.503";
+        development = "0.0.30";
+      }
+    else
+      {
+        stable = "0.0.322";
+        ptb = "0.0.141";
+        canary = "0.0.612";
+        development = "0.0.53";
+      };
  version = versions.${branch};
  srcs = rec {
    x86_64-linux = {
@ -21,11 +30,11 @@ let
      };
      ptb = fetchurl {
        url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        hash = "sha256-NV/0YKn1rG54Zkc9qAmpeb+4YbKjxhjTCdPOd84Lcc8=";
+        hash = "sha256-mms/qTA3XS+R5CDFWFS2RxiHOWnpU348nYagt9L2k2w=";
      };
      canary = fetchurl {
        url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-2DE7p3eT/mVGC+ejnTcTEhF7sEWyhfUfzj0gYTh+6Dw=";
+        hash = "sha256-Z0dv/jM0RipRI73vO9O5qqE0xf8qJtljZ3Zjr0Tf/KA=";
      };
      development = fetchurl {
        url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
@ -39,11 +48,11 @@ let
      };
      ptb = fetchurl {
        url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-VGhvykujfzI7jwXE+lHTzqT0t08GaON6gCuf13po7wY=";
+        hash = "sha256-EVwosCb/34W4+dx/u/5aq3pl6FqU1QiFT17yPydtGBU=";
      };
      canary = fetchurl {
        url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-QC8RANqoyMAGKjTF0NNhz7wMt65D5LI1xYtd++dHXC4=";
+        hash = "sha256-xvrsohxoCTODG3Au5E773SEX5UXbBJ98J2Eb3Vtybfw=";
      };
      development = fetchurl {
        url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
@ -52,31 +61,46 @@ let
    };
    aarch64-darwin = x86_64-darwin;
  };
-  src = srcs.${stdenv.hostPlatform.system}.${branch} or (throw "${stdenv.hostPlatform.system} not supported on ${branch}");
+  src =
+    srcs.${stdenv.hostPlatform.system}.${branch}
+      or (throw "${stdenv.hostPlatform.system} not supported on ${branch}");

-  meta = with lib; {
+  meta = {
    description = "All-in-one cross-platform voice and text chat for gamers";
-    homepage = "https://discordapp.com/";
    downloadPage = "https://discordapp.com/download";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ Scrumplex artturin infinidoge jopejoe1 ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    homepage = "https://discordapp.com/";
+    license = lib.licenses.unfree;
    mainProgram = "discord";
+    maintainers = with lib.maintainers; [
+      artturin
+      donteatoreo
+      infinidoge
+      jopejoe1
+      Scrumplex
+    ];
+    platforms = [
+      "x86_64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
  };
-  package =
-    if stdenv.hostPlatform.isLinux
-    then ./linux.nix
-    else ./darwin.nix;
+  package = if stdenv.hostPlatform.isLinux then ./linux.nix else ./darwin.nix;

  packages = (
    builtins.mapAttrs
-      (_: value:
-        callPackage package (value
+      (
+        _: value:
+        callPackage package (
+          value
          // {
-          inherit src version branch;
-          meta = meta // { mainProgram = value.binaryName; };
-        }))
+            inherit src version branch;
+            meta = meta // {
+              mainProgram = value.binaryName;
+            };
+          }
+        )
+      )
      {
        stable = {
          pname = "discord";
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@ -1,34 +1,92 @@
-{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook
-, makeDesktopItem, lib, stdenv, wrapGAppsHook3, makeShellWrapper, alsa-lib, at-spi2-atk
-, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf
-, glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11
-, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
-, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
-, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
-, libunity
-, speechd-minimal
-, wayland
-, branch
-, withOpenASAR ? false, openasar
-, withVencord ? false, vencord
-, withTTS ? true }:
+{
+  pname,
+  version,
+  src,
+  meta,
+  binaryName,
+  desktopName,
+  autoPatchelfHook,
+  makeDesktopItem,
+  lib,
+  stdenv,
+  wrapGAppsHook3,
+  makeShellWrapper,
+  alsa-lib,
+  at-spi2-atk,
+  at-spi2-core,
+  atk,
+  cairo,
+  cups,
+  dbus,
+  expat,
+  fontconfig,
+  freetype,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  libcxx,
+  libdrm,
+  libglvnd,
+  libnotify,
+  libpulseaudio,
+  libuuid,
+  libX11,
+  libXScrnSaver,
+  libXcomposite,
+  libXcursor,
+  libXdamage,
+  libXext,
+  libXfixes,
+  libXi,
+  libXrandr,
+  libXrender,
+  libXtst,
+  libxcb,
+  libxshmfence,
+  mesa,
+  nspr,
+  nss,
+  pango,
+  systemd,
+  libappindicator-gtk3,
+  libdbusmenu,
+  writeScript,
+  python3,
+  runCommand,
+  libunity,
+  speechd-minimal,
+  wayland,
+  branch,
+  withOpenASAR ? false,
+  openasar,
+  withVencord ? false,
+  vencord,
+  withTTS ? true,
+}:

 let
-  disableBreakingUpdates = runCommand "disable-breaking-updates.py"
-    {
-      pythonInterpreter = "${python3.interpreter}";
-      configDirName = lib.toLower binaryName;
-      meta.mainProgram = "disable-breaking-updates.py";
-    } ''
-    mkdir -p $out/bin
-    cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
-    substituteAllInPlace $out/bin/disable-breaking-updates.py
-    chmod +x $out/bin/disable-breaking-updates.py
-  '';
+  disableBreakingUpdates =
+    runCommand "disable-breaking-updates.py"
+      {
+        pythonInterpreter = "${python3.interpreter}";
+        configDirName = lib.toLower binaryName;
+        meta.mainProgram = "disable-breaking-updates.py";
+      }
+      ''
+        mkdir -p $out/bin
+        cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
+        substituteAllInPlace $out/bin/disable-breaking-updates.py
+        chmod +x $out/bin/disable-breaking-updates.py
+      '';
 in

 stdenv.mkDerivation rec {
-  inherit pname version src meta;
+  inherit
+    pname
+    version
+    src
+    meta
+    ;

  nativeBuildInputs = [
    alsa-lib
@ -50,48 +108,51 @@ stdenv.mkDerivation rec {

  dontWrapGApps = true;

-  libPath = lib.makeLibraryPath ([
-    libcxx
-    systemd
-    libpulseaudio
-    libdrm
-    mesa
-    stdenv.cc.cc
-    alsa-lib
-    atk
-    at-spi2-atk
-    at-spi2-core
-    cairo
-    cups
-    dbus
-    expat
-    fontconfig
-    freetype
-    gdk-pixbuf
-    glib
-    gtk3
-    libglvnd
-    libnotify
-    libX11
-    libXcomposite
-    libunity
-    libuuid
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
-    nspr
-    libxcb
-    pango
-    libXScrnSaver
-    libappindicator-gtk3
-    libdbusmenu
-    wayland
-  ] ++ lib.optional withTTS speechd-minimal);
+  libPath = lib.makeLibraryPath (
+    [
+      libcxx
+      systemd
+      libpulseaudio
+      libdrm
+      mesa
+      stdenv.cc.cc
+      alsa-lib
+      atk
+      at-spi2-atk
+      at-spi2-core
+      cairo
+      cups
+      dbus
+      expat
+      fontconfig
+      freetype
+      gdk-pixbuf
+      glib
+      gtk3
+      libglvnd
+      libnotify
+      libX11
+      libXcomposite
+      libunity
+      libuuid
+      libXcursor
+      libXdamage
+      libXext
+      libXfixes
+      libXi
+      libXrandr
+      libXrender
+      libXtst
+      nspr
+      libxcb
+      pango
+      libXScrnSaver
+      libappindicator-gtk3
+      libdbusmenu
+      wayland
+    ]
+    ++ lib.optional withTTS speechd-minimal
+  );

  installPhase = ''
    runHook preInstall
@ -113,9 +174,7 @@ stdenv.mkDerivation rec {

    ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
    # Without || true the install would fail on case-insensitive filesystems
-    ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${
-      lib.strings.toLower binaryName
-    } || true
+    ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true

    ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png
    ln -s $out/opt/${binaryName}/discord.png $out/share/icons/hicolor/256x256/apps/${pname}.png
@ -125,14 +184,16 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

-  postInstall = lib.strings.optionalString withOpenASAR ''
-    cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar
-  '' + lib.strings.optionalString withVencord ''
-    mv $out/opt/${binaryName}/resources/app.asar $out/opt/${binaryName}/resources/_app.asar
-    mkdir $out/opt/${binaryName}/resources/app.asar
-    echo '{"name":"discord","main":"index.js"}' > $out/opt/${binaryName}/resources/app.asar/package.json
-    echo 'require("${vencord}/patcher.js")' > $out/opt/${binaryName}/resources/app.asar/index.js
-  '';
+  postInstall =
+    lib.strings.optionalString withOpenASAR ''
+      cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar
+    ''
+    + lib.strings.optionalString withVencord ''
+      mv $out/opt/${binaryName}/resources/app.asar $out/opt/${binaryName}/resources/_app.asar
+      mkdir $out/opt/${binaryName}/resources/app.asar
+      echo '{"name":"discord","main":"index.js"}' > $out/opt/${binaryName}/resources/app.asar/package.json
+      echo 'require("${vencord}/patcher.js")' > $out/opt/${binaryName}/resources/app.asar/index.js
+    '';

  desktopItem = makeDesktopItem {
    name = pname;
@ -140,7 +201,10 @@ stdenv.mkDerivation rec {
    icon = pname;
    inherit desktopName;
    genericName = meta.description;
-    categories = [ "Network" "InstantMessaging" ];
+    categories = [
+      "Network"
+      "InstantMessaging"
+    ];
    mimeTypes = [ "x-scheme-handler/discord" ];
  };

--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@ -3,6 +3,8 @@
  signal-desktop =
    if hostPlatform.system == "aarch64-linux" then
      callPackage ./signal-desktop-aarch64.nix { }
+    else if hostPlatform.isDarwin then
+      callPackage ./signal-desktop-darwin.nix { }
    else
      callPackage ./signal-desktop.nix { };
  signal-desktop-beta = (callPackage ./signal-desktop-beta.nix { }).overrideAttrs (old: {
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
@ -273,7 +273,7 @@ stdenv.mkDerivation rec {
      emily
    ];
    mainProgram = pname;
-    platforms = [ "x86_64-linux" "aarch64-linux" ];
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
  };
 }
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix
@ -0,0 +1,61 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  _7zz,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "signal-desktop";
+  version = "7.28.0";
+
+  src = fetchurl {
+    url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
+    hash = "sha256-yPObHZPCXRycuf9VexooWkXDJLReEiTuFSmCxlHA/OU=";
+  };
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ _7zz ];
+
+  dontConfigure = true;
+  dontBuild = true;
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications
+    cp -r Signal.app $out/Applications
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript.command = [ ./update.sh ];
+  };
+
+  meta = {
+    description = "Private, simple, and secure messenger";
+    longDescription = ''
+      Signal Desktop is an Electron application that links with your
+      "Signal Android" or "Signal iOS" app.
+    '';
+    homepage = "https://signal.org/";
+    downloadPage = "https://signal.org/download/macos/";
+    changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [
+      agpl3Only
+
+      # Various npm packages
+      free
+
+      # has non-redistributable Apple emoji packaged, see main derivation
+      unfree
+    ];
+    maintainers = with lib.maintainers; [ nickhu ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh
@ -26,6 +26,12 @@ signal-desktop)
    --system aarch64-linux \
    --override-filename "$SCRIPT_DIR/signal-desktop-aarch64.nix" \
    signal-desktop
+
+  echo "Updating signal-desktop for darwin"
+  nix-update --version "$latestVersion" \
+    --system aarch64-darwin \
+    --override-filename "$SCRIPT_DIR/signal-desktop-darwin.nix" \
+    signal-desktop
  ;;
 signal-desktop-beta)
  latestTagBeta=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases | jq -r ".[0].tag_name")
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@ -63,14 +63,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "telegram-desktop";
-  version = "5.6.1";
+  version = "5.6.1-unstable-2024-10-12";

  src = fetchFromGitHub {
    owner = "telegramdesktop";
    repo = "tdesktop";
-    rev = "v${finalAttrs.version}";
+    rev = "f2e0e481de5d379b9542f6ff9021fab5d409c1d4";
    fetchSubmodules = true;
-    hash = "sha256-MMXaNJ9uadThBghOObt4KNP73Wd2rCnJJXSHkwEKFxw=";
+    hash = "sha256-MmzSxC4tgoCgrG/IQAmpXGHNq+kiU/rSWeKn1f1uEg8=";
  };

  patches = [
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@ -56,18 +56,19 @@ in rec {
  thunderbird = thunderbird-128;

  thunderbird-115 = common {
-    version = "115.15.0";
-    sha512 = "b161b99e09b6d1ba833f77264e35034ad199438b4fc88d244a6b68c84693fa2e90fbab60dafb827a2e23b37c484f9843a58751d93826ba7cdd0391114d253de2";
+    version = "115.16.0esr";
+    sha512 = "1c70050a773c92593dca2a34b25e9e6edcef6fbb9b081024e4dba024450219e06aace52d9fb90ccc2e8069b7bba0396258c86cc19848a7ac705b42641f6e36a5";

    updateScript = callPackage ./update.nix {
      attrPath = "thunderbirdPackages.thunderbird-115";
      versionPrefix = "115";
+      versionSuffix = "esr";
    };
  };

  thunderbird-128 = common {
-    version = "128.2.3esr";
-    sha512 = "f852d1fe6b8d41aa2f0fbc0fceae93cccf1e5f88d9c0447f504de775283289b82b246b79a01e8eb26e9c87197fb33138fb18c75ecc3f5f1bcfefa3920a7c7512";
+    version = "128.3.1esr";
+    sha512 = "9fef04a0c498eb16688c141cb7d45e803ecc75ea6fc6117ff8ad1e6b049716f49b435f3e5a1baa703fa937e25483137e22256e58572eeacf317de264b961ba6a";

    updateScript = callPackage ./update.nix {
      attrPath = "thunderbirdPackages.thunderbird-128";
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@ -85,6 +85,14 @@ stdenv.mkDerivation (finalAttrs: {
      hash = "sha256-yRSw4VWDwMwysDB3Hw/tsmTjEQUhipvrVRQcZkbtuoI=";
      includes = [ "*/CompilerConfig.cmake" ];
    })
+
+    (fetchpatch {
+      name = "qt-6.8.patch";
+      url = "https://github.com/obsproject/obs-websocket/commit/d9befb9e0a4898695eef5ccbc91a4fac02027854.patch";
+      extraPrefix = "plugins/obs-websocket/";
+      stripLen = 1;
+      hash = "sha256-7SDBRr9G40b9DfbgdaYJxTeiDSLUfVixtMtM3cLTVZs=";
+    })
  ];

  nativeBuildInputs = [
--- a/pkgs/by-name/cr/crow/package.nix
+++ b/pkgs/by-name/cr/crow/package.nix
@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  asio,
+  python3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "crow";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "crowcpp";
+    repo = "crow";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-fokj+KiS6frPVOoOvETxW3ue95kCcYhdhOlN3efzBd4=";
+  };
+
+  propagatedBuildInputs = [ asio ];
+  nativeBuildInputs = [
+    asio
+    cmake
+    python3
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "CROW_BUILD_EXAMPLES" false)
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "A Fast and Easy to use microframework for the web";
+    homepage = "https://crowcpp.org/";
+    maintainers = with lib.maintainers; [ l33tname ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd3;
+  };
+})
--- a/pkgs/by-name/eu/eudev/package.nix
+++ b/pkgs/by-name/eu/eudev/package.nix
@ -6,6 +6,7 @@
 , kmod
 , pkg-config
 , util-linux
+, testers
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -56,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
    "udevrulesdir=$(out)/var/lib/udev/rules.d"
  ];

+  passthru.tests = {
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
  meta = {
    homepage = "https://github.com/eudev-project/eudev";
    description = "Fork of udev with the aim of isolating it from init";
@ -80,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://github.com/eudev-project/eudev/releases/tag/${finalAttrs.src.rev}";
    license = lib.licenses.gpl2Plus;
    maintainers = with lib.maintainers; [ raskin AndersonTorres ];
+    pkgConfigModules = [ "libudev" "udev" ];
    inherit (kmod.meta) platforms;
  };
 })
--- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix
+++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
@ -3,6 +3,7 @@
  lib,
  substituteAll,
  fetchurl,
+  fetchpatch,
  meson,
  ninja,
  pkg-config,
@ -37,6 +38,7 @@
  tzdata,
  gcr_4,
  gnome-session-ctl,
+  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -56,6 +58,18 @@ stdenv.mkDerivation (finalAttrs: {
      src = ./fix-paths.patch;
      inherit tzdata;
    })
+
+    (fetchpatch {
+      name = "backport-no-systemd-fix-1.patch";
+      url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/46f998d7308cb18832666bc34ee54b1d9c27739f.patch";
+      includes = [ "plugins/sharing/gsd-sharing-manager.c" ];
+      hash = "sha256-P5FJUY50Pg3MuwHwGUz28/TMZkT7j+fmGPozWb9rVYo=";
+    })
+    (fetchpatch {
+      name = "backport-no-systemd-fix-2.patch";
+      url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/1a4d50f4ee611bdede6072c0bfd2a1b2e327c5fc.patch";
+      hash = "sha256-pROhnE9GziS9h0nMWZBsd8YtW6RxMrwmaSOe0UtkUJU=";
+    })
  ];

  nativeBuildInputs = [
@ -71,34 +85,41 @@ stdenv.mkDerivation (finalAttrs: {
    python3
  ];

-  buildInputs = [
-    gtk3
-    glib
-    gsettings-desktop-schemas
-    modemmanager
-    networkmanager
-    libnotify
-    libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
-    gnome-desktop
-    libpulseaudio
-    alsa-lib
-    libcanberra-gtk3
-    upower
-    colord
-    libgweather
-    polkit
-    geocode-glib_2
-    geoclue2
-    systemd
-    libgudev
-    libwacom
-    gcr_4
-  ];
+  buildInputs =
+    [
+      gtk3
+      glib
+      gsettings-desktop-schemas
+      modemmanager
+      networkmanager
+      libnotify
+      libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
+      gnome-desktop
+      libpulseaudio
+      alsa-lib
+      libcanberra-gtk3
+      upower
+      colord
+      libgweather
+      polkit
+      geocode-glib_2
+      geoclue2
+      libgudev
+      libwacom
+      gcr_4
+    ]
+    ++ lib.optionals withSystemd [
+      systemd
+    ];

-  mesonFlags = [
-    "-Dudev_dir=${placeholder "out"}/lib/udev"
-    "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
-  ];
+  mesonFlags =
+    [
+      "-Dudev_dir=${placeholder "out"}/lib/udev"
+      (lib.mesonBool "systemd" withSystemd)
+    ]
+    ++ lib.optionals withSystemd [
+      "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
+    ];

  # Default for release buildtype but passed manually because
  # we're using plain
--- a/pkgs/by-name/gz/gzdoom/package.nix
+++ b/pkgs/by-name/gz/gzdoom/package.nix
@ -28,14 +28,14 @@

 stdenv.mkDerivation rec {
  pname = "gzdoom";
-  version = "4.12.2";
+  version = "4.13.0";

  src = fetchFromGitHub {
    owner = "ZDoom";
    repo = "gzdoom";
    rev = "g${version}";
    fetchSubmodules = true;
-    hash = "sha256-taie1Iod3pXvuxxBC7AArmtndkIV0Di9mtJoPvPkioo=";
+    hash = "sha256-Cm4ww/QXTzRiSojeGtZ+CwAL2oSxKaTaTLiGkcNjxaE=";
  };

  outputs = [
--- a/pkgs/by-name/mi/misskey/package.nix
+++ b/pkgs/by-name/mi/misskey/package.nix
@ -18,13 +18,13 @@
 stdenv.mkDerivation (finalAttrs: {
  pname = "misskey";

-  version = "2024.5.0";
+  version = "2024.10.0";

  src = fetchFromGitHub {
    owner = "misskey-dev";
    repo = finalAttrs.pname;
    rev = finalAttrs.version;
-    hash = "sha256-nKf+SfuF6MQtNO53E6vN9CMDvQzKMv3PrD6gs9Qa86w=";
+    hash = "sha256-cQ8JQnnaS6aX2wZdnimTznHj20hJe0CJ4NESybCk9CU=";
    fetchSubmodules = true;
  };

@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
  # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
  pnpmDeps = pnpm.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-A1JBLa6lIw5tXFuD2L3vvkH6pHS5rlwt8vU2+UUQYdg=";
+    hash = "sha256-ZEBrYqLc0+yKbroSWk01UZwA97CyOVPhqgqFArM2U8g=";
  };

  buildPhase = ''
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@ -5,6 +5,7 @@
 , bluez
 , cjson
 , cmake
+, config
 , dbus
 , doxygen
 , eigen
@ -51,6 +52,8 @@
 , zlib
 , zstd
 , nixosTests
+, cudaPackages
+, enableCuda ? config.cudaSupport
  # Set as 'false' to build monado without service support, i.e. allow VR
  # applications linking against libopenxr_monado.so to use OpenXR standalone
  # instead of via the monado-service program. For more information see:
@ -84,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.cmakeBool "XRT_HAVE_TRACY" true)
    (lib.cmakeBool "XRT_FEATURE_TRACING" true)
    (lib.cmakeBool "XRT_HAVE_STEAM" true)
+    (lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}")
  ];

  buildInputs = [
--- a/pkgs/by-name/mo/mongosh/package-lock.json
+++ b/pkgs/by-name/mo/mongosh/package-lock.json
--- a/pkgs/by-name/mo/mongosh/source.json
+++ b/pkgs/by-name/mo/mongosh/source.json
@ -1,6 +1,6 @@
 {
-  "version": "2.3.1",
-  "integrity": "sha512-Xl6HYKgrdKtmwMB7oa04cowOQmUf/kjMUfdCh/IJaF+2NKPaXPw7bPlEcxHOXSc/7jAZe9gtAbkurqkHqE39hg==",
-  "filename": "mongosh-2.3.1.tgz",
-  "deps": "sha256-ets4hJ1+BtL0BQFTzNSvfvbpbHc1dIIOviOi4PTA65U="
+  "version": "2.3.2",
+  "integrity": "sha512-KobngQr6A3kS7DJhXBc+sAnk3GujTI/WxVz+NfOVl0i/DDd6v+dI95xwhxggcu6wUtvj40AyTH20gvvvdkeGHg==",
+  "filename": "mongosh-2.3.2.tgz",
+  "deps": "sha256-t6HsvxXLutSjGfYTVX/15b+WCbT5+2NO2epW0aNttAI="
 }
--- a/pkgs/by-name/nv/nvrh/package.nix
+++ b/pkgs/by-name/nv/nvrh/package.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "nvrh";
-  version = "0.1.9";
+  version = "0.1.12";

  src = fetchFromGitHub {
    owner = "mikew";
    repo = "nvrh";
    rev = "refs/tags/v${version}";
-    hash = "sha256-QM8VVvNTPvu6Yg1G8FW/694RyTbw36AqkvISeP70gpE=";
+    hash = "sha256-rOEzzKvz4z0KEu39snNJsxr9chx/hCf5PCQ99NJR4qI=";
  };

  postPatch = ''
--- a/pkgs/by-name/pe/pest/composer.lock
+++ b/pkgs/by-name/pe/pest/composer.lock
--- a/pkgs/by-name/pe/pest/package.nix
+++ b/pkgs/by-name/pe/pest/package.nix
@ -1,19 +1,19 @@
 { lib, fetchFromGitHub, php }:

-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
  pname = "pest";
-  version = "2.34.7";
+  version = "3.3.1";

  src = fetchFromGitHub {
    owner = "pestphp";
    repo = "pest";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-rRXRtcjQUCx8R5sGRBUwlKtog6jQ1WaOu225npM6Ct8=";
+    hash = "sha256-HLUzXL05hcTLcBhKvf/PPJoCmEYdFqNkBbiRAQfR9ik=";
  };

  composerLock = ./composer.lock;

-  vendorHash = "sha256-+FKNGjwq+KFPw8agdwsgnwb2ENgFAWK5EngmS4hMcSA=";
+  vendorHash = "sha256-rd15W3aHot1MtLGZeU2QREnIE5wtNw28OSpli3Nye5Y=";

  meta = {
    changelog = "https://github.com/pestphp/pest/releases/tag/v${finalAttrs.version}";
--- a/pkgs/development/libraries/gcr/4.nix
+++ b/pkgs/development/libraries/gcr/4.nix
@ -22,6 +22,7 @@
 , gnome
 , python3
 , shared-mime-info
+, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
 }:

 stdenv.mkDerivation rec {
@ -56,8 +57,9 @@ stdenv.mkDerivation rec {
    pango
    libsecret
    openssh
-    systemd
    gtk4
+  ] ++ lib.optionals systemdSupport [
+    systemd
  ];

  propagatedBuildInputs = [
@ -74,6 +76,7 @@ stdenv.mkDerivation rec {
    # https://github.com/NixOS/nixpkgs/issues/140824
    "-Dssh_agent=false"
    "-Dgpg_path=${lib.getBin gnupg}/bin/gpg"
+    (lib.mesonEnable "systemd" systemdSupport)
  ];

  doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
--- a/pkgs/development/libraries/gnome-desktop/default.nix
+++ b/pkgs/development/libraries/gnome-desktop/default.nix
@ -18,11 +18,13 @@
 , wayland
 , libseccomp
 , systemd
+, udev
 , bubblewrap
 , gobject-introspection
 , gtk-doc
 , docbook-xsl-nons
 , gsettings-desktop-schemas
+, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
 }:

 stdenv.mkDerivation rec {
@ -64,11 +66,13 @@ stdenv.mkDerivation rec {
    gtk3
    gtk4
    glib
+  ] ++ lib.optionals withSystemd [
+    systemd
  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
    bubblewrap
    wayland
    libseccomp
-    systemd
+    udev
  ];

  propagatedBuildInputs = [
@ -78,8 +82,8 @@ stdenv.mkDerivation rec {
  mesonFlags = [
    "-Dgtk_doc=true"
    "-Ddesktop_docs=false"
+    (lib.mesonEnable "systemd" withSystemd)
  ] ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-    "-Dsystemd=disabled"
    "-Dudev=disabled"
  ];

--- a/pkgs/development/libraries/libudev-zero/default.nix
+++ b/pkgs/development/libraries/libudev-zero/default.nix
@ -1,13 +1,13 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, testers }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "libudev-zero";
  version = "1.0.3";

  src = fetchFromGitHub {
    owner = "illiliti";
    repo = "libudev-zero";
-    rev = version;
+    rev = finalAttrs.version;
    sha256 = "sha256-NXDof1tfr66ywYhCBDlPa+8DUfFj6YH0dvSaxHFqsXI=";
  };

@ -19,12 +19,17 @@ stdenv.mkDerivation rec {

  installTargets = lib.optionals stdenv.hostPlatform.isStatic "install-static";

+  passthru.tests = {
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
  meta = with lib; {
    homepage = "https://github.com/illiliti/libudev-zero";
    description = "Daemonless replacement for libudev";
    changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${version}";
    maintainers = with maintainers; [ qyliss shamilton ];
    license = licenses.isc;
+    pkgConfigModules = [ "libudev" ];
    platforms = platforms.linux;
  };
-}
+})
--- a/pkgs/development/libraries/opencascade-occt/default.nix
+++ b/pkgs/development/libraries/opencascade-occt/default.nix
@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
    libXi
  ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa;

+  NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
+
  meta = with lib; {
    description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
    homepage = "https://www.opencascade.org/";
--- a/pkgs/development/libraries/zmusic/default.nix
+++ b/pkgs/development/libraries/zmusic/default.nix
@ -1,37 +1,36 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, alsa-lib
-, cmake
-, fluidsynth
-, libsndfile
-, mpg123
-, ninja
-, pkg-config
-, soundfont-fluid
-, zlib
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  alsa-lib,
+  cmake,
+  fluidsynth,
+  libsndfile,
+  mpg123,
+  ninja,
+  pkg-config,
+  soundfont-fluid,
+  zlib,
 }:

 stdenv.mkDerivation rec {
  pname = "zmusic";
-  version = "1.1.13";
+  version = "1.1.14";

  src = fetchFromGitHub {
    owner = "ZDoom";
    repo = "ZMusic";
    rev = version;
-    hash = "sha256-rvvMS5KciHEvoY4hSfgAEyWJiDMqBto4o09oIpQIGTQ=";
+    hash = "sha256-rEE3MZLwqnvn5MqbSTCErbsGRjKMK8cC3wTJxtf8WaU=";
  };

-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];

  patches = [
-    (fetchpatch {
-      name = "system-fluidsynth.patch";
-      url = "https://git.alpinelinux.org/aports/plain/community/zmusic/system-fluidsynth.patch?id=ca353107ef4f2e5c55c3cc824b0840e2838fb894";
-      hash = "sha256-xKaqiNk1Kt9yNLB22IVmSEtGeOtxrCi7YtFCmhNr0MI=";
-    })
+    ./fluidsynth.patch
  ];

  postPatch = ''
@ -54,16 +53,20 @@ stdenv.mkDerivation rec {
    zlib
  ];

-  meta = with lib; {
+  meta = {
    description = "GZDoom's music system as a standalone library";
    homepage = "https://github.com/ZDoom/ZMusic";
-    license = with licenses; [
+    license = with lib.licenses; [
      free
      gpl3Plus
      lgpl21Plus
      lgpl3Plus
    ];
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ azahi lassulus ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      azahi
+      lassulus
+      Gliczy
+    ];
  };
 }
--- a/pkgs/development/libraries/zmusic/fluidsynth.patch
+++ b/pkgs/development/libraries/zmusic/fluidsynth.patch
@ -0,0 +1,22 @@
+diff --git a/source/mididevices/music_fluidsynth_mididevice.cpp b/source/mididevices/music_fluidsynth_mididevice.cpp
+index 1a33d3c..496d842 100644
+--- a/source/mididevices/music_fluidsynth_mididevice.cpp
+++ b/source/mididevices/music_fluidsynth_mididevice.cpp
+@@ -47,7 +47,7 @@
+ 
+ FluidConfig fluidConfig;
+ 
+-#include "../thirdparty/fluidsynth/include/fluidsynth.h"
+#include <fluidsynth.h>
+ 
+ class FluidSynthMIDIDevice : public SoftSynthMIDIDevice
+ {
+diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
+index dd791db..c59b40d 100644
+--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
+@@ -28,4 +28,3 @@ add_subdirectory(timidityplus)
+ add_subdirectory(wildmidi)
+ add_subdirectory(oplsynth)
+ add_subdirectory(libxmp)
+-add_subdirectory(fluidsynth/src)
--- a/pkgs/development/ocaml-modules/hacl-star/raw.nix
+++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix
@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation rec {
  pname = "ocaml${ocaml.version}-hacl-star-raw";
-  version = "0.7.1";
+  version = "0.7.2";

  src = fetchzip {
    url = "https://github.com/cryspen/hacl-packages/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz";
-    hash = "sha256-TcAEaJou4BOVXSz5DYewzKfvIpjXmhLAlgF0hlq3ToQ=";
+    hash = "sha256-6WPbdkT9IsX0Q8mF2vLBJMktEES8tU45JztOPepAL0o=";
    stripRoot = false;
  };

@ -25,10 +25,7 @@ stdenv.mkDerivation rec {
  # strictoverflow is disabled because it breaks aarch64-darwin
  hardeningDisable = [ "strictoverflow" ];

-  # Compatibility with ctypes ≥ 0.21
-  # see: https://github.com/cryspen/hacl-packages/commit/81303b83a54a92d3b5f54f1b8ddbea60438cc2bf
  postPatch = ''
-    substituteInPlace hacl-star-raw/META --replace-warn 'requires="ctypes"' 'requires="ctypes ctypes.stubs"'
    patchShebangs ./
  '';

--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@ -4,6 +4,7 @@
  python,
  runCommand,
  fetchFromGitHub,
+  fetchpatch,
  configargparse,
  acme,
  configobj,
@ -33,7 +34,16 @@ buildPythonPackage rec {
    hash = "sha256-Qee7lUjgliG5fmUWWPm3MzpGJHUF/DXZ08UA6kkWjjk=";
  };

-  sourceRoot = "${src.name}/${pname}";
+  patches = [
+    (fetchpatch {
+      name = "CSR_support_in_pyOpenSSL_is_deprecated.patch";
+      url = "https://github.com/certbot/certbot/commit/f005045d87b25f1922774685646e57765aa202ad.patch";
+      includes = [ "pytest.ini" ];
+      hash = "sha256-YcQbZb7DLU+AXxNyqJRYZIC18DuT6X8kGbfdYtUrHiA=";
+    })
+  ];
+
+  postPatch = "cd ${pname}";  # using sourceRoot would interfere with patches

  build-system = [ setuptools ];

--- a/pkgs/development/python-modules/databricks-sdk/default.nix
+++ b/pkgs/development/python-modules/databricks-sdk/default.nix
@ -0,0 +1,85 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  google-auth,
+  requests,
+
+  # tests
+  pyfakefs,
+  pytestCheckHook,
+  pytest-mock,
+  requests-mock,
+}:
+
+buildPythonPackage rec {
+  pname = "databricks-sdk";
+  version = "0.34.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "databricks";
+    repo = "databricks-sdk-py";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-pbOm1aTHtIAwk/TJ5CCT9/CqSTuHTWkRgJuflObkU54=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    google-auth
+    requests
+  ];
+
+  pythonImportsCheck = [
+    "databricks.sdk"
+  ];
+
+  nativeCheckInputs = [
+    pyfakefs
+    pytestCheckHook
+    pytest-mock
+    requests-mock
+  ];
+
+  disabledTests =
+    [
+      # Require internet access
+      # ValueError: default auth: cannot configure default credentials, please chec...
+      "test_azure_cli_does_not_specify_tenant_id_with_msi"
+      "test_azure_cli_fallback"
+      "test_azure_cli_user_no_management_access"
+      "test_azure_cli_user_with_management_access"
+      "test_azure_cli_with_warning_on_stderr"
+      "test_azure_cli_workspace_header_present"
+      "test_config_azure_cli_host"
+      "test_config_azure_cli_host_and_resource_id"
+      "test_config_azure_cli_host_and_resource_i_d_configuration_precedence"
+      "test_load_azure_tenant_id_404"
+      "test_load_azure_tenant_id_happy_path"
+      "test_load_azure_tenant_id_no_location_header"
+      "test_load_azure_tenant_id_unparsable_location_header"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+      # requests.exceptions.ChunkedEncodingError: ("Connection broken: ConnectionResetError(54, 'Connection reset by peer')", ConnectionResetError(54, 'Connection reset by peer'))
+      "test_github_oidc_flow_works_with_azure"
+    ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
+    description = "Databricks SDK for Python";
+    homepage = "https://github.com/databricks/databricks-sdk-py";
+    changelog = "https://github.com/databricks/databricks-sdk-py/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
--- a/pkgs/development/python-modules/dbf/darwin.patch
+++ b/pkgs/development/python-modules/dbf/darwin.patch
@ -0,0 +1,12 @@
+diff --git a/dbf/test.py b/dbf/test.py
+index 117f611..34a9507 100755
+--- a/dbf/test.py
+++ b/dbf/test.py
+@@ -4814,6 +4814,7 @@ def test_index_search(self):
+         self.assertEqual(sorted.index_search('jul', partial=True), 9)
+         self.assertTrue(sorted.index_search('jul', partial=True))
+ 
+    @unittest.skipIf(sys.platform == 'darwin', 'fails on case-insensitive filesystems')
+     def test_mismatched_extensions(self):
+         old_memo_name = self.dbf_table._meta.memoname
+         new_memo_name = old_memo_name[:-3] + 'Dbt'
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@ -19,10 +19,15 @@ buildPythonPackage rec {
    hash = "sha256-MFEi1U0RNvrfDtV4HpvPgKTCibAh76z7Gnmj32IubYw=";
  };

+  # Workaround for https://github.com/ethanfurman/dbf/issues/48
+  patches = lib.optional python.stdenv.isDarwin ./darwin.patch;
+
  propagatedBuildInputs = [ aenum ];

  checkPhase = ''
+    runHook preCheck
    ${python.interpreter} -m dbf.test
+    runHook postCheck
  '';

  pythonImportsCheck = [ "dbf" ];
--- a/pkgs/development/python-modules/magicgui/default.nix
+++ b/pkgs/development/python-modules/magicgui/default.nix
@ -1,37 +1,46 @@
 {
  lib,
  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools-scm,
-  pytestCheckHook,
-  typing-extensions,
-  qtpy,
-  pyside2,
-  psygnal,
  docstring-parser,
+  fetchFromGitHub,
+  hatch-vcs,
+  hatchling,
  napari, # a reverse-dependency, for tests
+  psygnal,
+  pyside2,
+  pytestCheckHook,
+  pythonOlder,
+  superqt,
+  typing-extensions,
 }:
+
 buildPythonPackage rec {
  pname = "magicgui";
-  version = "0.5.1";
+  version = "0.9.1";
+  pyproject = true;

-  format = "pyproject";
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
-    owner = "napari";
+    owner = "pyapp-kit";
    repo = "magicgui";
    rev = "refs/tags/v${version}";
-    hash = "sha256-fVfBQaaT8/lUGqZRXjOPgvkC01Izb8Sxqn7RCqnW9bo=";
+    hash = "sha256-6ye29HtGQ8iwYE2kQ1wWIBC+bzFsMZmJR4eTXWwu7+U=";
  };

-  nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
+
+  dependencies = [
    typing-extensions
-    qtpy
+    superqt
    pyside2
    psygnal
    docstring-parser
  ];
+
  nativeCheckInputs = [ pytestCheckHook ];

  doCheck = false; # Reports "Fatal Python error"
@ -43,6 +52,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Build GUIs from python functions, using magic.  (napari/magicgui)";
    homepage = "https://github.com/napari/magicgui";
+    changelog = "https://github.com/pyapp-kit/magicgui/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ SomeoneSerge ];
  };
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@ -1,20 +1,24 @@
 {
  lib,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
  alembic,
  buildPythonPackage,
  cachetools,
  click,
  cloudpickle,
-  databricks-cli,
+  databricks-sdk,
  docker,
-  entrypoints,
-  fetchPypi,
  flask,
  gitpython,
-  gorilla,
  graphene,
  gunicorn,
  importlib-metadata,
+  jinja2,
  markdown,
  matplotlib,
  numpy,
@ -22,33 +26,58 @@
  opentelemetry-sdk,
  packaging,
  pandas,
-  prometheus-flask-exporter,
  protobuf,
-  python-dateutil,
-  pythonOlder,
  pyarrow,
-  pytz,
  pyyaml,
-  querystring-parser,
  requests,
-  setuptools,
  scikit-learn,
  scipy,
-  simplejson,
  sqlalchemy,
  sqlparse,
+
+  # tests
+  aiohttp,
+  azure-core,
+  azure-storage-blob,
+  azure-storage-file,
+  boto3,
+  botocore,
+  catboost,
+  datasets,
+  fastapi,
+  google-cloud-storage,
+  httpx,
+  jwt,
+  keras,
+  langchain,
+  librosa,
+  moto,
+  opentelemetry-exporter-otlp,
+  optuna,
+  pydantic,
+  pyspark,
+  pytestCheckHook,
+  pytorch-lightning,
+  sentence-transformers,
+  starlette,
+  statsmodels,
+  tensorflow,
+  torch,
+  transformers,
+  uvicorn,
+  xgboost,
 }:

 buildPythonPackage rec {
  pname = "mlflow";
-  version = "2.14.3";
+  version = "2.16.2";
  pyproject = true;

-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-KSyuS4NXSgyyIxF+IkyqZ5iTMHivAjNxnCthK+pkVhc=";
+  src = fetchFromGitHub {
+    owner = "mlflow";
+    repo = "mlflow";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-7W1gpVgJSN/iXoW987eCHfcOeE3D/ZJ2W/eilDdzOww=";
  };

  # Remove currently broken dependency `shap`, a model explainability package.
@ -64,20 +93,21 @@ buildPythonPackage rec {
    "pyarrow"
  ];

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    alembic
    cachetools
    click
    cloudpickle
-    databricks-cli
+    databricks-sdk
    docker
-    entrypoints
    flask
    gitpython
-    gorilla
    graphene
    gunicorn
    importlib-metadata
+    jinja2
    markdown
    matplotlib
    numpy
@ -85,36 +115,87 @@ buildPythonPackage rec {
    opentelemetry-sdk
    packaging
    pandas
-    prometheus-flask-exporter
    protobuf
    pyarrow
-    python-dateutil
-    pytz
    pyyaml
-    querystring-parser
    requests
    scikit-learn
    scipy
-    setuptools
-    #shap
-    simplejson
    sqlalchemy
    sqlparse
  ];

  pythonImportsCheck = [ "mlflow" ];

-  # no tests in PyPI dist
-  # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config
-  # also, tests use conda so can't run on NixOS without buildFHSEnv
+  nativeCheckInputs = [
+    aiohttp
+    azure-core
+    azure-storage-blob
+    azure-storage-file
+    boto3
+    botocore
+    catboost
+    datasets
+    fastapi
+    google-cloud-storage
+    httpx
+    jwt
+    keras
+    langchain
+    librosa
+    moto
+    opentelemetry-exporter-otlp
+    optuna
+    pydantic
+    pyspark
+    pytestCheckHook
+    pytorch-lightning
+    sentence-transformers
+    starlette
+    statsmodels
+    tensorflow
+    torch
+    transformers
+    uvicorn
+    xgboost
+  ];
+
+  disabledTestPaths = [
+    # Requires unpackaged `autogen`
+    "tests/autogen/test_autogen_autolog.py"
+
+    # Requires unpackaged `diviner`
+    "tests/diviner/test_diviner_model_export.py"
+
+    # Requires unpackaged `sktime`
+    "examples/sktime/test_sktime_model_export.py"
+
+    # Requires `fastai` which would cause a circular dependency
+    "tests/fastai/test_fastai_autolog.py"
+    "tests/fastai/test_fastai_model_export.py"
+
+    # Requires `spacy` which would cause a circular dependency
+    "tests/spacy/test_spacy_model_export.py"
+
+    # Requires `tensorflow.keras` which is not included in our outdated version of `tensorflow` (2.13.0)
+    "tests/gateway/providers/test_ai21labs.py"
+    "tests/tensorflow/test_keras_model_export.py"
+    "tests/tensorflow/test_keras_pyfunc_model_works_with_all_input_types.py"
+    "tests/tensorflow/test_mlflow_callback.py"
+  ];
+
+  # I (@GaetanLepage) gave up at enabling tests:
+  # - They require a lot of dependencies (some unpackaged);
+  # - Many errors occur at collection time;
+  # - Most (all ?) tests require internet access anyway.
  doCheck = false;

-  meta = with lib; {
+  meta = {
    description = "Open source platform for the machine learning lifecycle";
    mainProgram = "mlflow";
    homepage = "https://github.com/mlflow/mlflow";
    changelog = "https://github.com/mlflow/mlflow/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ tbenst ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ tbenst ];
  };
 }
--- a/pkgs/development/python-modules/napari-npe2/default.nix
+++ b/pkgs/development/python-modules/napari-npe2/default.nix
@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "napari-npe2";
-  version = "0.7.2-unstable-2023-10-20";
+  version = "0.7.7";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -27,19 +27,16 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "napari";
    repo = "npe2";
-    rev = "9d29e4d6dbbec75c2d36273647efd9ddfb59ded0";
-    hash = "sha256-JLu/5pXijPdpKY2z2rREtSKPiP33Yy4viegbxUiQg7Y=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-HjMf5J1n5NKqtunRQ7cqZiTZMTNmcq5j++O03Sxwvqw=";
  };

-  # fix this in the next release
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.7.2";
-
-  nativeBuildInputs = [
+  build-system = [
    hatchling
    hatch-vcs
  ];

-  propagatedBuildInputs = [
+  dependencies = [
    appdirs
    build
    magicgui
@ -59,9 +56,9 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Plugin system for napari (the image visualizer)";
-    mainProgram = "npe2";
    homepage = "https://github.com/napari/npe2";
    license = licenses.bsd3;
    maintainers = with maintainers; [ SomeoneSerge ];
+    mainProgram = "npe2";
  };
 }
--- a/pkgs/development/python-modules/napari/default.nix
+++ b/pkgs/development/python-modules/napari/default.nix
@ -40,7 +40,7 @@

 mkDerivationWith buildPythonPackage rec {
  pname = "napari";
-  version = "0.5.3";
+  version = "0.5.4";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -49,11 +49,11 @@ mkDerivationWith buildPythonPackage rec {
    owner = "napari";
    repo = "napari";
    rev = "refs/tags/v${version}";
-    hash = "sha256-+xgG0mbtVuB6XcpXSDDKaopCxXVTcVl3lKBt1CRmw/s=";
+    hash = "sha256-wJifLRrHlDzPgBU7OOPqjdzYpr9M+Klc+yAc/IpyZN8=";
  };

  postPatch = ''
-    substituteInPlace setup.cfg \
+    substituteInPlace pyproject.toml \
      --replace-fail "scikit-image[data]>=0.19.1" "scikit-image"
  '';

--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
      --replace aarch64-apple-darwin-ranlib ${cctools}/bin/ranlib
  '';

+  NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
+
  meta = with lib; {
    description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)";
    mainProgram = "scummvm";
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@ -4,6 +4,7 @@
 , lib
 , nixosTests
 , pkgsCross
+, testers
 , fetchFromGitHub
 , fetchzip
 , fetchpatch2
@ -795,6 +796,7 @@ stdenv.mkDerivation (finalAttrs: {
            else "aarch64-multiplatform";
        in
        pkgsCross.${systemString}.systemd;
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
    };
  };

@ -830,6 +832,7 @@ stdenv.mkDerivation (finalAttrs: {
      publicDomain
    ];
    maintainers = with lib.maintainers; [ flokli kloenk ];
+    pkgConfigModules = [ "libsystemd" "libudev" "systemd" "udev" ];
    # See src/basic/missing_syscall_def.h
    platforms = with lib.platforms; lib.intersectLists linux
      (aarch ++ x86 ++ loongarch64 ++ m68k ++ mips ++ power ++ riscv ++ s390);
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@ -17,7 +17,6 @@
 , libusb1
 , glib
 , gettext
-, systemd
 , nixosTests
 , useIMobileDevice ? true
 , libimobiledevice
@ -26,6 +25,8 @@
 , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
 , buildPackages
 , gobject-introspection
+, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
+, systemd
 }:

 assert withDocs -> withIntrospection;
@ -34,8 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
  pname = "upower";
  version = "1.90.4";

-  outputs = [ "out" "dev" "installedTests" ]
-    ++ lib.optionals withDocs [ "devdoc" ];
+  outputs = [ "out" "dev" ]
+    ++ lib.optionals withDocs [ "devdoc" ]
+    ++ lib.optionals withIntrospection [ "installedTests" ];

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
@ -81,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
    libgudev
    libusb1
    udev
-    systemd
+  ] ++ lib.optionals withIntrospection [
    # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved
    umockdev

@ -92,17 +94,20 @@ stdenv.mkDerivation (finalAttrs: {
      pp.pygobject3
      pp.packaging
    ]))
+  ] ++ lib.optionals withSystemd [
+    systemd
  ] ++ lib.optionals useIMobileDevice [
    libimobiledevice
  ];

  nativeCheckInputs = [
+    libeatmydata
+  ] ++ lib.optionals withIntrospection [
    python3.pkgs.dbus-python
    python3.pkgs.python-dbusmock
    python3.pkgs.pygobject3
    dbus
    umockdev
-    libeatmydata
    python3.pkgs.packaging
  ];

@ -180,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: {
    ! test -e "$DESTDIR"
  '';

-  postFixup = ''
+  postFixup = lib.optionalString withIntrospection ''
    wrapProgram "$installedTests/libexec/upower/integration-test.py" \
      --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [
        "$out"
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@ -43,6 +43,7 @@ buildDotnetModule rec {

  meta = with lib; {
    description = "API Support for your favorite torrent trackers";
+    mainProgram = "jackett";
    homepage = "https://github.com/Jackett/Jackett/";
    changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}";
    license = licenses.gpl2Only;
--- a/pkgs/servers/mlflow-server/default.nix
+++ b/pkgs/servers/mlflow-server/default.nix
@ -1,31 +1,33 @@
-{ python3, writeText}:
+{ python3Packages, writers }:

 let
-  py = python3.pkgs;
-in
-py.toPythonApplication
-  (py.mlflow.overridePythonAttrs(old: rec {
+  py = python3Packages;

-    propagatedBuildInputs = old.propagatedBuildInputs ++ [
+  gunicornScript = writers.writePython3 "gunicornMlflow" { } ''
+    import re
+    import sys
+    from gunicorn.app.wsgiapp import run
+    if __name__ == '__main__':
+        sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', ''', sys.argv[0])
+        sys.exit(run())
+  '';
+in
+py.toPythonApplication (
+  py.mlflow.overridePythonAttrs (old: {
+
+    propagatedBuildInputs = old.dependencies ++ [
      py.boto3
      py.mysqlclient
    ];

-    postPatch = (old.postPatch or "") + ''
-      substituteInPlace mlflow/utils/process.py --replace \
-        "child = subprocess.Popen(cmd, env=cmd_env, cwd=cwd, universal_newlines=True," \
-        "cmd[0]='$out/bin/gunicornMlflow'; child = subprocess.Popen(cmd, env=cmd_env, cwd=cwd, universal_newlines=True,"
-    '';
+    postPatch =
+      (old.postPatch or "")
+      + ''
+        cat mlflow/utils/process.py

-    gunicornScript = writeText "gunicornMlflow"
-    ''
-        #!/usr/bin/env python
-        import re
-        import sys
-        from gunicorn.app.wsgiapp import run
-        if __name__ == '__main__':
-          sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', ''', sys.argv[0])
-          sys.exit(run())
+        substituteInPlace mlflow/utils/process.py --replace-fail \
+          "process = subprocess.Popen(" \
+          "cmd[0]='${gunicornScript}'; process = subprocess.Popen("
      '';

    postInstall = ''
@ -33,4 +35,5 @@ py.toPythonApplication
      cp ${gunicornScript} $gpath
      chmod 555 $gpath
    '';
-}))
+  })
+)
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@ -47,8 +47,8 @@ in rec {
  # see https://community.ui.com/releases / https://www.ui.com/download/unifi

  unifi8 = generic {
-    version = "8.4.62";
-    suffix = "-i3q2j125cz";
-    sha256 = "sha256-7qEk6zpihJfgxCoVa8fVSMZN87sHG5XhWpuZoBvB5QU=";
+    version = "8.5.6";
+    suffix = "-1x29lm155t";
+    sha256 = "sha256-ZpCoE8OPb3FcKzf7Nurf9q+g2BpbjZcp1LvWOsV/tpA=";
  };
 }
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@ -10,7 +10,9 @@
 , gusb
 , lcms2
 , sqlite
+, udev
 , systemd
+, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
 , dbus
 , gobject-introspection
 , argyllcms
@ -60,6 +62,11 @@ stdenv.mkDerivation rec {
    "-Dvapi=true"
    "-Ddaemon=${lib.boolToString enableDaemon}"
    "-Ddaemon_user=colord"
+    (lib.mesonBool "systemd" enableSystemd)
+
+    # The presence of the "udev" pkg-config module (as opposed to "libudev")
+    # indicates whether rules are supported.
+    (lib.mesonBool "udev_rules" (lib.elem "udev" udev.meta.pkgConfigModules))
  ];

  nativeBuildInputs = [
@ -90,6 +97,8 @@ stdenv.mkDerivation rec {
    libgudev
    sane-backends
    sqlite
+    udev
+  ] ++ lib.optionals enableSystemd [
    systemd
  ] ++ lib.optionals enableDaemon [
    polkit
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -2888,6 +2888,8 @@ self: super: with self; {

  databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { };

+  databricks-sdk = callPackage ../development/python-modules/databricks-sdk { };
+
  dataclass-factory = callPackage ../development/python-modules/dataclass-factory { };

  dataclass-wizard = callPackage ../development/python-modules/dataclass-wizard { };