Merge master into staging-next

maintainers/maintainer-list.nix

@@ -18061,6 +18061,12 @@
     name = "Nasir Hussain";
     keys = [ { fingerprint = "7A10 AB8E 0BEC 566B 090C  9BE3 D812 6E55 9CE7 C35D"; } ];
   };
+  nasrally = {
+    email = "suffer.ring@ya.ru";
+    github = "nasrally";
+    githubId = 50599445;
+    name = "Nikita Grishko";
+  };
   nat-418 = {
     github = "nat-418";
     githubId = 93013864;

nixos/doc/manual/release-notes/rl-2511.section.md

@@ -49,6 +49,8 @@
 
 - [Homebridge](https://github.com/homebridge/homebridge), a lightweight Node.js server you can run on your home network that emulates the iOS HomeKit API. Available as [services.homebridge](#opt-services.homebridge.enable).
 
+- [XPPen](https://www.xp-pen.com/), the official closed-source driver for XP Pen tablets. Available as [programs.xppen](#opt-programs.xppen.enable).
+
 - [LACT](https://github.com/ilya-zlobintsev/LACT), a GPU monitoring and configuration tool, can now be enabled through [services.lact.enable](#opt-services.lact.enable).
   Note that for LACT to work properly on AMD GPU systems, you need to enable [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable).
 

nixos/modules/module-list.nix

@@ -362,6 +362,7 @@
   ./programs/xfconf.nix
   ./programs/xfs_quota.nix
   ./programs/xonsh.nix
+  ./programs/xppen.nix
   ./programs/xss-lock.nix
   ./programs/xwayland.nix
   ./programs/yazi.nix

nixos/modules/programs/xppen.nix

@@ -0,0 +1,55 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.programs.xppen;
+in
+
+{
+  options.programs.xppen = {
+    enable = lib.mkEnableOption "XPPen PenTablet application";
+    package = lib.mkPackageOption pkgs "xppen_4" {
+      example = "pkgs.xppen_3";
+      extraDescription = ''
+        Use xppen_4 for newer and xppen_3 for older tablets.
+        To check which version of the driver you need, go to
+        https://www.xp-pen.com/download/ then select your tablet
+        and look for the major version in the available files for Linux.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    hardware.uinput.enable = true;
+
+    environment.systemPackages = [ cfg.package ];
+
+    services.udev.packages = [ cfg.package ];
+
+    systemd.tmpfiles.rules = [
+      "d /var/lib/pentablet/conf/xppen 0777 - - -"
+    ];
+
+    systemd.services.xppen-create-config-dir = {
+      restartTriggers = [ cfg.package ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Type = "oneshot";
+        TimeoutSec = 60;
+        ExecStart = pkgs.writeShellScript "xppen-create-config-dir" ''
+          readarray -d "" files < <(find ${cfg.package}/usr/lib/pentablet/conf -type f -print0)
+          for file in "''${files[@]}"; do
+            file_new="/var''${file#${cfg.package + "/usr"}}"
+            if [ ! -f $file_new ]; then
+              install -m 666 "''$file" "''$file_new"
+            fi
+          done
+        '';
+      };
+    };
+  };
+}

pkgs/applications/misc/xppen/default.nix

@@ -0,0 +1,19 @@
+{
+  callPackage,
+}:
+
+# to update: try to find the latest 3.x.x or 4.x.x .tar.gz on https://www.xp-pen.com/download
+{
+  xppen_3 = callPackage ./generic.nix {
+    pname = "xppen_3";
+    version = "3.4.9-240607";
+    url = "https://www.xp-pen.com/download/file.html?id=2901&pid=819&ext=gz";
+    hash = "sha256-ZXeTlDjhryXamb7x2LxDdOtf8R9rgKPyUsdx96XchWM=";
+  };
+  xppen_4 = callPackage ./generic.nix {
+    pname = "xppen_4";
+    version = "4.0.7-250117";
+    url = "https://www.xp-pen.com/download/file.html?id=3652&pid=1211&ext=gz";
+    hash = "sha256-sH05Qquo2u0npSlv8Par/mn1w/ESO9g42CCGwBauHhU=";
+  };
+}

pkgs/applications/misc/xppen/generic.nix

@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  autoPatchelfHook,
+  qt5,
+  libusb1,
+  pname,
+  version,
+  url,
+  hash,
+}:
+
+stdenv.mkDerivation {
+  inherit pname version;
+
+  src = fetchzip {
+    name = "XPPenLinux${version}.tar.gz";
+    extension = "tar.gz";
+    inherit url hash;
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    qt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qt5.qtbase
+    libusb1
+  ];
+
+  dontConfigure = true;
+  dontBuild = true;
+  dontCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    rm -r App/usr/lib/pentablet/{lib,platforms,PenTablet.sh}
+    mkdir -p $out/{bin,usr}
+    cp -r App/lib $out/lib
+    cp -r App/usr/share $out/share
+    cp -r App/usr/lib $out/usr/lib
+
+    # hack: edit the binary directly
+    # TODO: replace it with buildFHSEnv if possible? last time it caused other issues
+    sed -i 's#/usr/lib/pentablet#/var/lib/pentablet#g' $out/usr/lib/pentablet/PenTablet
+    ln -s $out/usr/lib/pentablet/PenTablet $out/bin/PenTablet
+
+    substituteInPlace $out/share/applications/xppentablet.desktop \
+      --replace-fail "/usr/lib/pentablet/PenTablet.sh" "PenTablet" \
+      --replace-fail "/usr/share/icons/hicolor/256x256/apps/xppentablet.png" "xppentablet"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "XPPen driver";
+    downloadPage = "https://www.xp-pen.com/download/";
+    homepage = "https://www.xp-pen.com/";
+    license = lib.licenses.unfree;
+    mainProgram = "PenTablet";
+    maintainers = with lib.maintainers; [
+      gepbird
+      nasrally
+    ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -1003,13 +1003,13 @@
     "vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
   },
   "okta_okta": {
-    "hash": "sha256-Y0gNIhJDJoK6wL5FoCjyhccywYBkCygovXGxVTylTn8=",
+    "hash": "sha256-7vjNorBNdfF3cTu1ANx+5Uh5chAL54lWZ7R9cMI/gpA=",
     "homepage": "https://registry.terraform.io/providers/okta/okta",
     "owner": "okta",
     "repo": "terraform-provider-okta",
-    "rev": "v6.3.0",
+    "rev": "v6.4.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-oE4nB0dFsiz82kj9QOr0vIjD3aBR+jxeAW5/ZWUxp44="
+    "vendorHash": "sha256-gLFMFVw44jJcuVzY6OcUHJ74rRCIQuon4p9RNoQPLPs="
   },
   "oktadeveloper_oktaasa": {
     "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",

pkgs/applications/science/chemistry/avogadro2/default.nix

@@ -7,6 +7,7 @@
   avogadrolibs,
   molequeue,
   hdf5,
+  jkqtplotter,
   openbabel,
   qttools,
   wrapQtAppsHook,
@@ -17,20 +18,20 @@ let
   avogadroI18N = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadro-i18n";
-    tag = "1.101.0";
-    hash = "sha256-3qFx/rc5xqfrLq3Kr5b/Rid2LR/gfP6uqhhATyQL6Y8=";
+    tag = "1.102.1";
+    hash = "sha256-doY+AWJ0GiE6VsTolgmFIRcRVl52lTgwNJLpXgVQ57c=";
   };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "avogadro2";
-  version = "1.101.0";
+  version = "1.102.1";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadroapp";
-    rev = version;
-    hash = "sha256-F8to1DyeyyhsivkXDB/KH10/7teVnsoSU/ZHIsNISqc=";
+    rev = finalAttrs.version;
+    hash = "sha256-nBkOiw6JO/cG1Ob9gw7Tt/076OoRaRRmDc/a9YAfZCA=";
   };
 
   postUnpack = ''
@@ -47,6 +48,7 @@ stdenv.mkDerivation rec {
     molequeue
     eigen
     hdf5
+    jkqtplotter
     qttools
   ];
 
@@ -62,4 +64,4 @@ stdenv.mkDerivation rec {
     inherit (mesa.meta) platforms;
     license = licenses.bsd3;
   };
-}
+})

pkgs/by-name/fo/foxglove-studio/package.nix

@@ -20,11 +20,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "foxglove-studio";
-  version = "2.38.0";
+  version = "2.39.0";
 
   src = fetchurl {
     url = "https://get.foxglove.dev/desktop/v${finalAttrs.version}/foxglove-studio-${finalAttrs.version}-linux-amd64.deb";
-    hash = "sha256-GXWxiKPpOTgoMGcI8y9Hbesmv/jOOJxKnCl4RvkYNqQ=";
+    hash = "sha256-bEvlgFCDt1b/bZhqJeeMMIDq8qjga5pwRlo/fTa3QKs=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/hl/hledger-fmt/package.nix

@@ -9,20 +9,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hledger-fmt";
-  version = "0.3.1";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "mondeja";
     repo = "hledger-fmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5dPKSUJLxQ5WXZefuwr3wLhr3MNzy+dzpJkgKFU0/SE=";
+    hash = "sha256-VyDVdXxTge3ERTrkIIWgR75m7TaEbbPmFDNsoYOi9tM=";
   };
 
   nativeBuildInputs = [
     installShellFiles
   ];
 
-  cargoHash = "sha256-yErH9AyfBZF0PByqViVhXHB/FAc0awz4bOyAHtcHe0s=";
+  cargoHash = "sha256-jn4ptV0IVnnXR2oCxxUnGaoWG/LBlRkf25/8Nasm9qI=";
 
   # Tests try to invoke the binary from "target/debug/hledger-fmt"
   # https://github.com/mondeja/hledger-fmt/blob/783abdb32eefb20195c7e9562858552935bb9c8e/src/cli/tests.rs#L5

pkgs/by-name/li/libxcb/package.nix

@@ -57,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
   };
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isMinGW {
+    NIX_CFLAGS_COMPILE = toString [ "-Wno-incompatible-pointer-types" ];
+  };
+
   meta = {
     description = "C interface to the X Window System protocol";
     homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb";

pkgs/by-name/rc/rcu/package.nix

@@ -19,11 +19,12 @@
 }:
 
 let
