Merge staging-next into staging

2024-11-25 08:23:09 +00:00 · 2024-11-04 00:15:38 +00:00 · 2024-11-04 00:15:38 +00:00 · 3020b7f221
commit 3020b7f221
parent dd116e84ff 8cc792e0e1
53 changed files with 664 additions and 380 deletions
--- a/nixos/lib/systemd-lib.nix
+++ b/nixos/lib/systemd-lib.nix
@ -99,8 +99,9 @@ in rec {
      l = reverseList (stringToCharacters s);
      suffix = head l;
      nums = tail l;
-    in elem suffix (["K" "M" "G" "T"] ++ digits)
-      && all (num: elem num digits) nums;
+    in builtins.isInt s
+      || (elem suffix (["K" "M" "G" "T"] ++ digits)
+          && all (num: elem num digits) nums);

  assertByteFormat = name: group: attr:
    optional (attr ? ${name} && ! isByteFormat attr.${name})
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@ -32,6 +32,12 @@ let
     ${cfg.extraCgroupConfig}
   '';

+  mpiConf =  pkgs.writeTextDir "mpi.conf"
+   ''
+     PMIxCliTmpDirBase=${cfg.mpi.PmixCliTmpDirBase}
+     ${cfg.mpi.extraMpiConfig}
+   '';
+
  slurmdbdConf = pkgs.writeText "slurmdbd.conf"
   ''
     DbdHost=${cfg.dbdserver.dbdHost}
@ -45,7 +51,7 @@ let
  # in the same directory as slurm.conf
  etcSlurm = pkgs.symlinkJoin {
    name = "etc-slurm";
-    paths = [ configFile cgroupConfig plugStackConfig ] ++ cfg.extraConfigPaths;
+    paths = [ configFile cgroupConfig plugStackConfig mpiConf ] ++ cfg.extraConfigPaths;
  };
 in

@ -242,6 +248,24 @@ in
        '';
      };

+      mpi = {
+        PmixCliTmpDirBase = lib.mkOption {
+          default = "/tmp/pmix";
+          type = lib.types.str;
+          description = ''
+            Base path for PMIx temporary files.
+          '';
+        };
+
+        extraMpiConfig = lib.mkOption {
+          default = "";
+          type = lib.types.lines;
+          description = ''
+            Extra configuration for that will be added to `mpi.conf`.
+          '';
+        };
+      };
+
      extraPlugstackConfig = lib.mkOption {
        default = "";
        type = lib.types.lines;
@ -372,8 +396,9 @@ in
      };
    };

-    systemd.tmpfiles.rules = lib.mkIf cfg.client.enable [
+    systemd.tmpfiles.rules = lib.optionals cfg.client.enable [
      "d /var/spool/slurmd 755 root root -"
+      "d ${cfg.mpi.PmixCliTmpDirBase} 755 root root -"
    ];

    services.openssh.settings.X11Forwarding = lib.mkIf cfg.client.enable (lib.mkDefault true);
--- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "mongodb-vscode";
    publisher = "mongodb";
-    version = "1.9.1";
-    hash = "sha256-XWWBk/QW37Dg0RJJwJ65w1r9WGC6iAGCgigsnGm/ilc=";
+    version = "1.9.3";
+    hash = "sha256-3+KIO2d/0egvc4awStYgPvpWa9fmYH0V7QHUavzFn8A=";
  };

  meta = {
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@ -6,28 +6,28 @@
 }:

 let
-  version = "0.12.2";
+  version = "0.12.3";

  sources = {
    "x86_64-linux" = {
      arch = "linux-x64";
      url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix";
-      hash = "sha256-42xUp1HDnu1YZwXYgBhqshNzA0sx7VZLZzSaQypZb1M=";
+      hash = "sha256-dpvdWE0LL4PY2bzfRLazqP+VB9SSyhwnMLoOLsMmNJw=";
    };
    "x86_64-darwin" = {
      arch = "darwin-x64";
      url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix";
-      hash = "sha256-RFxhGKQpQnMbwuYfHQolFRJxI61hzog2A44x7W39yKw=";
+      hash = "sha256-81ahZTuIG5ukXm+gmVzg4RgryRTyOIBaQ6BvGLCXVp0=";
    };
    "aarch64-linux" = {
      arch = "linux-arm64";
      url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix";
-      hash = "sha256-KHeg2wAe1aynwAbQh5Do/rCbk2bqLZ3iIrYpDFRIw/E=";
+      hash = "sha256-brheyxw4tHXF5Guzn8fzolQmcLQvOknPeAtGNPowcBk=";
    };
    "aarch64-darwin" = {
      arch = "darwin-arm64";
      url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix";
-      hash = "sha256-3y/MhxDgQBnbQ2OYLYFcl7488sKE7iVO4YhUhmQyCIM=";
+      hash = "sha256-EgupFXNfKKkk3FgEmgYwsY/QdaTLlbghKIIHQcvLatY=";
    };
  };
 in