+  # shiboken2 is broken on Python > 3.12
   python3Packages = python312Packages;
 in
 python3Packages.buildPythonApplication rec {
   pname = "rcu";
-  version = "4.0.29";
+  version = "4.0.30";
 
   format = "other";
 
@@ -31,7 +32,7 @@ python3Packages.buildPythonApplication rec {
     let
       src-tarball = requireFile {
         name = "rcu-${version}-source.tar.gz";
-        hash = "sha256-qbHjRKH9GOwBduyod8AOm2SYOjGUH1mYSpCTifOehVM=";
+        hash = "sha256-SJnDTW6oQUd+UjWgJz74Po+ibk3JfotFU7CIt4J/nDA=";
         url = "https://www.davisr.me/projects/rcu/";
       };
     in

pkgs/by-name/sa/saga/package.nix

@@ -1,47 +1,56 @@
 {
-  stdenv,
   lib,
+  stdenv,
+  config,
   fetchurl,
-  # native
+
+  # nativeBuildInputs
   cmake,
-  desktopToDarwinBundle,
   dos2unix,
   pkg-config,
   wrapGAppsHook3,
-  # not native
-  gdal,
-  wxGTK32,
-  proj,
-  libsForQt5,
+  # cuda-specific
+  cudaPackages,
+  # darwin-specific
+  desktopToDarwinBundle,
+
+  # buildInputs
   curl,
-  libiodbc,
-  xz,
-  libharu,
-  opencv,
-  vigra,
-  pdal,
-  libpq,
-  unixODBC,
-  poppler,
-  hdf5,
-  netcdf,
-  sqlite,
-  qhull,
-  giflib,
-  libsvm,
   fftw,
+  gdal,
+  giflib,
+  hdf5,
+  libharu,
+  libiodbc,
+  libpq,
+  libsForQt5,
+  libsvm,
+  opencv,
+  pdal,
+  proj,
+  qhull,
+  vigra,
+  wxGTK32,
+  xz,
+  # darwin-specific
+  netcdf,
+  poppler,
+  sqlite,
+  unixODBC,
+
+  cudaSupport ? config.cudaSupport,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "saga";
   version = "9.10.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
+    url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz";
     hash = "sha256-xsXOB4WCzkZhH/mIYEUQNiQ9NnX+0CF2IcWkmwEJBUA=";
   };
 
-  sourceRoot = "saga-${version}/saga-gis";
+  sourceRoot = "saga-${finalAttrs.version}/saga-gis";
 
   postPatch = ''
     dos2unix src/saga_core/saga_gui/res/org.saga_gis.saga_gui.desktop
@@ -50,37 +59,45 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     dos2unix
-    wrapGAppsHook3
     pkg-config
+    wrapGAppsHook3
   ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
   buildInputs = [
     curl
-    libsForQt5.dxflib
     fftw
-    libsvm
-    hdf5
     gdal
-    wxGTK32
+    giflib
+    hdf5
+    libharu
+    libiodbc
+    libpq
+    libsForQt5.dxflib
+    libsvm
+    opencv
     pdal
     proj
-    libharu
-    opencv
-    vigra
-    libpq
-    libiodbc
-    xz
     qhull
-    giflib
+    vigra
+    wxGTK32
+    xz
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
   ]
   # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
   # for why the have additional buildInputs on darwin
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    unixODBC
-    poppler
     netcdf
+    poppler
     sqlite
+    unixODBC
   ];
 
   cmakeFlags = [
@@ -90,7 +107,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "System for Automated Geoscientific Analyses";
     homepage = "https://saga-gis.sourceforge.io";
-    changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${version}/";
+    changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${finalAttrs.version}/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       michelk
@@ -99,4 +116,4 @@ stdenv.mkDerivation rec {
     teams = [ lib.teams.geospatial ];
     platforms = with lib.platforms; unix;
   };
-}
+})

pkgs/by-name/ze/zed-editor/package.nix

@@ -101,7 +101,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.209.7";
+  version = "0.210.4";
 
   outputs = [
     "out"
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vmHBPpRFSaqj62NZCAKtc3ZiMe8P++Ji57aJ5cuWjWQ=";
+    hash = "sha256-xSADK/LAbcb47Hd66p+11GuylOFSsbNTVtJtiVOylNQ=";
   };
 
   postPatch = ''
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-UM01zsi/brSyxzAaEUQ+ZUB8j5c6LMHv0eAhyuQ1huA=";
+  cargoHash = "sha256-bVRDOhjeRwS/j0Lul7JtnvXKUldOYH4dOJhUgMhfeuQ=";
 
   nativeBuildInputs = [
     cmake

pkgs/development/libraries/jkqtplotter/default.nix

@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  qttools,
+  wrapQtAppsHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "jkqtplotter";
+  version = "5.0.0-unstable-2025-10-13";
+
+  src = fetchFromGitHub {
+    owner = "jkriege2";
+    repo = "JKQtPlotter";
+    rev = "d243218119b1632987df26baea0d4bc6ccdee533";
+    hash = "sha256-fLkZGl4LYr9zdGjxxhcU6IZkpXV/Sex4TC9DFPyw43M=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qttools
+  ];
+
+  meta = {
+    description = "Qt plotting framework";
+    maintainers = [ lib.maintainers.sheepforce ];
+    homepage = "https://github.com/jkriege2/JKQtPlotter";
+    license = lib.licenses.lgpl21Plus;
+  };
+})

pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix

@@ -12,6 +12,7 @@
   python3,
   libarchive,
   libmsym,
+  jkqtplotter,
   qttools,
   wrapQtAppsHook,
 }:
@@ -28,32 +29,32 @@ let
   moleculesRepo = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "molecules";
-    tag = "1.101.0";
+    tag = "1.102.1";
     hash = "sha256-hMLf0gYYnQpjSGKcPy4tihNbmpRR7UxnXF/hyhforgI=";
   };
   crystalsRepo = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "crystals";
-    tag = "1.101.0";
+    tag = "1.102.1";
     hash = "sha256-WhzFldaOt/wJy1kk+ypOkw1OYFT3hqD7j5qGdq9g+IY=";
   };
   fragmentsRepo = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "fragments";
-    tag = "1.101.0";
+    tag = "1.102.1";
     hash = "sha256-x10jGl3lAEfm8OxUZJnjXRJCQg8RLQZTstjwnt5B2bw=";
   };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "avogadrolibs";
-  version = "1.101.0";
+  version = "1.102.1";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadrolibs";
-    tag = version;
-    hash = "sha256-0DJU40Etse90rdX8xByjQeUiBsJtEQozZQQsWsc4vxk=";
+    tag = finalAttrs.version;
+    hash = "sha256-RmGRdCy1ubwAkEJlfldscR84NLOMBx33OdHdcq1R1gg=";
   };
 
   postUnpack = ''
@@ -77,6 +78,7 @@ stdenv.mkDerivation rec {
     glew
     libarchive
     libmsym
+    jkqtplotter
     qttools
   ];
 