--- a/pkgs/applications/graphics/upscayl/default.nix
+++ b/pkgs/applications/graphics/upscayl/default.nix
@ -1,41 +0,0 @@
-{
-  appimageTools,
-  fetchurl,
-  lib,
-}: let
-  pname = "upscayl";
-  version = "2.11.5";
-
-  src = fetchurl {
-    url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
-    hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM=";
-  };
-
-  appimageContents = appimageTools.extractType2 {
-    inherit pname version src;
-  };
-in
-  appimageTools.wrapType2 {
-    inherit pname version src;
-
-    extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ];
-
-    extraInstallCommands = ''
-      mkdir -p $out/share/{applications,pixmaps}
-
-      cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
-      cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png
-
-      substituteInPlace $out/share/applications/${pname}.desktop \
-        --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
-    '';
-
-    meta = with lib; {
-      description = "Free and Open Source AI Image Upscaler";
-      homepage = "https://upscayl.github.io/";
-      maintainers = with maintainers; [icy-thought];
-      license = licenses.agpl3Plus;
-      platforms = platforms.linux;
-      mainProgram = "upscayl";
-    };
-  }
--- a/pkgs/applications/networking/ids/suricata/default.nix
+++ b/pkgs/applications/networking/ids/suricata/default.nix
@ -33,11 +33,11 @@
 in
 stdenv.mkDerivation rec {
  pname = "suricata";
-  version = "7.0.6";
+  version = "7.0.7";

  src = fetchurl {
    url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
-    hash = "sha256-IYJPf/Egh8DJud4gcZmnWpwxsDA2aIx8ucF48KO1f40=";
+    hash = "sha256-JtCjYZTVMID8iwm5mbK1qDxASfQK0H72rmnHIlpyi4Y=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@ -3,26 +3,26 @@
 , buildGoModule
 , stdenv
 , lib
-, procps
 , fetchFromGitHub
 , nixosTests
 , autoSignDarwinBinariesHook
+, nix-update-script
 }:

 let
  common = { stname, target, postInstall ? "" }:
    buildGoModule rec {
      pname = stname;
-      version = "1.27.12";
+      version = "1.28.0";

      src = fetchFromGitHub {
        owner = "syncthing";
        repo = "syncthing";
-        rev = "v${version}";
-        hash = "sha256-/HPq71KkWUE0vG7qUBD3JON4N5KBkuRWc4SvX/JA2nQ=";
+        rev = "refs/tags/v${version}";
+        hash = "sha256-JW78n/3hssH600uXn4YLxcIJylPbSpEZICtKmqfqamI=";
      };

-      vendorHash = "sha256-R5GlsCkfoMc5km+NaV+TNUlM3Ot1ARcXfEFimcZOLI4=";
+      vendorHash = "sha256-9/PfiOSCInduQXZ47KbrD3ca9O0Zt+TP7XoX+HjwQgs=";

      nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
        # Recent versions of macOS seem to require binaries to be signed when
@ -43,7 +43,7 @@ let
        (
          export GOOS="${pkgsBuildBuild.go.GOOS}" GOARCH="${pkgsBuildBuild.go.GOARCH}" CC=$CC_FOR_BUILD
          go build build.go
-          go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto
+          go generate github.com/syncthing/syncthing/lib/api/auto github.com/syncthing/syncthing/cmd/infra/strelaypoolsrv/auto
        )
        ./build -goos ${go.GOOS} -goarch ${go.GOARCH} -no-upgrade -version v${version} build ${target}
        runHook postBuild
@ -57,8 +57,11 @@ let

      inherit postInstall;

-      passthru.tests = {
-        inherit (nixosTests) syncthing syncthing-init syncthing-relay;
+      passthru = {
+        tests = {
+          inherit (nixosTests) syncthing syncthing-init syncthing-relay;
+        };
+        updateScript = nix-update-script { };
      };

      meta = {
--- a/pkgs/applications/science/biology/gatk/default.nix
+++ b/pkgs/applications/science/biology/gatk/default.nix
@ -2,10 +2,10 @@

 stdenv.mkDerivation rec {
  pname = "gatk";
-  version = "4.6.0.0";
+  version = "4.6.1.0";
  src = fetchzip {
    url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip";
-    sha256 = "sha256-AwGRkgVbG2gA4K1JG0WPr4v18JHG5YzYUKdJ2EJZX+Y=";
+    sha256 = "sha256-jVrFhLgHPIcWFCP3FU+LxR+UE+lVRzE6WZuLfwdL708=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/version-management/git-sync/default.nix
+++ b/pkgs/applications/version-management/git-sync/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "git-sync";
-  version = "unstable-2022-03-20";
+  version = "0-unstable-2024-02-15";

  src = fetchFromGitHub {
    owner = "simonthum";
    repo = "git-sync";
-    rev = "8466b77a38b3d5e8b4ed9e3cb1b635e475eeb415";
-    sha256 = "sha256-8rCwpmHV6wgFCLzPJOKzwN5mG8uD5KIlGFwcgQD+SK4=";
+    rev = "493b0155fb974b477b6ea623d6e41e13ddad8500";
+    hash = "sha256-hsq+kpB+akjbFKBeHMsP8ibrtygEG2Yf2QW9vFFIano=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/by-name/di/diffnav/package.nix
+++ b/pkgs/by-name/di/diffnav/package.nix
@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  makeBinaryWrapper,
+  delta,
+}:
+
+buildGoModule rec {
+  pname = "diffnav";
+  version = "0.2.8";
+
+  src = fetchFromGitHub {
+    owner = "dlvhdr";
+    repo = "diffnav";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-xZAi/Ky1RjOxjhQKHvozaPTqDPcrGfhMemGWzi7WyW4=";
+  };
+
+  vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+  postInstall = ''
+    wrapProgram $out/bin/diffnav \
+      --prefix PATH : ${lib.makeBinPath [ delta ]}
+  '';
+
+  meta = {
+    changelog = "https://github.com/dlvhdr/diffnav/releases/tag/${src.rev}";
+    description = "Git diff pager based on delta but with a file tree, à la GitHub";
+    homepage = "https://github.com/dlvhdr/diffnav";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ amesgen ];
+    mainProgram = "diffnav";
+  };
+}
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@ -2,9 +2,9 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  apple-sdk_15,
  chafa,
  cmake,
-  darwin,
  dbus,
  dconf,
  ddcutil,
@ -23,15 +23,14 @@
  nix-update-script,
  ocl-icd,
  opencl-headers,
-  overrideSDK,
  pcre,
  pcre2,
  pkg-config,
  python3,
  rpm,
  sqlite,
-  testers,
  util-linux,
+  versionCheckHook,
  vulkan-loader,
  wayland,
  xfce,
@ -43,10 +42,7 @@
  waylandSupport ? true,
  x11Support ? true,
 }:
-let
-  stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
-in
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
  pname = "fastfetch";
  version = "2.28.0";

@ -105,24 +101,10 @@ stdenv'.mkDerivation (finalAttrs: {
      xorg.libXext
    ]
    ++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk_11_0.frameworks;
-      [
-        Apple80211
-        AppKit
-        AVFoundation
-        Cocoa
-        CoreDisplay
-        CoreVideo
-        CoreWLAN
-        DisplayServices
-        IOBluetooth
-        MediaRemote
-        OpenCL
-        SystemConfiguration
-        moltenvk
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isDarwin ([
+      apple-sdk_15
+      moltenvk
+    ]);

  cmakeFlags =
    [
@ -158,14 +140,11 @@ stdenv'.mkDerivation (finalAttrs: {
      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
  '';

-  passthru = {
-    updateScript = nix-update-script { };
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-      command = "fastfetch -v | cut -d '(' -f 1";
-      version = "fastfetch ${finalAttrs.version}";
-    };
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "An actively maintained, feature-rich and performance oriented, neofetch like system information tool";
--- a/pkgs/by-name/fp/fprintd-tod/package.nix
+++ b/pkgs/by-name/fp/fprintd-tod/package.nix
@ -1,11 +1,18 @@
-{ lib
-, fetchFromGitLab
-, fetchpatch
-, fprintd
-, libfprint-tod
+{
+  lib,
+  fetchFromGitLab,
+  fetchpatch,
+  libxml2,
+  fprintd,
+  libfprint-tod,
+  python3Packages,
+  libpam-wrapper,
+  gusb,
+  gobject-introspection,
 }:

-(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: rec {
+(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (
+  finalAttrs: previousAttrs: {
    pname = "fprintd-tod";
    version = "1.90.9";

@ -13,11 +20,24 @@
      domain = "gitlab.freedesktop.org";
      owner = "libfprint";
      repo = "fprintd";
-      rev = "v${version}";
+      rev = "v${finalAttrs.version}";
      sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
    };

-    patches = oldAttrs.patches or [] ++ [
+    nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [
+      libpam-wrapper
+      python3Packages.python
+      python3Packages.pycairo
+      python3Packages.dbus-python
+      python3Packages.python-dbusmock
+      python3Packages.pygobject3
+      gusb
+      python3Packages.pypamtest
+      gobject-introspection
+      libxml2 # for xmllint
+    ];
+
+    patches = previousAttrs.patches or [ ] ++ [
      (fetchpatch {
        name = "use-more-idiomatic-correct-embedded-shell-scripting";
        url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch";
@ -40,11 +60,13 @@
      })
    ];

-    postPatch = oldAttrs.postPatch or "" + ''
-      # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming
-      mv src/device.xml src/net.reactivated.Fprint.Device.xml
-      mv src/manager.xml src/net.reactivated.Fprint.Manager.xml
-    '';
+    postPatch =
+      previousAttrs.postPatch or ""
+      + ''
+        # part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming
+        mv src/device.xml src/net.reactivated.Fprint.Device.xml
+        mv src/manager.xml src/net.reactivated.Fprint.Manager.xml
+      '';

    meta = {
      homepage = "https://fprint.freedesktop.org/";
@ -53,4 +75,5 @@
      platforms = lib.platforms.linux;
      maintainers = with lib.maintainers; [ hmenke ];
    };
-  })
+  }
+)
--- a/pkgs/tools/security/fprintd/default.nix
+++ b/pkgs/tools/security/fprintd/default.nix
@ -1,37 +1,42 @@
-{ lib, stdenv
-, fetchFromGitLab
-, pkg-config
-, gobject-introspection
-, meson
-, ninja
-, perl
-, gettext
-, gtk-doc
-, libxslt
-, docbook-xsl-nons
-, docbook_xml_dtd_412
-, glib
-, gusb
-, dbus
-, polkit
-, nss
-, pam
-, systemd
-, libfprint
-, python3
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  pkg-config,
+  gobject-introspection,
+  meson,
+  ninja,
+  perl,
+  gettext,
+  gtk-doc,
+  libxslt,
+  docbook-xsl-nons,
+  docbook_xml_dtd_412,
+  glib,
+  gusb,
+  dbus,
+  polkit,
+  nss,
+  pam,
+  systemd,
+  libfprint,
+  python3,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "fprintd";
  version = "1.94.4";
-  outputs = [ "out" "devdoc" ];
+  outputs = [
+    "out"
+    "devdoc"
+  ];

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "libfprint";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
+    repo = "fprintd";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
  };

  nativeBuildInputs = [
@ -41,6 +46,7 @@ stdenv.mkDerivation rec {
    perl # for pod2man
    gettext
    gtk-doc
+    python3
    libxslt
    dbus
    docbook-xsl-nons
@ -81,11 +87,10 @@ stdenv.mkDerivation rec {
  # FIXME: Ugly hack for tests to find libpam_wrapper.so
  LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ];

-  doCheck = true;
-
  mesonCheckFlags = [
    # PAM related checks are timing out
-    "--no-suite" "fprintd:TestPamFprintd"
+    "--no-suite"
+    "fprintd:TestPamFprintd"
  ];

  patches = [
@ -107,11 +112,11 @@ stdenv.mkDerivation rec {
      --replace "'G_DEBUG=fatal-criticals'," ""
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://fprint.freedesktop.org/";
    description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ abbradar ];
  };
-}
+})
--- a/pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch
+++ b/pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch
--- a/pkgs/by-name/ga/garble/0001-Add-version-info.patch
+++ b/pkgs/by-name/ga/garble/0001-Add-version-info.patch
@ -0,0 +1,38 @@
+From e46a41faac008ede4acbeb18db5b3076eb206de5 Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Sun, 3 Nov 2024 15:11:49 +0800
+Subject: [PATCH] Add version info
+
+---
+ main.go                    | 1 +
+ testdata/script/help.txtar | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/main.go b/main.go
+index 0de5a2f..1c830b1 100644
+--- a/main.go
+++ b/main.go
+@@ -362,6 +362,7 @@ func mainErr(args []string) error {
+ 		// manually construct something like a pseudo-version.
+ 		// TODO: remove when this code is dead, hopefully in Go 1.22.
+ 		if mod.Version == "(devel)" {
+			mod.Version = "@version@"
+ 			var vcsTime time.Time
+ 			var vcsRevision string
+ 			for _, setting := range info.Settings {
+diff --git a/testdata/script/help.txtar b/testdata/script/help.txtar
+index 8f25260..859f492 100644
+--- a/testdata/script/help.txtar
+++ b/testdata/script/help.txtar
+@@ -91,7 +91,7 @@ stderr 'directory not found'
+ # and to be able to use static VCS info, use an environment variable.
+ # First, test without the information, and then with it.
+ exec garble version
+-stdout -count=1 'mvdan.cc/garble \(devel\)'
+stdout -count=1 'mvdan.cc/garble @version@'
+ stdout -count=1 'Build settings'
+ stdout -count=3 '-compiler|GOOS|GOARCH'
+ ! stdout 'vcs'
+-- 
+2.46.1
+
--- a/pkgs/by-name/ga/garble/package.nix
+++ b/pkgs/by-name/ga/garble/package.nix
@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  diffoscope,
+  git,
+  versionCheckHook,
+  replaceVars,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "garble";
+  version = "0.13.0";
+
+  src = fetchFromGitHub {
+    owner = "burrowers";
+    repo = "garble";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-FtI5lAeqjRPN47iC46bcEsRLQb7mItw4svsnLkRpNxY=";
+  };
+
+  __darwinAllowLocalNetworking = true;
+
+  ldflags = [
+    "-buildid=00000000000000000000" # length=20
+  ];
+
+  patches = [
+    (replaceVars ./0001-Add-version-info.patch {
+      inherit version;
+    })
+  ];
+
+  checkFlags = [
+    "-skip"
+    "TestScript/gogarble"
+  ];
+
+  vendorHash = "sha256-mSdajYiMEg2ik0ocfmHK+XddEss1qLu6rDwzjocaaW0=";
+
+  # Used for some of the tests.
+  nativeCheckInputs = [
+    diffoscope
+    git
+    versionCheckHook
+  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    export WORK=$(mktemp -d)
+  '';
+
+  # Several tests fail with
+  # FAIL: testdata/script/goenv.txtar:27: "$WORK/.temp 'quotes' and spaces" matches "garble|importcfg|cache\\.gob|\\.go"
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "version" ];
+  doInstallCheck = false;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Obfuscate Go code by wrapping the Go toolchain";
+    homepage = "https://github.com/burrowers/garble/";
+    maintainers = with lib.maintainers; [
+      davhau
+      bot-wxt1221
+    ];
+    license = lib.licenses.bsd3;
+    mainProgram = "garble";
+  };
+}
--- a/pkgs/by-name/hy/hyprgui/package.nix
+++ b/pkgs/by-name/hy/hyprgui/package.nix
@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "hyprgui";
-  version = "0.1.6";
+  version = "0.1.7";

  src = fetchFromGitHub {
    owner = "hyprutils";
    repo = "hyprgui";
    rev = "refs/tags/v${version}";
-    hash = "sha256-n/poyVDBnMb4vw2YEymxxdjscGmu76qQ/BbS5BJOknM=";
+    hash = "sha256-toHE+N18PGSp0HdR9tcVPYRdfNv20HQfS7U5fHeJ32s=";
  };

-  cargoHash = "sha256-w+Bfjv7usyYfgTKW+KHqskNPco17QSjwn96cG/6yVoU=";
+  cargoHash = "sha256-Vn059HCHwz0j6ujDVk+GNrHQ7PhqBFb3XfjKLSYlYKg=";

  strictDeps = true;

--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@ -17,7 +17,7 @@
  cacert,
  unzip,
  # runtime deps
-  jellyfin-ffmpeg,
+  jellyfin-ffmpeg, # Immich depends on the jellyfin customizations, see https://github.com/NixOS/nixpkgs/issues/351943
  imagemagick,
  libraw,
  libheif,
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md";
    license = with lib.licenses; [ gpl2Plus ];
    mainProgram = "labwc";
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
    inherit (wayland.meta) platforms;
  };
 })
--- a/pkgs/by-name/le/less/package.nix
+++ b/pkgs/by-name/le/less/package.nix
@ -1,6 +1,8 @@
 {
  lib,
  fetchurl,
+  fetchpatch,
+  autoreconfHook,
  ncurses,
  pcre2,
  stdenv,
@ -22,6 +24,23 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg=";
  };

+  patches = [
+    (fetchpatch {
+      # Fix configure parameters --with-secure=no and --without-secure.
+      url = "https://github.com/gwsw/less/commit/8fff6c56bfc833528b31ebdaee871f65fbe342b1.patch";
+      hash = "sha256-XV5XufivNWWLGeIpaP04YQPWcxIUKYYEINdT+eEx+WA=";
+      includes = [
+        "configure.ac"
+      ];
+    })
+  ];
+
+  # Need `autoreconfHook` since we patch `configure.ac`.
+  # TODO: Remove the `configure.ac` patch and `autoreconfHook` next release
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
  buildInputs = [
    ncurses
    pcre2
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@ -1,32 +1,37 @@
-{ lib, stdenv
-, fetchFromGitLab
-, pkg-config
-, meson
-, python3
-, ninja
-, gusb
-, pixman
-, glib
-, nss
-, gobject-introspection
-, cairo
-, libgudev
-, gtk-doc
-, docbook-xsl-nons
-, docbook_xml_dtd_43
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  pkg-config,
+  meson,
+  python3,
+  ninja,
+  gusb,
+  pixman,
+  glib,
+  nss,
+  gobject-introspection,
+  cairo,
+  libgudev,
+  gtk-doc,
+  docbook-xsl-nons,
+  docbook_xml_dtd_43,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "libfprint";
-  version = "1.94.6";
-  outputs = [ "out" "devdoc" ];
+  version = "1.94.8";
+  outputs = [
+    "out"
+    "devdoc"
+  ];

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "libfprint";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8=";
+    repo = "libfprint";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-PZr4ZeVnuCKYfI8CKvRqBwalxsz9Ka17kSuLflwl7mE=";
  };

  postPatch = ''
@ -82,11 +87,11 @@ stdenv.mkDerivation rec {
    runHook postInstallCheck
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://fprint.freedesktop.org/";
    description = "Library designed to make it easy to add support for consumer fingerprint readers";
-    license = licenses.lgpl21Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    license = lib.licenses.lgpl21Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ abbradar ];
  };
-}
+})
--- a/pkgs/by-name/ma/makima/package.nix
+++ b/pkgs/by-name/ma/makima/package.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec{
  pname = "makima";
-  version = "0.9.3";
+  version = "0.9.4";

  src = fetchFromGitHub {
    owner = "cyber-sushi";
    repo = "makima";
    rev = "v${version}";
-    hash = "sha256-esZCFMeIRoafR7vQbnyf3Mo18trVZdIy9rvAvTHfrLA=";
+    hash = "sha256-cmn86ocN8DwxS9WpcHxWMjuFPAMmM60Q6jmyeBmdrPg=";
  };

-  cargoHash = "sha256-NXiK+cimQaYpzY3WSHUlYUWcXOLWQ5TwGuZKh+OB+go=";
+  cargoHash = "sha256-/eM+clDZRlvfFa1eEwLo8CKEvnOq5CW19RNvbEbxVE8=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ udev ];
--- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix
+++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix
@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
  pname = "morewaita-icon-theme";
-  version = "45";
+  version = "47.1";

  src = fetchFromGitHub {
    owner = "somepaulo";
    repo = "MoreWaita";
-    rev = "v${version}";
-    hash = "sha256-UtwigqJjkin53Wg3PU14Rde6V42eKhmP26a3fDpbJ4Y=";
+    rev = "${version}";
+    hash = "sha256-/ANzNQi+H2UzRlLrMBBMxEA/TGNpCwf8lNn6sHEKfQE=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/py/pyprland/package.nix
+++ b/pkgs/by-name/py/pyprland/package.nix
@ -7,7 +7,7 @@

 python3Packages.buildPythonApplication rec {
  pname = "pyprland";
-  version = "2.4.0";
+  version = "2.4.1";
  format = "pyproject";

  disabled = python3Packages.pythonOlder "3.10";
@ -16,12 +16,15 @@ python3Packages.buildPythonApplication rec {
    owner = "hyprland-community";
    repo = "pyprland";
    rev = "refs/tags/${version}";
-    hash = "sha256-jK6ap/beiqAtZXVNqPB3zV8R2Kfc3LhqJBvFlWYIfb4=";
+    hash = "sha256-QONnIElYz8UjyLICSm2QGZME5jx+l2Zw4r7kwHW8YEM=";
  };

  nativeBuildInputs = with python3Packages; [ poetry-core ];

  propagatedBuildInputs = with python3Packages; [ aiofiles ];
+  pythonRelaxDeps = [
+    "aiofiles"
+  ];

  postInstall = ''
    # file has shebang but cant be run due to a relative import, has proper entrypoint in /bin
--- a/pkgs/by-name/re/recutils/package.nix
+++ b/pkgs/by-name/re/recutils/package.nix
@ -4,6 +4,16 @@
 , bc
 , check
 , curl
+
+, withEncryption ? true
+, libgcrypt
+, libgpg-error
+
+, withUuid ? true
+, libuuid
+
+, withBashBuiltins ? true
+, bash
 }:

 stdenv.mkDerivation rec {
@ -17,8 +27,20 @@ stdenv.mkDerivation rec {

  hardeningDisable = lib.optional stdenv.cc.isClang "format";

+  configureFlags =
+    lib.optionals withBashBuiltins [
+      "--with-bash-headers=${bash.dev}/include/bash"
+    ];
+
  buildInputs = [
    curl
+  ] ++ lib.optionals withEncryption [
+    libgpg-error.dev
+    libgcrypt.dev
+  ] ++ lib.optionals withUuid [
+    libuuid
+  ] ++ lib.optionals withBashBuiltins [
+    bash.dev
  ];

  nativeCheckInputs = [
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@ -0,0 +1,39 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  riffdiff,
+  testers,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "riffdiff";
+  version = "3.3.6";
+
+  src = fetchFromGitHub {
+    owner = "walles";
+    repo = "riff";
+    rev = "refs/tags/${version}";
+    hash = "sha256-qXFSO2VIPaGnB+5Wp/u0FTcKnpcMLxW6uNykKL681lU=";
+  };
+
+  cargoHash = "sha256-i6/wa2/ogyLwLBdIXqTYdJX9+SFf+p7Zm2j2Q3mje6w=";
+
+  passthru = {
+    tests.version = testers.testVersion { package = riffdiff; };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Diff filter highlighting which line parts have changed";
+    homepage = "https://github.com/walles/riff";
+    changelog = "https://github.com/walles/riff/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      johnpyp
+      getchoo
+    ];
+    mainProgram = "riff";
+  };
+}
--- a/pkgs/by-name/sc/scitokens-cpp/package.nix
+++ b/pkgs/by-name/sc/scitokens-cpp/package.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "scitokens-cpp";
-  version = "1.1.1";
+  version = "1.1.2";

  src = fetchFromGitHub {
    owner = "scitokens";
    repo = "scitokens-cpp";

-    rev = "v1.1.1";
-    hash = "sha256-G3z9DYYWCNeA/rufNHQP3SwT5WS2AvUWm1rd8lx6XxA=";
+    rev = "v1.1.2";
+    hash = "sha256-87mV1hyoUI/pWzRXaI051H3+FN5TXcachhgAPTtQYHg=";
  };

  nativeBuildInputs = [ cmake pkg-config ];
--- a/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix
@ -6,11 +6,11 @@

 let
  pname = "simplex-chat-desktop";
-  version = "6.1.0";
+  version = "6.1.1";

  src = fetchurl {
    url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
-    hash = "sha256-Fe84rggb539MJXkbJqQRemToTLyX61BbXtoDRUuds8k=";
+    hash = "sha256-FHkZqbbJTQz+gIOgpMiak9u4ZOY/7r+1+if74LHLw/c=";
  };

  appimageContents = appimageTools.extract {
--- a/pkgs/by-name/ta/tabby/Cargo.lock
+++ b/pkgs/by-name/ta/tabby/Cargo.lock
@ -41,7 +41,7 @@ dependencies = [

 [[package]]
 name = "aim-downloader"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "async-stream",
 "clap",
@ -1691,7 +1691,7 @@ dependencies = [

 [[package]]
 name = "hash-ids"
-version = "0.18.0"
+version = "0.19.0"

 [[package]]
 name = "hashbrown"
@ -1875,7 +1875,7 @@ dependencies = [

 [[package]]
 name = "http-api-bindings"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "async-openai",
@ -2538,7 +2538,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"

 [[package]]
 name = "llama-cpp-server"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "async-openai",
@ -3066,7 +3066,7 @@ dependencies = [

 [[package]]
 name = "ollama-api-bindings"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "async-stream",
@ -4980,7 +4980,7 @@ dependencies = [

 [[package]]
 name = "tabby"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "assert-json-diff",
@ -5030,7 +5030,7 @@ dependencies = [

 [[package]]
 name = "tabby-common"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "async-trait",
@ -5058,7 +5058,7 @@ dependencies = [

 [[package]]
 name = "tabby-crawler"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "async-stream",
@ -5077,7 +5077,7 @@ dependencies = [

 [[package]]
 name = "tabby-db"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "assert_matches",
@ -5095,7 +5095,7 @@ dependencies = [

 [[package]]
 name = "tabby-db-macros"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "quote",
 "syn 2.0.66",
@ -5103,10 +5103,11 @@ dependencies = [

 [[package]]
 name = "tabby-download"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "aim-downloader",
 "anyhow",
+ "serial_test 3.1.1",
 "tabby-common",
 "tokio-retry",
 "tracing",
@ -5114,7 +5115,7 @@ dependencies = [

 [[package]]
 name = "tabby-git"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "assert_matches",
@ -5135,7 +5136,7 @@ dependencies = [

 [[package]]
 name = "tabby-index"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "async-stream",
@ -5177,7 +5178,7 @@ dependencies = [

 [[package]]
 name = "tabby-index-cli"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "clap",
@ -5189,7 +5190,7 @@ dependencies = [

 [[package]]
 name = "tabby-inference"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "async-openai",
@ -5206,7 +5207,7 @@ dependencies = [

 [[package]]
 name = "tabby-schema"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "async-trait",
@ -5231,7 +5232,7 @@ dependencies = [

 [[package]]
 name = "tabby-webserver"
-version = "0.18.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "argon2",
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@ -13,17 +13,15 @@

  llama-cpp,

+  apple-sdk_15,
  autoAddDriverRunpath,
+  versionCheckHook,
+
  cudaSupport ? config.cudaSupport,
-
  rocmSupport ? config.rocmSupport,
-
-  darwin,
  metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64,
-
  # one of [ null "cpu" "rocm" "cuda" "metal" ];
  acceleration ? null,
-  versionCheckHook,
 }:

 let
@ -33,7 +31,7 @@ let
  # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix

  pname = "tabby";
-  version = "0.18.0";
+  version = "0.19.0";

  availableAccelerations = flatten [
    (optional cudaSupport "cuda")
@ -106,19 +104,9 @@ let
  # TODO(ghthor): some of this can be removed
  darwinBuildInputs =
    [ llamaccpPackage ]
-    ++ optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        Foundation
-        Accelerate
-        CoreVideo
-        CoreGraphics
-      ]
-      ++ optionals enableMetal [
-        Metal
-        MetalKit
-      ]
-    );
+    ++ optionals stdenv.hostPlatform.isDarwin ([
+      apple-sdk_15
+    ]);

  cudaBuildInputs = [ llamaccpPackage ];
  rocmBuildInputs = [ llamaccpPackage ];
@ -132,7 +120,7 @@ rustPlatform.buildRustPackage {
    owner = "TabbyML";
    repo = "tabby";
    rev = "refs/tags/v${version}";
-    hash = "sha256-8clEBWAT+HI2eecOsmldgRcA58Ehq9bZT4ZwUMm494g=";
+    hash = "sha256-RK81gQ5IUzZ4HXJbKBr5bqayH0Xip6ZVAgdMwqP+kx8=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/up/upscayl/package.nix
+++ b/pkgs/by-name/up/upscayl/package.nix
@ -0,0 +1,54 @@
+{
+  appimageTools,
+  fetchurl,
+  lib,
+  makeWrapper,
+}:
+
+let
+  pname = "upscayl";
+  version = "2.11.5";
+
+  src = fetchurl {
+    url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
+    hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM=";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  extraPkgs = pkgs: [
+    pkgs.vulkan-headers
+    pkgs.vulkan-loader
+  ];
+
+  extraInstallCommands = ''
+    mkdir -p $out/share/{applications,pixmaps}
+
+    cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
+    cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png
+
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
+
+    wrapProgram $out/bin/${pname} \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+  '';
+
+  meta = with lib; {
+    description = "Free and Open Source AI Image Upscaler";
+    homepage = "https://upscayl.github.io/";
+    maintainers = with maintainers; [ icy-thought ];
+    license = licenses.agpl3Plus;
+    platforms = platforms.linux;
+    mainProgram = "upscayl";
+  };
+}
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@ -27,19 +27,25 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ=";
  };

-  buildInputs = [
-    llvmPackages.libcxx
-    llvmPackages.libunwind
-    musl
-    xorg.libX11
-  ];
+  buildInputs =
+    [
+      llvmPackages.libcxx
+      llvmPackages.libunwind
+    ]
+    ++ lib.optionals (stdenv.isLinux) [
+      musl # not used, but requires extra work to remove
+      xorg.libX11 # for the clipboardy package
+    ];

-  nativeBuildInputs = [
-    autoPatchelfHook
-    makeWrapper
-    nodejs
-    pnpm_9.configHook
-  ];
+  nativeBuildInputs =
+    [
+      makeWrapper
+      nodejs
+      pnpm_9.configHook
+    ]
+    ++ lib.optionals (stdenv.isLinux) [
+      autoPatchelfHook
+    ];

  # @cloudflare/vitest-pool-workers wanted to run a server as part of the build process
  # so I simply removed it
@ -91,10 +97,10 @@ stdenv.mkDerivation (finalAttrs: {
      ryand56
    ];
    mainProgram = "wrangler";
-    # cpp is required for building workerd.
-    # workerd is used for some wrangler subcommands.
-    # non-linux platforms may experience errors
-    # on certain subcommands due to this issue.
-    platforms = [ "x86_64-linux" ];
+    # Tunneling and other parts of wrangler, which require workerd won't run on
+    # other systems where precompiled binaries are not provided, but most
+    # commands are will still work everywhere.
+    # Potential improvements: build workerd from source instead.
+    inherit (nodejs.meta) platforms;
  };
 })
--- a/pkgs/by-name/xo/xonsh/unwrapped.nix
+++ b/pkgs/by-name/xo/xonsh/unwrapped.nix
@ -12,7 +12,7 @@ let

  argset = {
    pname = "xonsh";
-    version = "0.18.3";
+    version = "0.18.4";
    pyproject = true;

    # PyPI package ships incomplete tests
@ -20,7 +20,7 @@ let
      owner = "xonsh";
      repo = "xonsh";
      rev = "refs/tags/${argset.version}";
-      hash = "sha256-MJTsYnuFENHLDDMIWcs0IRcBmWs4XyfDWDG7AY2P6cM=";
+      hash = "sha256-L5UwmwwM42E3l+sIBwXgMf/q5r22cUoRbE2cqM09bZA=";
    };

    nativeBuildInputs = with pythonPackages; [
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -2839,18 +2839,32 @@ self: super: {
  postgrest = lib.pipe super.postgrest [
    # 2023-12-20: New version needs extra dependencies
    (addBuildDepends [ self.extra self.fuzzyset_0_2_4 self.cache self.timeit ])
-    # 2022-12-02: Too strict bounds: https://github.com/PostgREST/postgrest/issues/2580
+    # 2022-12-02: Too strict bounds.
    doJailbreak
    # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
    (overrideSrc rec {
-      version = "12.0.2";
+      version = "12.0.3";
      src = pkgs.fetchFromGitHub {
        owner = "PostgREST";
        repo = "postgrest";
        rev = "v${version}";
-        hash = "sha256-fpGeL8R6hziEtIgHUMfWLF7JAjo3FDYQw3xPSeQH+to=";
+        hash = "sha256-peXM5/K034Phcy5vNhc5AT3/9oGXohVogFN9gRsSosY=";
      };
    })
+    # 2024-11-03: Needed for the patch below. Can be dropped after updating to 12.2+.
+    (appendPatches [
+      (fetchpatch {
+        url = "https://github.com/PostgREST/postgrest/commit/d311fb17c46ad2ab9064c7aba1954d3500ef0e54.patch";
+        hash = "sha256-O/bBm93V6GIPSB5dwhNUFgX3vXA01LPJapZQoeJmbIU=";
+      })
+    ])
+    # 2024-11-03: Fixes build on aarch64-darwin. Can be removed after updating to 13+.
+    (appendPatches [
+      (fetchpatch {
+        url = "https://github.com/PostgREST/postgrest/commit/c045b261c4f7d2c2514e858120950be6b3ddfba8.patch";
+        hash = "sha256-6SeteL5sb+/K1y3f9XL7yNzXDdD1KQp91RNP4kutSLE=";
+      })
+    ])
  ];

  # Too strict bounds on hspec < 2.11
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -652,6 +652,8 @@ package-maintainers:
    - minio-hs
    - smtp-mail
    - pdftotext
+  wolfgangwalther:
+    - postgrest

 unsupported-platforms:
  Allure:                                       [ platforms.darwin ]
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@ -245987,6 +245987,7 @@ self: {
       description = "REST API for any Postgres database";
       license = lib.licenses.mit;
       mainProgram = "postgrest";
+       maintainers = [ lib.maintainers.wolfgangwalther ];
     }) {};

  "postgrest-ws" = callPackage
--- a/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix
+++ b/pkgs/development/python-modules/django-elasticsearch-dsl/default.nix
@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  elasticsearch-dsl,
+  django,
+  pythonOlder,
+  elastic-transport,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "django-elasticsearch-dsl";
+  version = "8.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "django-es";
+    repo = "django-elasticsearch-dsl";
+    rev = "refs/tags/${version}";
+    hash = "sha256-GizdFOM4UjI870XdE33D7uXHXkuv/bLYbyi9yyNjti8=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    elasticsearch-dsl
+    elastic-transport
+  ];
+
+  # Tests require running Elasticsearch daemon
+  doCheck = false;
+
+  pythonImportsCheck = [ "django_elasticsearch_dsl" ];
+
+  meta = {
+    description = "Wrapper around elasticsearch-dsl-py for Django models";
+    homepage = "https://github.com/sabricot/django-elasticsearch-dsl";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.onny ];
+  };
+}
--- a/pkgs/development/python-modules/pynvim/default.nix
+++ b/pkgs/development/python-modules/pynvim/default.nix
@ -4,44 +4,40 @@
  fetchFromGitHub,
  setuptools,
  msgpack,
+  isPyPy,
  greenlet,
  pythonOlder,
-  isPyPy,
+  typing-extensions,
 }:

 buildPythonPackage rec {
  pname = "pynvim";
-  version = "0.5.0";
+  version = "0.5.1";
  pyproject = true;

-  disabled = pythonOlder "3.7";
-
  src = fetchFromGitHub {
    owner = "neovim";
    repo = "pynvim";
    rev = "refs/tags/${version}";
-    hash = "sha256-3LqgKENFzdfCjMlD6Xzv5W23yvIkNMUYo2+LlzKZ3cc=";
+    hash = "sha256-YVAWu+i2pElq8OhibSqh9ogk+xWDRCZT4niDF/oMnzY=";
  };

-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace " + pytest_runner" ""
-  '';
+  build-system = [ setuptools ];

-  buildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ msgpack ] ++ lib.optionals (!isPyPy) [ greenlet ];
+  dependencies =
+    [ msgpack ]
+    ++ lib.optionals (!isPyPy) [ greenlet ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ];

  # Tests require pkgs.neovim which we cannot add because of circular dependency
  doCheck = false;

  pythonImportsCheck = [ "pynvim" ];

-  meta = with lib; {
+  meta = {
    description = "Python client for Neovim";
    homepage = "https://github.com/neovim/pynvim";
    changelog = "https://github.com/neovim/pynvim/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ figsoda ];
  };
 }
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@ -7,7 +7,6 @@
  setuptools-scm,
  django-configurations,
  pytest,
-  pytest-xdist,
  pytestCheckHook,
 }:

@ -33,23 +32,18 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    django-configurations
-    pytest-xdist
+    # pytest-xidst causes random errors in the form of: django.db.utils.OperationalError: no such table: app_item
    pytestCheckHook
  ];

  preCheck = ''
    # bring pytest_django_test module into PYTHONPATH
-    export PYTHONPATH="$(pwd):$PYTHONPATH"
+    export PYTHONPATH="$PWD:$PYTHONPATH"

    # test the lightweight sqlite flavor
    export DJANGO_SETTINGS_MODULE="pytest_django_test.settings_sqlite"
  '';

-  disabledTests = [
-    # AttributeError: type object 'TestLiveServer' has no attribute '_test_settings_before_run'
-    "test_settings_restored"
-  ];
-
  __darwinAllowLocalNetworking = true;

  meta = with lib; {
@ -57,5 +51,6 @@ buildPythonPackage rec {
    description = "Pytest plugin for testing of Django applications";
    homepage = "https://pytest-django.readthedocs.org/en/latest/";
    license = licenses.bsd3;
+    maintainers = [ ];
  };
 }
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "2.7.1";
-  srcHash = "sha256-x9eCBxrujIJ0kwN5jyn7FKu7uyN+pIBCVDLckhiUzmM=";
+  version = "2.7.2";
+  srcHash = "sha256-p4PH/rRcswrKVO1uEykCa0wgrJvawp58oD6/kLRxoS4=";
  # The tarball contains vendored dependencies
  vendorHash = null;
 in
--- a/pkgs/development/tools/garble/default.nix
+++ b/pkgs/development/tools/garble/default.nix
@ -1,35 +0,0 @@
-{ stdenv
-, buildGoModule
-, fetchFromGitHub
-, lib
-, git
-}:
-buildGoModule rec {
-  pname = "garble";
-  version = "0.8.0";
-
-  src = fetchFromGitHub {
-    owner = "burrowers";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-f7coWG1CS4UL8GGqwADx5CvIk2sPONPlWW+JgRhFsb8=";
-  };
-
-  vendorHash = "sha256-SOdIlu0QrQokl9j9Ff594+1K6twU1mCuECFQaVKaPV4=";
-
-  # Used for some of the tests.
-  nativeCheckInputs = [git];
-
-  preBuild = lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
-    # The test assumex amd64 assembly
-    rm testdata/script/asm.txtar
-  '';
-
-  meta = {
-    description = "Obfuscate Go code by wrapping the Go toolchain";
-    homepage = "https://github.com/burrowers/garble/";
-    maintainers = with lib.maintainers; [ davhau ];
-    license = lib.licenses.bsd3;
-    broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/garble.x86_64-darwin
-  };
-}
--- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix
@ -5,16 +5,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "beancount-language-server";
-  version = "1.3.5";
+  version = "1.3.6";

  src = fetchFromGitHub {
    owner = "polarmutex";
    repo = "beancount-language-server";
    rev = "v${version}";
-    hash = "sha256-Z8Gc3QbnFGzF1mNjlbazz7OiDpQxY3HcaBKd32XjQCY=";
+    hash = "sha256-U23e32Xfa0j+U/CrCZzKjipaA0Yv5szbtTHJWWL52K4=";
  };

-  cargoHash = "sha256-WMrh4toFqd+G30ZZxC+kT/Q07gn+3p80oKECASD48wc=";
+  cargoHash = "sha256-OvhG+O+uHHf7e9p3vibrPt9fuGzEqG+l3GGfNwoqXBU=";

  doInstallCheck = true;
  postInstallCheck = ''
--- a/pkgs/development/tools/misc/pest-ide-tools/default.nix
+++ b/pkgs/development/tools/misc/pest-ide-tools/default.nix
@ -3,8 +3,6 @@
 , fetchFromGitHub
 , rustPlatform
 , nix-update-script
-, pkg-config
-, openssl
 , darwin
 }:

@ -19,10 +17,7 @@ rustPlatform.buildRustPackage rec {
    rev = "v${version}";
    sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ=";
  };
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    darwin.apple_sdk.frameworks.Security
  ];

@ -33,7 +28,7 @@ rustPlatform.buildRustPackage rec {
  meta = with lib; {
    description = "IDE support for Pest, via the LSP";
    homepage = "https://pest.rs";
-    license = with licenses; [ mit asl20 ];
+    license = with licenses; [ asl20 ];
    maintainers = with maintainers; [ nickhu ];
    mainProgram = "pest-language-server";
  };
--- a/pkgs/development/tools/yamlfmt/default.nix
+++ b/pkgs/development/tools/yamlfmt/default.nix
@ -1,23 +1,29 @@
-{ lib, buildGoModule, fetchFromGitHub, testers, yamlfmt }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  testers,
+  yamlfmt,
+}:

 buildGoModule rec {
  pname = "yamlfmt";
-  version = "0.13.0";
+  version = "0.14.0";

  src = fetchFromGitHub {
    owner = "google";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-B1bRYG7ldewdyK8K2Yy5liQcEqv/3/67cQD8JKp8vQI=";
+    repo = "yamlfmt";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-l9PtVaAKjtP9apTrKCkC1KDR0IXqLqinpj1onzSrPnI=";
  };

-  vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA=";
+  vendorHash = "sha256-lsNldfacBoeTPyhkjyDZhI5YR+kDke0TarfG/KdjEOg=";

  ldflags = [
    "-s"
    "-w"
-    "-X main.version=${version}"
-    "-X main.commit=${src.rev}"
+    "-X=main.version=${version}"
+    "-X=main.commit=${src.rev}"
  ];

  passthru.tests.version = testers.testVersion {
@ -27,6 +33,7 @@ buildGoModule rec {
  meta = with lib; {
    description = "Extensible command line tool or library to format yaml files";
    homepage = "https://github.com/google/yamlfmt";
+    changelog = "https://github.com/google/yamlfmt/releases/tag/v${version}";
    license = licenses.asl20;
    maintainers = with maintainers; [ sno2wman ];
    mainProgram = "yamlfmt";
--- a/pkgs/servers/nextcloud/packages/28.json
+++ b/pkgs/servers/nextcloud/packages/28.json
@ -69,6 +69,16 @@
      "agpl"
    ]
  },
+  "files_mindmap": {
+    "hash": "sha256-VsaJT3lsPqnCmgLYkkdLhyIRmi/CumEdezsvhra2NQk=",
+    "url": "https://github.com/ACTom/files_mindmap/releases/download/v0.0.30/files_mindmap-0.0.30.tar.gz",
+    "version": "0.0.30",
+    "description": "This application enables Nextcloud users to open, save and edit mind map files in the web browser. If enabled, an entry in the New button at the top of the web browser the Mindmap file entry appears. When clicked, a new mindmap file opens in the browser and the file can be saved into the current Nextcloud directory.",
+    "homepage": "https://github.com/ACTom/files_mindmap",
+    "licenses": [
+      "agpl"
+    ]
+  },
  "forms": {
    "hash": "sha256-iU2bqojO+pvMvKDiw+ANMvsH71Ul+8yQ+uNvJfa1ngc=",
    "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.2/forms-v4.3.2.tar.gz",
@ -140,8 +150,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",
@ -190,9 +200,9 @@
    ]
  },
  "onlyoffice": {
-    "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz",
-    "version": "9.4.0",
+    "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz",
+    "version": "9.5.0",
    "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
    "homepage": "https://www.onlyoffice.com",
    "licenses": [
--- a/pkgs/servers/nextcloud/packages/29.json
+++ b/pkgs/servers/nextcloud/packages/29.json
@ -190,9 +190,9 @@
    ]
  },
  "onlyoffice": {
-    "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz",
-    "version": "9.4.0",
+    "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz",
+    "version": "9.5.0",
    "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
    "homepage": "https://www.onlyoffice.com",
    "licenses": [
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@ -180,9 +180,9 @@
    ]
  },
  "onlyoffice": {
-    "hash": "sha256-YkYsD/14syHOaxWEwBKgGGV0i5WlYJbGcqesLsWnimc=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.4.0/onlyoffice.tar.gz",
-    "version": "9.4.0",
+    "hash": "sha256-YXj0tHU++S7YDMYj/Eg5KsSX3qBSYtyuPZfiOBQ8cjk=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.5.0/onlyoffice.tar.gz",
+    "version": "9.5.0",
    "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.",
    "homepage": "https://www.onlyoffice.com",
    "licenses": [
--- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json
+++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
@ -8,6 +8,7 @@
 , "end_to_end_encryption": "agpl3Plus"
 , "files_texteditor": "agpl3Plus"
 , "files_markdown": "agpl3Plus"
+, "files_mindmap": "agpl3Plus"
 , "forms": "agpl3Plus"
 , "gpoddersync": "agpl3Only"
 , "groupfolders": "agpl3Plus"
--- a/pkgs/tools/misc/tere/default.nix
+++ b/pkgs/tools/misc/tere/default.nix
@ -13,7 +13,7 @@ rustPlatform.buildRustPackage {

  cargoHash = "sha256-UWZWm6wDiQqUNcWV1nDUWXVhWgqoVUCDWz09cRkiPKg=";

-  nativeBuildInputs = [
+  nativeCheckInputs = [
    # ncurses provides the tput command needed for integration tests
    # https://github.com/mgunyho/tere/issues/93#issuecomment-2029624187
    ncurses
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
    # Unexplained fail
    # https://github.com/NixOS/nixpkgs/pull/298527#issuecomment-2053758845
-    "--skip=first_run_prompt_accept"
+    "--skip=first_run_prompt"
  ];

  # NOTE: workaround for build fail on aarch64
--- a/pkgs/tools/text/riffdiff/default.nix
+++ b/pkgs/tools/text/riffdiff/default.nix
@ -1,23 +0,0 @@
-{ lib, rustPlatform, fetchFromGitHub }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "riffdiff";
-  version = "3.3.3";
-
-  src = fetchFromGitHub {
-    owner = "walles";
-    repo = "riff";
-    rev = version;
-    hash = "sha256-IdYQ8vD3ZIzqdNY4JtR8f2huV/DWOhV8FUn7tuRe7IQ=";
-  };
-
-  cargoHash = "sha256-1on4CTstEvjNLtk1RG6dcNl0XhaPYAy+U0DYn/aVzEg=";
-
-  meta = with lib; {
-    description = "Diff filter highlighting which line parts have changed";
-    homepage = "https://github.com/walles/riff";
-    license = licenses.mit;
-    maintainers = with maintainers; [ johnpyp ];
-    mainProgram = "riff";
-  };
-}
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -7582,10 +7582,6 @@ with pkgs;

  fpm = callPackage ../tools/package-management/fpm { };

-  fprintd = callPackage ../tools/security/fprintd { };
-
-  fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { };
-
  ferdium = callPackage ../applications/networking/instant-messengers/ferdium {
    mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
  };
@ -18149,8 +18145,6 @@ with pkgs;

  riff = callPackage ../development/tools/misc/riff { };

-  riffdiff = callPackage ../tools/text/riffdiff {};
-
  rman = callPackage ../development/tools/misc/rman { };

  rnginline = with python3Packages; toPythonApplication rnginline;
@ -19457,8 +19451,6 @@ with pkgs;

  ganv = callPackage ../development/libraries/ganv { };

-  garble = callPackage ../development/tools/garble { };
-
  gcab = callPackage ../development/libraries/gcab { };

  gcovr = with python3Packages; toPythonApplication gcovr;
@ -20682,8 +20674,6 @@ with pkgs;
    extraOnly = true;
  };

-  libfprint = callPackage ../development/libraries/libfprint { };
-
  libfprint-tod = callPackage ../development/libraries/libfprint-tod { };

  libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { };
@ -26458,8 +26448,6 @@ with pkgs;

  upower = callPackage ../os-specific/linux/upower { };

-  upscayl = callPackage ../applications/graphics/upscayl { };
-
  usbguard = callPackage ../os-specific/linux/usbguard { };

  usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { };
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@ -650,8 +650,6 @@ in {
          name = "snmp";
          buildInputs = [ net-snmp openssl ];
          configureFlags = [ "--with-snmp" ];
-          # net-snmp doesn't build on darwin.
-          meta.broken = (!stdenv.hostPlatform.isDarwin);
          doCheck = false;
        }
        {
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -3390,6 +3390,8 @@ self: super: with self; {

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

+  django-elasticsearch-dsl = callPackage ../development/python-modules/django-elasticsearch-dsl { };
+
  django-encrypted-model-fields = callPackage ../development/python-modules/django-encrypted-model-fields { };

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