@@ -96,4 +98,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2Only;
   };
-}
+})

pkgs/development/ocaml-modules/gapi-ocaml/default.nix

@@ -12,7 +12,7 @@
 
 buildDunePackage rec {
   pname = "gapi-ocaml";
-  version = "0.4.6";
+  version = "0.4.7";
 
   minimalOCamlVersion = "4.08";
 
@@ -20,7 +20,7 @@ buildDunePackage rec {
     owner = "astrada";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-pMieplqWGjgA6NVK0hEEVTRjggZtiPP/OepRi9SxMok=";
+    hash = "sha256-uQJfrgF0oafURlamHslt9hX9MP4vFeVqDhuX7T/kjiY=";
   };
 
   nativeBuildInputs = [ cppo ];

pkgs/development/python-modules/lerobot/default.nix

@@ -8,6 +8,7 @@
   setuptools,
 
   # dependencies
+  accelerate,
   av,
   datasets,
   deepdiff,
@@ -26,6 +27,7 @@
   rerun-sdk,
   termcolor,
   torch,
+  torchcodec,
   torchvision,
   wandb,
 
@@ -36,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "lerobot";
-  version = "0.3.3";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "lerobot";
     tag = "v${version}";
-    hash = "sha256-JaspLUuSupmk6QD+mUVLuCSczTNjy0w+nsLBcy7tXnE=";
+    hash = "sha256-RVe1X0qBPm+okO3Gi/UdkuvuX0m4RlbhIs+NJLlC9wU=";
   };
 
   # ValueError: mutable default <class 'lerobot.configs.types.PolicyFeature'> for field value is not allowed: use default_factory
@@ -73,7 +75,9 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    accelerate
     av
+    cmake
     datasets
     deepdiff
     diffusers
@@ -91,9 +95,13 @@ buildPythonPackage rec {
     rerun-sdk
     termcolor
     torch
+    torchcodec
     torchvision
     wandb
-  ];
+  ]
+  ++ imageio.optional-dependencies.ffmpeg
+  ++ huggingface-hub.optional-dependencies.hf_transfer
+  ++ huggingface-hub.optional-dependencies.cli;
 
   pythonImportsCheck = [ "lerobot" ];
 
@@ -105,6 +113,7 @@ buildPythonPackage rec {
   disabledTests = [
     # RuntimeError: OpenCVCamera(/build/source/tests/artifacts/cameras/image_480x270.png) read failed
     "test_async_read"
+    "test_fourcc_with_camer"
     "test_read"
     "test_rotation"
 
@@ -134,6 +143,11 @@ buildPythonPackage rec {
     "test_cosine_decay_with_warmup_scheduler"
     "test_diffuser_scheduler"
     "test_vqbet_scheduler"
+
+    # AssertionError: Regex pattern did not match.
+    #  Regex: "Can't instantiate abstract class NonCallableStep with abstract method __call_"
+    #  Input: "Can't instantiate abstract class NonCallableStep without an implementation for abstract method '__call__'"
+    "test_construction_rejects_step_without_call"
   ];
 
   meta = {

pkgs/servers/sql/postgresql/ext/anonymizer.nix

@@ -23,7 +23,8 @@ buildPgrxExtension {
 
   passthru.tests = nixosTests.postgresql.anonymizer.passthru.override postgresql;
 
-  meta = lib.getAttrs [ "homepage" "teams" "license" ] pg-dump-anon.meta // {
+  meta = {
+    inherit (pg-dump-anon.meta) homepage teams license;
     description = "Extension to mask or replace personally identifiable information (PII) or commercially sensitive data from a PostgreSQL database";
   };
 }

pkgs/top-level/all-packages.nix

@@ -3123,6 +3123,8 @@ with pkgs;
 
   jl = haskellPackages.jl;
 
+  jkqtplotter = libsForQt5.callPackage ../development/libraries/jkqtplotter { };
+
   joplin = nodePackages.joplin;
 
   jpylyzer = with python3Packages; toPythonApplication jpylyzer;
@@ -12847,6 +12849,11 @@ with pkgs;
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
+  inherit (callPackage ../applications/misc/xppen { })
+    xppen_3
+    xppen_4
+    ;
+
   xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
 
   ydiff = with python3.pkgs; toPythonApplication ydiff;