Merge master into staging-nixos

maintainers/maintainer-list.nix

@@ -23985,6 +23985,12 @@
     github = "shelvacu";
     githubId = 1731537;
   };
+  shgew = {
+    name = "Hleb Shauchenka";
+    email = "me@marleb.org";
+    github = "shgew";
+    githubId = 5584672;
+  };
   shhht = {
     name = "shhht";
     email = "stp.tjeerd@gmail.com";

nixos/modules/system/boot/zram-as-tmp.nix

@@ -85,6 +85,10 @@ in
       }
     ];
 
+    boot.supportedFilesystems = {
+      ${cfg.zramSettings.fs-type} = true;
+    };
+
     services.zram-generator.enable = true;
     services.zram-generator.settings =
       let

nixos/tests/terminal-emulators.nix

@@ -65,6 +65,7 @@ let
     mate-terminal.cmd = "SHELL=$command mate-terminal --disable-factory"; # factory mode uses dbus, and we don't have a proper dbus session set up
 
     mlterm.pkg = p: p.mlterm;
+    mlterm.kill = true;
 
     qterminal.pkg = p: p.lxqt.qterminal;
     qterminal.kill = true;

pkgs/applications/editors/neovim/wrapper.nix

@@ -1,6 +1,7 @@
 {
   stdenv,
   lib,
+  wayland,
   makeWrapper,
   bundlerEnv,
   wl-clipboard,
@@ -40,7 +41,7 @@ let
       # the function you would have passed to python3.withPackages
       extraPython3Packages ? (_: [ ]),
 
-      waylandSupport ? stdenv.hostPlatform.isLinux,
+      waylandSupport ? lib.meta.availableOn stdenv.hostPlatform wayland,
       withNodeJs ? false,
       withPerl ? false,
       withRuby ? true,

pkgs/applications/editors/vscode/vscodium.nix

@@ -26,11 +26,11 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-lteOBRRmAQbY1zlPaBU8wKdmtpCP4vkk5+YuQ0B5RXg=";
-      x86_64-darwin = "sha256-1AVMMMEVadg5NpV+xr9kyoX6bNB2uJjBbtXDJ878DvM=";
-      aarch64-linux = "sha256-XrY+WyRaEvczbtZWRdRhtOOzIOubM+2zvNQ8XMF8bQk=";
-      aarch64-darwin = "sha256-qgZTf8tWtpf1lRZL9hz3y1AAOn7zElAaCJRo4wUNYeQ=";
-      armv7l-linux = "sha256-mZof3m9FQrByZoUy7VtS56ePTzbSXmu2Uo1QC0Ay+nM=";
+      x86_64-linux = "sha256-P71aeIViaqSoMpfgtKPZAsclsWdBIvM9DvAoY8cm5Ow=";
+      x86_64-darwin = "sha256-qUbfAynw5QHbWHk+8McQFICXKiWk7dfsO9jNpgBvkuc=";
+      aarch64-linux = "sha256-aUj0m6mqVyZU0MxPWXSn5YOG4jDbzIdSkZfkiVNpJR4=";
+      aarch64-darwin = "sha256-4JyPvwTILXUuwLT19Ok7q4ZEoG0rmtbAjmuOtgZ7X4U=";
+      armv7l-linux = "sha256-Cd/T6Yo6jLqQWNQmVWcNU8eZhAy6J0VyEYFTnlFOj3I=";
     }
     .${system} or throwSystem;
 
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.106.27818";
+  version = "1.106.37943";
   pname = "vscodium";
 
   executableName = "codium";

pkgs/applications/emulators/libretro/cores/ppsspp.nix

@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-11-19";
+  version = "0-unstable-2025-11-27";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "c1581e6c3873331b93868bccd2f53f34a2316f89";
-    hash = "sha256-9w2CtCQIaCBf2hwbQaMWjin0HT7ioc7vwBVMqbLJhqw=";
+    rev = "e5bafa4264e88cf2699e44740e2580ced0454a90";
+    hash = "sha256-+Rmj75yBodwqENJppTWpsef9R0ajCoz9KaxVuYktUII=";
     fetchSubmodules = true;
   };
 

pkgs/applications/networking/mailreaders/evolution/evolution/default.nix

@@ -42,6 +42,9 @@
   p11-kit,
   openldap,
   spamassassin,
+  gnutar,
+  gzip,
+  xz,
 }:
 
 stdenv.mkDerivation rec {
@@ -116,6 +119,18 @@ stdenv.mkDerivation rec {
     "-DWITH_OPENLDAP=${openldap}"
   ];
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : "${
+        lib.makeBinPath [
+          gnutar
+          gzip
+          xz
+        ]
+      }"
+    )
+  '';
+
   requiredSystemFeatures = [
     "big-parallel"
   ];

pkgs/build-support/agda/default.nix

@@ -94,6 +94,7 @@ let
     {
       pname,
       meta,
+      passthru ? { },
       buildInputs ? [ ],
       libraryName ? pname,
       libraryFile ? "${libraryName}.agda-lib",
@@ -145,9 +146,13 @@ let
       meta = if meta.broken or false then meta // { hydraPlatforms = platforms.none; } else meta;
 
       # Retrieve all packages from the finished package set that have the current package as a dependency and build them
-      passthru.tests = filterAttrs (
-        name: pkg: self.lib.isUnbrokenAgdaPackage pkg && elem pname (map (pkg: pkg.pname) pkg.buildInputs)
-      ) self;
+      passthru = passthru // {
+        tests =
+          passthru.tests or { }
+          // filterAttrs (
+            name: pkg: self.lib.isUnbrokenAgdaPackage pkg && elem pname (map (pkg: pkg.pname) pkg.buildInputs)
+          ) self;
+      };
     };
 in
 {

pkgs/by-name/at/atuin-desktop/package.nix

@@ -18,23 +18,22 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "atuin-desktop";
-  version = "0.1.11";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "atuinsh";
     repo = "desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ySws3R4CatOrKjjGrLJQU9feXIb5MdVX1uKK0fFV21s=";
+    hash = "sha256-jBCf6Wq7xTgI2VjhQ+RZ3uN7LVh+ZlQ3TDJ0epsGj0M=";
   };
 
-  cargoRoot = "backend";
-  buildAndTestSubdir = finalAttrs.cargoRoot;
-  cargoHash = "sha256-gyDg8XBPiMovOtzmb0eHVWuXmavZTBMvPPgbcdNU6xo=";
+  cargoRoot = "./.";
+  cargoHash = "sha256-329uNcc8LSNreD8CgPCpEhGCR2PebpmFoaRwZn+oscE=";
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-6YDYrFo5iCelRGBnDFoI8V3Nv/8w3XPNwuArc+nSShU=";
+    hash = "sha256-2i1mL4HwwiXrmM1qaWvHhm27U2/oElbOpnXh09ziamo=";
   };
 
   nativeBuildInputs = [
@@ -54,8 +53,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   env = {
-    # Used upstream: https://github.com/atuinsh/desktop/blob/2f9a90963c4a6299bf35d8a49b0a2ffb8a28ee32/.envrc.
-    NODE_OPTIONS = "--max-old-space-size=5120";
+    # Used upstream: https://github.com/atuinsh/desktop/blob/6ddebdf66c70042defe5587f7f6c433f889b9ef4/.envrc#L1
+    NODE_OPTIONS = "--max-old-space-size=6144";
   };
 
   # Otherwise tauri will look for a private key we don't have.
@@ -72,8 +71,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   checkFlags = [
-    # Failing for unknown reason.
-    "--skip=runtime::blocks::handlers::script_output_test::tests::test_multiple_scripts"
+    "--skip=ui::viewport::tests::test_add_line_scrolling"
+    "--skip=ui::viewport::tests::test_line_wrapping"
   ];
   doCheck = !stdenv.isDarwin;
 

pkgs/by-name/ca/cargo-deny/package.nix

@@ -6,18 +6,18 @@
   zstd,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-deny";
-  version = "0.18.5";
+  version = "0.18.6";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-deny";
-    tag = version;
-    hash = "sha256-FYVMeq/728uXayGbDKVK2kZNkf9tdXET+uEorJ6WNto=";
+    tag = finalAttrs.version;
+    hash = "sha256-w3SFU0FSX7nmqzyxey0erJfq8YsFEEukfNhDg5g0I04=";
   };
 
-  cargoHash = "sha256-QfylAFybghBJzxgtrKIPGz/6EM1DlNJ/uJIEtMXpTbo=";
+  cargoHash = "sha256-yrVSXrxfJ4vB85rARq6g71AswRMXhn25tfYZqXm1zoo=";
 
   nativeBuildInputs = [
     pkg-config
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     description = "Cargo plugin for linting your dependencies";
     mainProgram = "cargo-deny";
     homepage = "https://github.com/EmbarkStudios/cargo-deny";
-    changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit
@@ -48,4 +48,4 @@ rustPlatform.buildRustPackage rec {
       jk
     ];
   };
-}
+})

pkgs/by-name/ch/chawan/mancha-augment-path.diff

@@ -1,13 +0,0 @@
-Add the -m option to man's command line to augment the list of paths searched by man.
-The required -m option is only available in the mandoc implementation.
---- a/adapter/protocol/man.nim
-+++ b/adapter/protocol/man.nim
-@@ -264,7 +264,7 @@ proc myOpen(cmd: string): tuple[ofile, efile: File] =
- 
- proc doMan(man, keyword, section: string) =
-   let sectionOpt = if section == "": "" else: ' ' & quoteShellPosix(section)
-   let cmd = "MANCOLOR=1 GROFF_NO_SGR=1 MAN_KEEP_FORMATTING=1 " &
--    man & sectionOpt & ' ' & quoteShellPosix(keyword)
-+    man & sectionOpt & " -m @out@ " & quoteShellPosix(keyword)
-   let (ofile, efile) = myOpen(cmd)
-   if ofile == nil:

pkgs/by-name/ch/chawan/package.nix

@@ -3,38 +3,26 @@
   stdenv,
   fetchFromSourcehut,
   makeBinaryWrapper,
-  curlMinimal,
-  mandoc,
-  ncurses,
+  openssl,
+  libssh2,
   nim,
-  pandoc,
   pkg-config,
   brotli,
-  zlib,
   gitUpdater,
   versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chawan";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromSourcehut {
     owner = "~bptato";
     repo = "chawan";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-pUwwqFvTtLAGFQG62W90hEH+yPN+ifa5BDRYNh/Jupg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-y1z1MlwbKGpvtgt4OZtfvxvsOSE6RhnsWUeaRvu7etU=";
   };
 
-  patches = [ ./mancha-augment-path.diff ];
-
-  # Include chawan's man pages in mancha's search path
-  postPatch = ''
-    # As we need the $out reference, we can't use `replaceVars` here.
-    substituteInPlace adapter/protocol/man.nim \
-      --replace-fail '@out@' "$out"
-  '';
-
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration"
   );
@@ -42,20 +30,17 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeBinaryWrapper
     nim
-    pandoc
     pkg-config
     brotli
   ];
 
   buildInputs = [
-    curlMinimal
-    ncurses
-    zlib
+    openssl
+    libssh2
   ];
 
   buildFlags = [
     "all"
-    "manpage"
   ];
   installFlags = [
     "DESTDIR=$(out)"
@@ -65,12 +50,10 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall =
     let
       makeWrapperArgs = ''
-        --set MANCHA_CHA $out/bin/cha \
-        --set MANCHA_MAN ${mandoc}/bin/man
+        --set MANCHA_CHA $out/bin/cha
       '';
     in
     ''
-      wrapProgram $out/bin/cha ${makeWrapperArgs}
       wrapProgram $out/bin/mancha ${makeWrapperArgs}
     '';
 

pkgs/by-name/es/eslint/package.nix

@@ -7,13 +7,13 @@
 }:
 buildNpmPackage rec {
   pname = "eslint";
-  version = "9.35.0";
+  version = "9.39.1";
 
   src = fetchFromGitHub {
     owner = "eslint";
     repo = "eslint";
     tag = "v${version}";
-    hash = "sha256-Ml/TeVvNcq6GyNklwn2/uURUDrJsMCNZcLEx6sLKPiI=";
+    hash = "sha256-++79Xcjbew56sglX9IMwLDNmbBeHzW1+yvt51ID9/4s=";
   };
 
   # NOTE: Generating lock-file
@@ -25,7 +25,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-+dgbWi4Z+2BWLwOv3sTQ2YFrONFyBHmxyc3FFLmStb8=";
+  npmDepsHash = "sha256-ImYxBeVgfkTxU2tvSCWgWgpECsIkGiXWrx+RZKwwYxY=";
   npmInstallFlags = [ "--omit=dev" ];
 
   dontNpmBuild = true;

pkgs/by-name/es/esphome/package.nix

@@ -33,14 +33,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.11.1";
+  version = "2025.11.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-7tLe1GjL6rk6YvgYaU2x6RmUOCYcnZFAfaYifmpMLVo=";
+    hash = "sha256-nu5sJkihCptZ3KSBE/8xR31yl7gnFQQdT+auLQ2qEw0=";
   };
 
   patches = [

pkgs/by-name/fi/firecracker/package.nix

@@ -7,16 +7,17 @@
   libseccomp,
   rust-bindgen,
   rustPlatform,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "firecracker";
   version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "firecracker-microvm";
     repo = "firecracker";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-ZrIvz5hmP0d8ADF723Z+lOP9hi5nYbi6WUtV4wTp73U=";
   };
 
@@ -78,6 +79,11 @@ rustPlatform.buildRustPackage rec {
     "--skip=resource_limits::tests::test_set_resource_limits"
   ];
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
   installPhase = ''
     runHook preInstall
 
@@ -93,7 +99,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Secure, fast, minimal micro-container virtualization";
     homepage = "http://firecracker-microvm.io";
-    changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}";
+    changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${finalAttrs.version}";
     mainProgram = "firecracker";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
@@ -104,4 +110,4 @@ rustPlatform.buildRustPackage rec {
       techknowlogick
     ];
   };
-}
+})

pkgs/by-name/he/helix-db/package.nix

@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "helix-db";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     repo = "helix-db";
     owner = "HelixDB";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/7BS+7ZryWOmmSx1M/8PmQGHkj5M0/UmJHrLhYf7y3o=";
+    hash = "sha256-oy17xutabfTmdkyi3Ak61f4fhd65m+Cwk+1a156K2hQ=";
   };
 
-  cargoHash = "sha256-JpKsAd1SG7ZI+DrCivZBNVkWITr0juu2osDRkL94FBk=";
+  cargoHash = "sha256-KrrbQwxhqtO8ISq7WWSo67t58dOuI3gS/9nesVCIq+0=";
 
   patches = [
     #There are no feature yet

pkgs/by-name/ho/home-manager/package.nix

@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-11-17";
+  version = "0-unstable-2025-11-27";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "7538d965352d3bfd4c380f5b3aa618bc839a84b4";
-    hash = "sha256-GuG3PW8U41f8XqROreZQaUvrcjQt+Gh92g16X7zBUck=";
+    rev = "86ff0ef506c209bb397849706e85cc3a913cb577";
+    hash = "sha256-bO7FN/bF6gG7TlZpKAZjO3VvfsLaPFkefeUfJJ7F/7w=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ku/kubectl-rook-ceph/package.nix

@@ -13,10 +13,10 @@ buildGoModule (finalAttrs: {
     owner = "rook";
     repo = "kubectl-rook-ceph";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LzPjvJ/IyaKjUYenq8Vi4oZktBdykH7Sz/RYRKqJQ4E=";
+    hash = "sha256-OYK86GamU4m9vJUINfRbpM5U6mbjI3P6aiUp3+RZvIA=";
   };
 
-  vendorHash = "sha256-t41z99kE3Ju473ZvFUVTM79sI5OFqBVpQfk1lgU+Apo=";
+  vendorHash = "sha256-D2WbLc6/FVm9YB7meWdJ5Of0WYBB+kKC2+AepdgwJAA=";
 
   postInstall = ''
     mv $out/bin/cmd $out/bin/kubectl-rook-ceph

pkgs/by-name/me/meshtasticd/package.nix

@@ -0,0 +1,88 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  dpkg,
+  i2c-tools,
+  libX11,
+  libgpiod_1,
+  libinput,
+  libusb1,
+  libuv,
+  libxkbcommon,
+  udevCheckHook,
+  ulfius,
+  yaml-cpp,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "meshtasticd";
+  version = "2.6.11.25";
+
+  src = fetchurl {
+    url = "https://download.opensuse.org/repositories/network:/Meshtastic:/beta/Debian_12/amd64/meshtasticd_${finalAttrs.version}~obs60ec05e~beta_amd64.deb";
+    hash = "sha256-7JCv+1YgsCLwboGE/2f+8iyLLoUsKn3YdJ9Atnfj7Zw=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+  ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  strictDeps = true;
+
+  buildInputs = [
+    i2c-tools
+    libX11
+    libgpiod_1
+    libinput
+    libusb1
+    libuv
+    libxkbcommon
+    ulfius
+    yaml-cpp
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libyaml-cpp.so.0.7"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p {$out,$out/bin}
+    cp -r {usr,lib} $out/
+
+    patchelf --replace-needed libyaml-cpp.so.0.7 libyaml-cpp.so.0.8 $out/usr/bin/meshtasticd
+
+    ln -s $out/usr/bin/meshtasticd $out/bin/meshtasticd
+
+    substituteInPlace $out/lib/systemd/system/meshtasticd.service \
+      --replace-fail "/usr/bin/meshtasticd" "$out/bin/meshtasticd" \
+      --replace-fail 'User=meshtasticd' 'DynamicUser=yes' \
+      --replace-fail 'Group=meshtasticd' ""
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ udevCheckHook ];
+
+  meta = {
+    description = "Meshtastic daemon for communicating with Meshtastic devices";
+    longDescription = ''
+      This package has `udev` rules installed as part of the package.
+      Add `services.udev.packages = [ pkgs.meshtasticd ]` into your NixOS
+      configuration to enable them.
+    '';
+    homepage = "https://github.com/meshtastic/firmware";
+    mainProgram = "meshtasticd";
+    license = lib.licenses.gpl3Plus;
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+})

pkgs/by-name/mg/mgrep/package.nix

@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nodejs,
+  pnpm,
+  npmHooks,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mgrep";
+  version = "0.1.4";
+
+  src = fetchFromGitHub {
+    owner = "mixedbread-ai";
+    repo = "mgrep";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FwgUK5vPXba8cmGrsSItbhXYDNPxkr7x5u1jPxs3SAA=";
+  };
+
+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 2;
+    hash = "sha256-oq7jczTfm6CgLAUYftBlAYK6MFELDRfXCFtjsLWV8mU=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    pnpm.configHook
+    npmHooks.npmInstallHook
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    pnpm build
+    runHook postBuild
+  '';
+
+  dontNpmPrune = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Semantic grep for local files using Mixedbread embeddings";
+    homepage = "https://github.com/mixedbread-ai/mgrep";
+    changelog = "https://github.com/mixedbread-ai/mgrep/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ andrewgazelka ];
+    mainProgram = "mgrep";
+  };
+})

pkgs/by-name/ne/netron/package.nix

@@ -16,16 +16,16 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "netron";
-  version = "8.7.3";
+  version = "8.7.5";
 
   src = fetchFromGitHub {
     owner = "lutzroeder";
     repo = "netron";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4ATVEPOOju2nz7vsl+qCwG4A6F1HRx3/1MkFSUKPD2Q=";
+    hash = "sha256-wK6aKoTnERW1qkCv1zy4Pea00VP0mOPZGFxLbGQ6IFg=";
   };
 
-  npmDepsHash = "sha256-TTAemrFZoXKlkPSHjQWZh0zree+s5ZWYXT0cy8xUBA0=";
+  npmDepsHash = "sha256-+beWln/XjFyRc1g4ERvWACt7XRSimDX7G1x9R3YP3Eg=";
 
   nativeBuildInputs = [ jq ];
 

pkgs/by-name/ob/obfs4/package.nix

@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "obfs4";
-  version = "0.6.2";
+  version = "0.7.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
     # will collide with lyrebird Gtk3 program.
     repo = "lyrebird";
     tag = "lyrebird-${finalAttrs.version}";
-    hash = "sha256-0Nny97bapiyolmCHcty+HtZTziA50bqoCD+3gyFZIQE=";
+    hash = "sha256-JBYYMi80n9FlW1WNh1fa3G+stL4hX9XeJ2idLvtgylI=";
   };
 
-  vendorHash = "sha256-ifJyOhbaB7BDBayvbh1otF1hxCuxzSG9NLb7Xtvaupg=";
+  vendorHash = "sha256-isquplrmgtR8Mn5M+XNRdeGJHrAm7V7h1etVmVmN60I=";
 
   ldflags = [
     "-s"

pkgs/by-name/on/oneDNN/package.nix

@@ -11,13 +11,13 @@
 # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
 stdenv.mkDerivation (finalAttrs: {
   pname = "oneDNN";
-  version = "3.10";
+  version = "3.10.1";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneDNN";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EII2EFCxU+ZnmfnRM8dfHa+sEi2z+7k2ikBbfpZafko=";
+    hash = "sha256-v1A9bOjcveTg97RBI2Y/gikoeQKYN8ZfFrqJmD3lVys=";
   };
 
   outputs = [

pkgs/by-name/ov/ovn/package.nix

@@ -15,6 +15,10 @@
   unbound,
   xdp-tools,
   openvswitch,
+  gawk,
+  coreutils,
+  gnugrep,
+  gnused,
   makeWrapper,
 }:
 let
@@ -117,7 +121,15 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${openvswitch}/share/openvswitch/scripts/ovs-lib $out/share/openvswitch/scripts/ovs-lib
 
     wrapProgram $out/share/ovn/scripts/ovn-ctl \
-      --prefix PATH : ${lib.makeBinPath [ openvswitch ]}
+      --prefix PATH : ${
+        lib.makeBinPath [
+          openvswitch
+          gawk
+          coreutils # tr
+          gnugrep
+          gnused
+        ]
+      }
   '';
 
   env = {

pkgs/by-name/pl/planify/package.nix

@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.16.0";
+  version = "4.16.1";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     tag = "v${version}";
-    hash = "sha256-uNcTP//9YpdwHbZ49jKlrvK8wxCJK3oSrOMjoGAcDjk=";
+    hash = "sha256-jQW82nnIfuKhTWPlJQD2Mcl+Yl+NqnTbRnMn5+sfuD4=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/po/postman/package.nix

@@ -8,7 +8,7 @@
 
 let
   pname = "postman";
-  version = "11.70.6";
+  version = "11.72.9";
 
   src =
     let
@@ -27,10 +27,10 @@ let
       name = "postman-${version}.${if stdenvNoCC.hostPlatform.isLinux then "tar.gz" else "zip"}";
       url = "https://dl.pstmn.io/download/version/${version}/${system}";
       hash = selectSystem {
-        aarch64-darwin = "sha256-+iPKe3JSqR+3oc9vWFsxPccl/sTvYW70NpW4pv80iSE=";
-        aarch64-linux = "sha256-9vJAfXFCoxJcb4AVS0ly5vJYd4ydB1Fb1GNtr6RopXU=";
-        x86_64-darwin = "sha256-BqoM2cIsjRaLT6CfQLwN7agaM6Ijo6zYvxcF6wzWIyw=";
-        x86_64-linux = "sha256-g3/PjA0MJKJ7oa2x7C+l2FEMN/OIMWQD8OoGtpoa3Wk=";
+        aarch64-darwin = "sha256-/WCdoDyDA3wuCeO/CMxGQ0lhKJNIoDW8sxLGYn/QH2E=";
+        aarch64-linux = "sha256-m3a0xNjGLURhybcpz+pHPfENBwiIg5wEIU3Iu3zkA7s=";
+        x86_64-darwin = "sha256-uUQT5qUQ5iIC874Y56PGpiVuQhQgH4xIdyN6UPTrnDY=";
+        x86_64-linux = "sha256-jwGT1vc5UeQ5WmtgHygVZY0nGZ+NnHy45LsNl4xsBEk=";
       };
     };
 

pkgs/by-name/re/readeck/package.nix

@@ -10,21 +10,16 @@
 
 buildGoModule rec {
   pname = "readeck";
-  version = "0.21.2";
+  version = "0.21.3";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "readeck";
     repo = "readeck";
     tag = version;
-    hash = "sha256-qbH95jsOrB/AEw4uy0DXfRCqLL+VSj9322PeP5mUgdk=";
+    hash = "sha256-d4FLyD2uOngUANc7fai8j0wZSY1ISS18JEBDxCqXdQw=";
   };
 
-  postPatch = ''
-    substituteInPlace go.mod \
-      --replace-fail 'go 1.25.4' 'go 1.25.3'
-  '';
-
   nativeBuildInputs = [
     nodejs
     npmHooks.npmConfigHook
@@ -67,10 +62,10 @@ buildGoModule rec {
 
   npmDeps = fetchNpmDeps {
     src = "${src}/web";
-    hash = "sha256-yhheyR9drXFgIdUIjfNe1rZWlNR1ShZooIZ12eIwlHM=";
+    hash = "sha256-XT+4IR1xVXiDY4wx2smt0pcNUx6UFoXYq+zxvbGsQ8A=";
   };
 
-  vendorHash = "sha256-Lf4chATpS+vwuWsrO3weVS/GvwWTvnT2FRu04wZLHZ8=";
+  vendorHash = "sha256-IWRlruj+zYixCRgbaf7QYBeCGwzf0qRY8OFa4s/PzME=";
 
   meta = {
     description = "Web application that lets you save the readable content of web pages you want to keep forever";

pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix

@@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = with lib; {
-    description = "Modular compiler frontend for the Rust language";
+    description = "Language server for the Rust language";
     homepage = "https://rust-analyzer.github.io";
     license = with licenses; [
       mit

pkgs/by-name/se/searxng/package.nix

@@ -13,14 +13,14 @@ in
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2025-11-21";
+    version = "0-unstable-2025-11-25";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "b876d0bed01422687f3f044658cab0afa9e0e19f";
-      hash = "sha256-K9nGtWOkVksxmD/3QIiSt/uVCBBghxA6baCgqoVoaj0=";
+      rev = "ebb9ea45715d655072400b2b5925f03ec96cf5eb";
+      hash = "sha256-tRPaQcM7EzDuD4MOK4t81uY8mhl9lzvnC955CS7j/u8=";
     };
 
     nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];

pkgs/by-name/se/secretive/package.nix

@@ -0,0 +1,34 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "secretive";
+  version = "3.0.4";
+
+  src = fetchzip {
+    url = "https://github.com/maxgoedjen/secretive/releases/download/v${finalAttrs.version}/Secretive.zip";
+    hash = "sha256-dZqcYnEHaeUN92lYIlGcv3qXPEIKY5z1LLJiSyeY2BM=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    cp -R Secretive.app "$out/Applications/"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Store SSH keys in the Secure Enclave";
+    homepage = "https://github.com/maxgoedjen/secretive";
+    changelog = "https://github.com/maxgoedjen/secretive/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ shgew ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})

pkgs/by-name/sp/spicetify-cli/package.nix

@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "spicetify-cli";
-  version = "2.42.1";
+  version = "2.42.3";
 
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-O2bS5LYUMj4u7MksbWjGGgpQJ39/OlMAkFSHKrVIX/k=";
+    hash = "sha256-gLVysXgQyodjyxXd81Rbduvr/xsaECioDHPgrpw8UiM=";
   };
 
   vendorHash = "sha256-DiVu/ePiZvn9+B/r8LS0qLt8eXKAtg4IXZ1WRzzAvcE=";

pkgs/by-name/tc/tcping-rs/package.nix

@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "tcping-rs";
-  version = "1.2.19";
+  version = "1.2.21";
 
   src = fetchFromGitHub {
     owner = "lvillis";
     repo = "tcping-rs";
     tag = version;
-    hash = "sha256-I7rcIemdPGFPBeOoIRft0tq49ikDs49UH5sEobL6fOA=";
+    hash = "sha256-n8eYxq3zFj1337lC7OJ32p9AaMU4HJDWVk0Bkw/STJ0=";
   };
 
-  cargoHash = "sha256-k+Hm6dHy6igk1deeVrWrAOdhlz0h/jen6pVNaGvB7Ak=";
+  cargoHash = "sha256-l1VzdBuwNANT9rUEEPuESfOp7/f3tghJrX/SEY9fSeA=";
 
   checkFlags = [
     # This test requires external network access

pkgs/by-name/te/terraform-mcp-server/package.nix

@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "terraform-mcp-server";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "terraform-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FcjeEp+uwlfezGlmBd2nSTdfnXuPnSDTxTPlP6CtcrE=";
+    hash = "sha256-DPm5kmlQNsE+C/CUzPML6HG32E5UZOacQw91lAuECOs=";
   };
 
-  vendorHash = "sha256-ObNuenbCmmbkRPKUmdMg+ERfUV+RiS2OEOneJOmteZU=";
+  vendorHash = "sha256-n5mneP4S8TZClaaVEykuAzcSDj0Y4YSl/o5ril3+hNo=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"

pkgs/by-name/th/the-foundation/package.nix

@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "the-foundation";
-  version = "1.10.1";
+  version = "1.11.0";
 
   src = fetchFromGitea {
     domain = "git.skyjake.fi";
     owner = "skyjake";
     repo = "the_Foundation";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EGltSimFdgojbXt97TbH7+a3iwuuI/jj14u9fkw4NnA=";
+    hash = "sha256-71MYOlCVkYOFB9byYaNmy31NfnssmGwB0lusjOpE2Ts=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/to/topiary/package.nix

@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "topiary";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "topiary";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IhNgR73CgfUf84yEUfDKmGTXFM9cQYBbwVdmfr02PAM=";
+    hash = "sha256-9jBgZd8RD/yhxoqOIh1yYd8brnmcLcybgQQeMPOCvj0=";
   };
 
-  cargoHash = "sha256-R1t8AZsIztsLlpP+Gmaolg+HydfuQL/9mCuHfKq/njA=";
+  cargoHash = "sha256-opNXJqR+q/f7ip6CWZ+QCdmDHvDFH/WVAwCnwZGVQKk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/ul/ulfius/package.nix

@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  curl,
+  gnutls,
+  jansson,
+  libmicrohttpd,
+  orcania,
+  yder,
+  zlib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ulfius";
+  version = "2.7.15";
+
+  src = fetchFromGitHub {
+    owner = "babelouest";
+    repo = "ulfius";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YvMhcobvTEm4LxhNxi1MJX8N7VAB3YOvp+LxioJrKHU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    curl
+    gnutls
+    jansson
+    libmicrohttpd
+    orcania
+    yder
+    zlib
+  ];
+
+  meta = {
+    description = "Web Framework to build REST APIs, Webservices or any HTTP endpoint in C language. Can stream large amount of data, integrate JSON data with Jansson, and create websocket services";
+    homepage = "https://github.com/babelouest/ulfius";
+    changelog = "https://github.com/babelouest/ulfius/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "uwsc";
+    platforms = lib.platforms.all;
+  };
+})

pkgs/by-name/vo/volanta/package.nix

@@ -9,11 +9,11 @@
 }:
 let
   pname = "volanta";
-  version = "1.14.1";
-  build = "4f70dc47";
+  version = "1.14.3";
+  build = "4881d864";
   src = fetchurl {
     url = "https://cdn.volanta.app/software/volanta-app/${version}-${build}/volanta-${version}.AppImage";
-    hash = "sha256-ZZqU3+yKI6gdnX6mdrNnY3JS0mkuas7OncHnAiZumBc=";
+    hash = "sha256-Rn/0GQSUbp7sG0EG9LlBLgaBRR+vP+C1TVpGnsi8QpY=";
   };
   appImageContents = appimageTools.extract { inherit pname version src; };
 in

pkgs/by-name/vt/vte/package.nix

@@ -39,7 +39,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vte";
-  version = "0.82.1";
+  version = "0.82.2";
 
   outputs = [
     "out"
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
-    hash = "sha256-eTdtcEAtJx4tOEJEGOGupyNXk00nLjIeOQa3Fwanjjo=";
+    hash = "sha256-4Slar8RoKztVDxI13CZ5uqD3FXDY7VQ8ABwSg9UwvpE=";
   };
 
   patches = [
@@ -62,23 +62,12 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
     })
 
-    # Skip test depending on gdk when building without gtk3 and gtk4
-    (fetchpatch {
-      url = "https://github.com/GNOME/vte/commit/f946e5bacf97305453d731c507885c52d4c34171.patch";
-      hash = "sha256-axi16Fpt4d32akFYeAR+SuUIwzRhjhK2oHp/yAXVRgk=";
-    })
     # https://gitlab.gnome.org/GNOME/vte/-/merge_requests/11
     (fetchpatch {
       url = "https://gitlab.gnome.org/GNOME/vte/-/commit/f672ed15a88dd3e25c33aa0a5ef6f6d291a6d5c7.patch";
       hash = "sha256-JdLDild5j7marvR5n2heW9YD00+bwzJIoxDlzO5r/6w=";
     })
 
-    # Add option to not build the vte application
-    (fetchpatch {
-      url = "https://github.com/GNOME/vte/commit/6b7a6a7df9df99368b7ce5ac5903bd2578167567.patch";
-      hash = "sha256-s3HigfTZLtGmsZS6dfD3YE95ZdBjB4WOWDvuoatOu3o=";
-    })
-
     (fetchpatch {
       name = "qemu-backspace.patch";
       url = "https://gitlab.gnome.org/GNOME/vte/-/commit/79d5fea437185e52a740130d5a276b83dfdcd558.patch";

pkgs/by-name/vu/vue-language-server/package.nix

@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vue-language-server";
-  version = "3.1.4";
+  version = "3.1.5";
 
   src = fetchFromGitHub {
     owner = "vuejs";
     repo = "language-tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-E5YnfYDK3TOQ7ViCpCFXtJVWgyG95NhDTBSbUPgTMAg=";
+    hash = "sha256-cizb5nm1udYssh4EcWEWU22sZJP5so+oiYe8yaPqO98=";
   };
 
   pnpmDeps = pnpm.fetchDeps {

pkgs/by-name/y-/y-cruncher/package.nix

@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "y-cruncher";
-  version = "0.8.6.9545";
+  version = "0.8.7.9547";
 
   src = fetchurl {
     url = "https://github.com/Mysticial/y-cruncher/releases/download/v${finalAttrs.version}/y-cruncher.v${finalAttrs.version}-static.tar.xz";
-    hash = "sha256-R57uTP45CXGi3+dcH0eyxR2ewjZKNxIyGHyh6mh7FUk=";
+    hash = "sha256-4i/zRPQnY1INIzHxntYXfzp8eKxb1GLpwGDDgmcYFJA=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/yu/yutto/package.nix

@@ -7,7 +7,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "yutto";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
   pythonRelaxDeps = true;
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
     owner = "yutto-dev";
     repo = "yutto";
     tag = "v${version}";
-    hash = "sha256-A9LM+hdev9/vH4HV2DUhpiA2XqvXYxtSUt2dyUnZwsU=";
+    hash = "sha256-zolH3mf9YQLZLK98hhbHqUdDLRDodS/fChyfZ/xzVew=";
   };
 
   build-system = with python3Packages; [ uv-build ];

pkgs/desktops/pantheon/apps/elementary-monitor/default.nix

@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "elementary-monitor";
-  version = "8.0.0";
+  version = "8.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "monitor";
     tag = finalAttrs.version;
-    hash = "sha256-pFyDC22YzThHPElBt/JjFP1A8hoCw9QoIjS2Re8Se9w=";
+    hash = "sha256-VlyIK7UJEHw7vvc9WEHooPSPl8OQ5ZcBrjtYrI3Qx/w=";
   };
 
   strictDeps = true;
@@ -70,14 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [ "-Dindicator-wingpanel=enabled" ];
 
-  postPatch = ''
-    # Fix build with Vala 0.56.18
-    # https://github.com/elementary/monitor/issues/444
-    for i in $(find src/Resources -type f -name "*.vala"); do
-      substituteInPlace $i --replace-warn "[Compact]" ""
-    done
-  '';
-
   passthru = {
     updateScript = nix-update-script { };
   };

pkgs/development/compilers/flutter/flutter.nix

@@ -201,6 +201,9 @@ let
       '';
       homepage = "https://flutter.dev";
       license = lib.licenses.bsd3;
+      sourceProvenance =
+        with lib.sourceTypes;
+        if useNixpkgsEngine then [ fromSource ] else [ binaryNativeCode ];
       platforms = [
         "x86_64-linux"
         "aarch64-linux"

pkgs/development/python-modules/bloodhound-py/default.nix

@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "bloodhound-py";
-  version = "1.8.0";
+  version = "1.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "bloodhound";
-    hash = "sha256-Ne0PH92isdeaTp2JHKvixVMJoydDru0W2IXz2An0CbM=";
+    hash = "sha256-n1+0jv73lrn2FMNhDVUPDJxgUATa2oRO4S5P7/xQyFw=";
   };
 
   nativeBuildInputs = [ setuptools ];

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

@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "dashscope";
-  version = "1.25.1";
+  version = "1.25.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dashscope";
     repo = "dashscope-sdk-python";
     tag = "v${version}";
-    hash = "sha256-nVGRfjIsQ0QRHM/pAYBNpevvu7bibs6DqztisLbOwA0=";
+    hash = "sha256-vjZY88S8zDI9gyHcx8YDfhAnQInQisCDK+IDviKp0Ew=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/llm-grok/default.nix

@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "llm-grok";
-  version = "1.3.0";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Hiepler";
     repo = "llm-grok";
     tag = "v${version}";
-    hash = "sha256-Z/q7A7lidtDPpuD+xnD7+puWxvUZi4ruO7l1AZEu1vU=";
+    hash = "sha256-wJ+RUnZlDruGGrsLVSOJFsgmtLlXKpzc2eYy1y19jwI=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/llm-templates-fabric/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "llm-templates-fabric";
-  version = "0.2";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-templates-fabric";
     tag = version;
-    hash = "sha256-tfkSjeT9WstUsNCtVr3fMzqELFCtfYphqf3xFGvHaV0=";
+    hash = "sha256-zF7YTJavLM+AFxZ2TZWwWGNwLGgQzUXx4WoO6MnTRZE=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/mitmproxy-rs/default.nix

@@ -11,21 +11,21 @@
 
 buildPythonPackage rec {
   pname = "mitmproxy-rs";
-  version = "0.12.7";
+  version = "0.12.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy_rs";
     tag = "v${version}";
-    hash = "sha256-Wd/4XzSMQ3qgacFUlxReQFyonUbTqWKDCk3m+kWhXy0=";
+    hash = "sha256-UKvag65KP58/4lZzbwR1sM90z8TOw/0BY3NTLZ4LKxM=";
   };
 
   buildAndTestSubdir = "mitmproxy-rs";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-Q5EBI5uXJgbI9NMblkTT/GweopnTr/zUG35i+Aoe3QA=";
+    hash = "sha256-P6tVyv38hgf5mdUHdHwGwgrM1/7qf15YnhulBqsN5eg=";
   };
 
   nativeBuildInputs = [

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

@@ -39,29 +39,23 @@
 
 buildPythonPackage rec {
   pname = "mitmproxy";
-  version = "12.2.0";
+  version = "12.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy";
     tag = "v${version}";
-    hash = "sha256-2ldebsgR0xZV4WiCLV7DBUKXZo3oE+M6cmvRbSeCSLQ=";
+    hash = "sha256-z3JJOql4JacXSeo6dRbKOaL+kLlSnpKQkeXzZdzLQJo=";
   };
 
   pythonRelaxDeps = [
-    "bcrypt"
-    "brotli"
-    "cryptography"
-    "flask"
-    "h2"
-    "kaitaistruct"
-    "pyopenssl"
-    "pyperclip"
-    "tornado"
-    "typing-extensions"
-    "urwid"
     "zstandard"
+
+    # requested by maintainer
+    "brotli"
+    # just keep those
+    "typing-extensions"
   ];
 
   build-system = [ setuptools ];
@@ -131,6 +125,9 @@ buildPythonPackage rec {
     "test_errorcheck"
     "test_dns"
     "test_order"
+    # fails in pytest asyncio internals
+    "test_decorator"
+    "test_exception_handler"
   ];
 
   disabledTestPaths = [

pkgs/development/python-modules/qiskit-aer/default.nix

@@ -1,156 +1,87 @@
 {
   lib,
-  pythonOlder,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  # C Inputs
   blas,
-  catch2,
   cmake,
-  cython,
-  fmt,
-  muparserx,
   ninja,
   nlohmann_json,
   spdlog,
-  # Python Inputs
-  cvxpy,
   numpy,
   pybind11,
   scikit-build,
-  # Check Inputs
-  pytestCheckHook,
-  ddt,
-  fixtures,
-  pytest-timeout,
-  qiskit-terra,
-  testtools,
+  qiskit,
+  psutil,
+  scipy,
+  python-dateutil,
 }:
 
 buildPythonPackage rec {
   pname = "qiskit-aer";
-  version = "0.17.1";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.6";
+  version = "0.17.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Qiskit";
     repo = "qiskit-aer";
     tag = version;
-    hash = "sha256-jvapuARJUHgAKFUzGb5MUft01LNefVIXtStJqFnCo90=";
+    hash = "sha256-aVmGoLMnDjV3iB9s4tvcL62zKvH/p70mqeGsxHzi3nc=";
   };
 
+  dontUseCmakeConfigure = true;
+
+  # build fails even if setting DISABLE_CONAN flag
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace "'cmake!=3.17,!=3.17.0'," "" \
-      --replace "'pybind11', min_version='2.6'" "'pybind11'" \
-      --replace "pybind11>=2.6" "pybind11" \
-      --replace "scikit-build>=0.11.0" "scikit-build" \
-      --replace "min_version='0.11.0'" ""
+    sed -i -e '/conan/d' pyproject.toml
   '';
 
   nativeBuildInputs = [
     cmake
     ninja
+  ];
+
+  build-system = [
+    pybind11
     scikit-build
   ];
 
+  dependencies = [
+    scipy
+    numpy
+    psutil
+    python-dateutil
+    qiskit
+  ];
+
   buildInputs = [
     blas
-    catch2
     nlohmann_json
-    fmt
-    muparserx
     spdlog
   ];
 
-  propagatedBuildInputs = [
-    cvxpy
-    cython # generates some cython files at runtime that need to be cython-ized
-    numpy
-    pybind11
-  ];
-
   preBuild = ''
-    export DISABLE_CONAN=1
+    export DISABLE_CONAN=ON
   '';
 
-  dontUseCmakeConfigure = true;
-
-  # *** Testing ***
   pythonImportsCheck = [
-    "qiskit.providers.aer"
-    "qiskit.providers.aer.backends.qasm_simulator"
-    "qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output
+    "qiskit_aer"
+    "qiskit_aer.primitives"
+    "qiskit_aer.noise"
+    "qiskit_aer.library"
+    "qiskit_aer.backends.controller_wrappers"
   ];
 
-  disabledTests = [
-    # these tests don't work with cvxpy >= 1.1.15
-    "test_clifford"
-    "test_approx_random"
-    "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues?
-    "test_initialize_2" # TODO: simulations appear incorrect, off by >10%.
-    "test_pauli_error_2q_gate_from_string_1qonly"
+  doCheck = false;
 
-    # these fail for some builds. Haven't been able to reproduce error locally.
-    "test_kraus_gate_noise"
-    "test_backend_method_clifford_circuits_and_kraus_noise"
-    "test_backend_method_nonclifford_circuit_and_kraus_noise"
-    "test_kraus_noise_fusion"
-
-    # Slow tests
-    "test_paulis_1_and_2_qubits"
-    "test_3d_oscillator"
-    "_057"
-    "_136"
-    "_137"
-    "_139"
-    "_138"
-    "_140"
-    "_141"
-    "_143"
-    "_144"
-    "test_sparse_output_probabilities"
-    "test_reset_2_qubit"
-
-    # Fails with 0.10.4
-    "test_extended_stabilizer_sparse_output_probs"
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    ddt
-    fixtures
-    pytest-timeout
-    qiskit-terra
-    testtools
-  ];
-
-  pytestFlags = [
-    "--timeout=30"
-    "--durations=10"
-  ];
-
-  preCheck = ''
-    # Tests include a compiled "circuit" which is auto-built in $HOME
-    export HOME=$(mktemp -d)
-    # move tests b/c by default try to find (missing) cython-ized code in /build/source dir
-    cp -r $TMP/$sourceRoot/test $HOME
-
-    # Add qiskit-aer compiled files to cython include search
-    pushd $HOME
-  '';
-
-  postCheck = "popd";
-
-  meta = with lib; {
-    broken = true;
+  meta = {
     description = "High performance simulators for Qiskit";
-    homepage = "https://qiskit.org/aer";
+    # broken on darwin for unknown reasons
+    broken = stdenv.isDarwin;
+    homepage = "https://qiskit.github.io/qiskit-aer/";
     downloadPage = "https://github.com/QISKit/qiskit-aer/releases";
-    changelog = "https://qiskit.org/documentation/release_notes.html";
-    license = licenses.asl20;
+    changelog = "https://qiskit.github.io/qiskit-aer/release_notes.html";
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 }

pkgs/development/python-modules/qiskit-finance/default.nix

@@ -12,7 +12,7 @@
   numpy,
   pandas,
   psutil,
-  qiskit-terra,
+  qiskit,
   qiskit-optimization,
   scikit-learn,
   scipy,
@@ -50,7 +50,7 @@ buildPythonPackage rec {
     numpy
     pandas
     psutil
-    qiskit-terra
+    qiskit
     qiskit-optimization
     quandl
     scikit-learn
@@ -78,6 +78,8 @@ buildPythonPackage rec {
   pytestFlags = [ "--durations=10" ];
 
   meta = with lib; {
+    # broken because it depends on qiskit-algorithms which is not yet packaged in nixpkgs
+    broken = true;
     description = "Software for developing quantum computing programs";
     homepage = "https://qiskit.org";
     downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";

pkgs/development/python-modules/qiskit-ibmq-provider/default.nix

@@ -1,109 +0,0 @@
-{
-  lib,
-  pythonOlder,
-  buildPythonPackage,
-  fetchFromGitHub,
-  arrow,
-  nest-asyncio,
-  qiskit-terra,
-  requests,
-  requests-ntlm,
-  websocket-client,
-  # Visualization inputs
-  withVisualization ? true,
-  ipython,
-  ipyvuetify,
-  ipywidgets,
-  matplotlib,
-  plotly,
-  pyperclip,
-  seaborn,
-  # check inputs
-  pytestCheckHook,
-  nbconvert,
-  nbformat,
-  pproxy,
-  qiskit-aer,
-  websockets,
-  vcrpy,
-}:
-
-let
-  visualizationPackages = [
-    ipython
-    ipyvuetify
-    ipywidgets
-    matplotlib
-    plotly
-    pyperclip
-    seaborn
-  ];
-in
-buildPythonPackage rec {
-  pname = "qiskit-ibmq-provider";
-  version = "0.20.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
-
-  src = fetchFromGitHub {
-    owner = "Qiskit";
-    repo = pname;
-    rev = "refs/tags/${version}";
-    hash = "sha256-7dIspeJpukLDfICoBPPZZWdzkVumtvh+NRxvtmnvWH0=";
-  };
-
-  propagatedBuildInputs = [
-    arrow
-    nest-asyncio
-    qiskit-terra
-    requests
-    requests-ntlm
-    websocket-client
-    websockets
-  ]
-  ++ lib.optionals withVisualization visualizationPackages;
-
-  postPatch = ''
-    substituteInPlace setup.py --replace "websocket-client>=1.0.1" "websocket-client"
-  '';
-
-  # Most tests require credentials to run on IBMQ
-  nativeCheckInputs = [
-    pytestCheckHook
-    nbconvert
-    nbformat
-    pproxy
-    qiskit-aer
-    vcrpy
-  ]
-  ++ lib.optionals (!withVisualization) visualizationPackages;
-
-  pythonImportsCheck = [ "qiskit.providers.ibmq" ];
-  disabledTests = [
-    "test_coder_operators" # fails for some reason on nixos-21.05+
-    # These disabled tests require internet connection, aren't skipped elsewhere
-    "test_old_api_url"
-    "test_non_auth_url"
-    "test_non_auth_url_with_hub"
-    "test_coder_optimizers" # TODO: reenable when package scikit-quant is packaged, either in NUR or nixpkgs
-
-    # slow tests
-    "test_websocket_retry_failure"
-    "test_invalid_url"
-  ];
-
-  # Skip tests that rely on internet access (mostly to IBM Quantum Experience cloud).
-  # Options defined in qiskit.terra.test.testing_options.py::get_test_options
-  preCheck = ''
-    export QISKIT_TESTS=skip_online
-  '';
-
-  meta = with lib; {
-    description = "Qiskit provider for accessing the quantum devices and simulators at IBMQ";
-    homepage = "https://github.com/Qiskit/qiskit-ibmq-provider";
-    changelog = "https://qiskit.org/documentation/release_notes.html";
-    license = licenses.asl20;
-    maintainers = [ ];
-  };
-}

pkgs/development/python-modules/qiskit-ignis/default.nix

@@ -1,76 +0,0 @@
-{
-  lib,
-  stdenv,
-  pythonOlder,
-  buildPythonPackage,
-  fetchFromGitHub,
-  numpy,
-  qiskit-terra,
-  scikit-learn,
-  scipy,
-  # Optional package inputs
-  withVisualization ? false,
-  matplotlib,
-  withCvx ? false,
-  cvxpy,
-  withJit ? false,
-  numba,
-  # Check Inputs
-  pytestCheckHook,
-  ddt,
-  pyfakefs,
-  qiskit-aer,
-}:
-
-buildPythonPackage rec {
-  pname = "qiskit-ignis";
-  version = "0.7.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
-
-  # Pypi's tarball doesn't contain tests
-  src = fetchFromGitHub {
-    owner = "Qiskit";
-    repo = "qiskit-ignis";
-    rev = "refs/tags/${version}";
-    hash = "sha256-WyLNtZhtuGzqCJdOBvtBjZZiGFQihpeSjJQtP7lI248=";
-  };
-
-  propagatedBuildInputs = [
-    numpy
-    qiskit-terra
-    scikit-learn
-    scipy
-  ]
-  ++ lib.optionals withCvx [ cvxpy ]
-  ++ lib.optionals withVisualization [ matplotlib ]
-  ++ lib.optionals withJit [ numba ];
-
-  # Tests
-  pythonImportsCheck = [ "qiskit.ignis" ];
-  preCheck = ''
-    export HOME=$TMPDIR
-  '';
-  nativeCheckInputs = [
-    pytestCheckHook
-    ddt
-    pyfakefs
-    qiskit-aer
-  ];
-  disabledTests = [
-    "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-    "test_fitters" # Fails check that arrays are close. Might be due to aarch64 math issues.
-  ];
-
-  meta = with lib; {
-    description = "Qiskit tools for quantum hardware verification, noise characterization, and error correction";
-    homepage = "https://qiskit.org/ignis";
-    downloadPage = "https://github.com/QISKit/qiskit-ignis/releases";
-    changelog = "https://qiskit.org/documentation/release_notes.html";
-    license = licenses.asl20;
-    maintainers = [ ];
-  };
-}

pkgs/development/python-modules/qiskit-machine-learning/default.nix

@@ -11,7 +11,7 @@
   fastdtw,
   numpy,
   psutil,
-  qiskit-terra,
+  qiskit,
   scikit-learn,
   sparse,
   torch,
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     numpy
     psutil
     torch
-    qiskit-terra
+    qiskit
     scikit-learn
     sparse
   ];
@@ -84,6 +84,7 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    broken = true; # incompatible with qiskit >= 2.0 (see https://github.com/Qiskit/qiskit-machine-learning/issues/934)
     description = "Software for developing quantum computing programs";
     homepage = "https://qiskit.org";
     downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";

pkgs/development/python-modules/qiskit-nature/default.nix

@@ -11,7 +11,7 @@
   h5py,
   numpy,
   psutil,
-  qiskit-terra,
+  qiskit,
   rustworkx,
   scikit-learn,
   scipy,
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     h5py
     numpy
     psutil
-    qiskit-terra
+    qiskit
     rustworkx
     scikit-learn
     scipy
@@ -67,6 +67,8 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    # broken because it depends on qiskit-algorithms which is not yet packaged in nixpkgs
+    broken = true;
     description = "Software for developing quantum computing programs";
     homepage = "https://qiskit.org";
     downloadPage = "https://github.com/QISKit/qiskit-nature/releases";

pkgs/development/python-modules/qiskit-optimization/default.nix

@@ -12,7 +12,7 @@
   docplex,
   networkx,
   numpy,
-  qiskit-terra,
+  qiskit,
   scipy,
   # Check Inputs
   pytestCheckHook,
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     decorator
     networkx
     numpy
-    qiskit-terra
+    qiskit
     scipy
   ];
 
@@ -61,6 +61,8 @@ buildPythonPackage rec {
   pytestFlags = [ "--durations=10" ];
 
   meta = with lib; {
+    # broken because it depends on qiskit-algorithms which is not yet packaged in nixpkgs
+    broken = true;
     description = "Software for developing quantum computing programs";
     homepage = "https://qiskit.org";
     downloadPage = "https://github.com/QISKit/qiskit-optimization/releases";

pkgs/development/python-modules/qiskit-terra/default.nix

@@ -1,223 +0,0 @@
-{
-  stdenv,
-  lib,
-  pythonAtLeast,
-  pythonOlder,
-  buildPythonPackage,
-  fetchFromGitHub,
-  cargo,
-  rustPlatform,
-  rustc,
-  libiconv,
-  # Python requirements
-  dill,
-  numpy,
-  networkx,
-  ply,
-  psutil,
-  python-constraint,
-  python-dateutil,
-  rustworkx,
-  scipy,
-  scikit-quant ? null,
-  setuptools-rust,
-  stevedore,
-  symengine,
-  sympy,
-  withVisualization ? false,
-  # Python visualization requirements, optional
-  ipywidgets,
-  matplotlib,
-  pillow,
-  pydot,
-  pygments,
-  pylatexenc,
-  seaborn,
-  # Crosstalk-adaptive layout pass
-  withCrosstalkPass ? false,
-  z3-solver,
-  # test requirements
-  ddt,
-  hypothesis,
-  nbformat,
-  nbconvert,
-  pytestCheckHook,
-  python,
-}:
-
-let
-  visualizationPackages = [
-    ipywidgets
-    matplotlib
-    pillow
-    pydot
-    pygments
-    pylatexenc
-    seaborn
-  ];
-  crosstalkPackages = [ z3-solver ];
-in
-
-buildPythonPackage rec {
-  pname = "qiskit-terra";
-  version = "0.25.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7" || pythonAtLeast "3.11";
-
-  src = fetchFromGitHub {
-    owner = "qiskit";
-    repo = pname;
-    rev = "refs/tags/${version}";
-    hash = "sha256-4/LVKDNxKsRztCtU/mMfKMVHHJqfadZXmxeOlnlz9Tc=";
-  };
-
-  nativeBuildInputs = [
-    setuptools-rust
-    rustc
-    cargo
-    rustPlatform.cargoSetupHook
-  ];
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    hash = "sha256-nTYrNH3h1kAwwPx7OMw6eI61vYy8iFhm4eWDTGhWxt4=";
-  };
-
-  propagatedBuildInputs = [
-    dill
-    numpy
-    networkx
-    ply
-    psutil
-    python-constraint
-    python-dateutil
-    rustworkx
-    scipy
-    scikit-quant
-    stevedore
-    symengine
-    sympy
-  ]
-  ++ lib.optionals withVisualization visualizationPackages
-  ++ lib.optionals withCrosstalkPass crosstalkPackages;
-
-  # *** Tests ***
-  nativeCheckInputs = [
-    pytestCheckHook
-    ddt
-    hypothesis
-    nbformat
-    nbconvert
-  ]
-  ++ lib.optionals (!withVisualization) visualizationPackages;
-
-  pythonImportsCheck = [
-    "qiskit"
-    "qiskit.pulse"
-  ];
-
-  disabledTestPaths = [
-    "test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency
-    # These tests are nondeterministic and can randomly fail.
-    # We ignore them here for deterministic building.
-    "test/randomized/"
-    # These tests consistently fail on GitHub Actions build
-    "test/python/quantum_info/operators/test_random.py"
-    # Too many floating point arithmetic errors
-    "test/visual/mpl/circuit/test_circuit_matplotlib_drawer.py"
-  ];
-  pytestFlags = [ "--durations=10" ];
-  disabledTests = [
-    "TestUnitarySynthesisPlugin" # use unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure
-    # matplotlib tests seems to fail non-deterministically
-    "TestMatplotlibDrawer"
-    "TestGraphMatplotlibDrawer"
-    "test_copy" # assertNotIn doesn't seem to work as expected w/ pytest vs unittest
-
-    "test_bound_pass_manager" # AssertionError: 0 != 2
-    "test_complex_parameter_bound_to_real" # qiskit.circuit.exceptions.CircuitError: "Invalid param type <class 'complex'> for gate rx."
-    "test_expressions_of_parameter_with_constant" # Floating point arithmetic error
-    "test_handle_measurement" # AssertionError: The two circuits are not equal
-
-    # Flaky tests
-    "test_pulse_limits" # Fails on GitHub Actions, probably due to minor floating point arithmetic error.
-    "test_cx_equivalence" # Fails due to flaky test
-    "test_two_qubit_synthesis_not_pulse_optimal" # test of random circuit, seems to randomly fail depending on seed
-    "test_qv_natural" # fails due to sign error. Not sure why
-  ]
-  ++ lib.optionals (lib.versionAtLeast matplotlib.version "3.4.0") [ "test_plot_circuit_layout" ]
-  # Disabling slow tests for build constraints
-  ++ [
-    "test_all_examples"
-    "test_controlled_random_unitary"
-    "test_controlled_standard_gates_1"
-    "test_jupyter_jobs_pbars"
-    "test_lookahead_swap_higher_depth_width_is_better"
-    "test_move_measurements"
-    "test_job_monitor"
-    "test_wait_for_final_state"
-    "test_multi_controlled_y_rotation_matrix_basic_mode"
-    "test_two_qubit_weyl_decomposition_abc"
-    "test_isometry"
-    "test_parallel"
-    "test_random_state"
-    "test_random_clifford_valid"
-    "test_to_matrix"
-    "test_block_collection_reduces_1q_gate"
-    "test_multi_controlled_rotation_gate_matrices"
-    "test_block_collection_runs_for_non_cx_bases"
-    "test_with_two_qubit_reduction"
-    "test_basic_aer_qasm"
-    "test_hhl"
-    "test_H2_hamiltonian"
-    "test_max_evals_grouped_2"
-    "test_qaoa_qc_mixer_4"
-    "test_abelian_grouper_random_2"
-    "test_pauli_two_design"
-    "test_shor_factoring"
-    "test_sample_counts_memory_ghz"
-    "test_two_qubit_weyl_decomposition_ab0"
-    "test_sample_counts_memory_superposition"
-    "test_piecewise_polynomial_function"
-    "test_piecewise_chebyshev_mutability"
-    "test_bit_conditional_no_cregbundle"
-    "test_gradient_wrapper2"
-    "test_two_qubit_weyl_decomposition_abmb"
-    "test_two_qubit_weyl_decomposition_abb"
-    "test_vqe_qasm"
-    "test_dag_from_networkx"
-    "test_defaults_to_dict_46"
-  ];
-
-  # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding
-  # cythonized modules and expecting to find some resource files in the test directory.
-  preCheck = ''
-    export PACKAGEDIR=$out/${python.sitePackages}
-    echo "Moving Qiskit test files to package directory"
-    cp -r $TMP/$sourceRoot/test $PACKAGEDIR
-    cp -r $TMP/$sourceRoot/examples $PACKAGEDIR
-
-    # run pytest from Nix's $out path
-    pushd $PACKAGEDIR
-  '';
-  postCheck = ''
-    rm -r test
-    rm -r examples
-    popd
-  '';
-
-  meta = with lib; {
-    description = "Provides the foundations for Qiskit";
-    longDescription = ''
-      Allows the user to write quantum circuits easily, and takes care of the constraints of real hardware.
-    '';
-    homepage = "https://qiskit.org/terra";
-    downloadPage = "https://github.com/QISKit/qiskit-terra/releases";
-    changelog = "https://qiskit.org/documentation/release_notes.html";
-    license = licenses.asl20;
-    maintainers = [ ];
-  };
-}

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

@@ -1,76 +1,111 @@
 {
+  stdenv,
   lib,
   pythonOlder,
   buildPythonPackage,
   fetchFromGitHub,
+  cargo,
+  rustPlatform,
+  rustc,
+  libiconv,
 
-  # build-system
+  dill,
+  matplotlib,
+  numpy,
+  pillow,
+  pydot,
+  pylatexenc,
+  python-constraint,
+  rustworkx,
+  scipy,
+  seaborn,
   setuptools,
-
-  # Python Inputs
-  qiskit-aer,
-  qiskit-ibmq-provider,
-  qiskit-ignis,
-  qiskit-terra,
-  # Optional inputs
-  withOptionalPackages ? true,
-  qiskit-finance,
-  qiskit-machine-learning,
-  qiskit-nature,
-  qiskit-optimization,
-  # Check Inputs
-  pytestCheckHook,
+  setuptools-rust,
+  stevedore,
+  symengine,
+  sympy,
+  typing-extensions,
+  z3-solver,
 }:
 
-let
-  optionalQiskitPackages = [
-    qiskit-finance
-    qiskit-machine-learning
-    qiskit-nature
-    qiskit-optimization
-  ];
-in
 buildPythonPackage rec {
   pname = "qiskit";
-  # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
-  version = "2.1.1";
+  version = "2.2.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "Qiskit";
     repo = "qiskit";
     tag = version;
-    hash = "sha256-WHfsl/T4lmnvkGY7gF5PStilGq3G66TZG9oB1tKwuOQ=";
+    hash = "sha256-4FniNQghcbWHYkjIhaUXL6QqqIS6dA4LjgOCk9znFOM=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  nativeBuildInputs = [
+    cargo
+    rustc
+    rustPlatform.cargoSetupHook
+  ];
 
-  propagatedBuildInputs = [
-    qiskit-aer
-    qiskit-ibmq-provider
-    qiskit-ignis
-    qiskit-terra
-  ]
-  ++ lib.optionals withOptionalPackages optionalQiskitPackages;
+  build-system = [
+    setuptools
+    setuptools-rust
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src pname version;
+    hash = "sha256-61DPuefMnTlYJCCO7YQw6+mfMM20xlS/nY0DI6beo4s=";
+  };
+
+  dependencies = [
+    dill
+    numpy
+    rustworkx
+    scipy
+    stevedore
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    visualization = [
+      matplotlib
+      pillow
+      pydot
+      pylatexenc
+      seaborn
+      sympy
+    ];
+    crosstalk-pass = [
+      z3-solver
+    ];
+    csp-layout-pass = [
+      python-constraint
+    ];
+    qpy-compat = [
+      symengine
+      sympy
+    ];
+  };
 
   pythonImportsCheck = [
     "qiskit"
     "qiskit.circuit"
-    "qiskit.ignis"
-    "qiskit.providers.aer"
-    "qiskit.providers.ibmq"
+    "qiskit.providers.basic_provider"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Software for developing quantum computing programs";
-    homepage = "https://qiskit.org";
+    longDescription = ''
+      Open-source SDK for working with quantum computers at the level of
+      extended quantum circuits, operators, and primitives.
+    '';
+    homepage = "https://www.ibm.com/quantum/qiskit";
     downloadPage = "https://github.com/QISKit/qiskit/releases";
-    changelog = "https://qiskit.org/documentation/release_notes.html";
-    license = licenses.asl20;
+    changelog = "https://docs.quantum.ibm.com/api/qiskit/release-notes";
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 }

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

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "selectolax";
-  version = "0.4.3";
+  version = "0.4.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rushter";
     repo = "selectolax";
     tag = "v${version}";
-    hash = "sha256-1xoHMQzoO0NYi5gJsV++Ngvkaf/O3U14nYkJLvzzbrQ=";
+    hash = "sha256-Et4v105XW06uvzzwic2tBft8ljDurTWIiuKPjCXJbx8=";
   };
 
   patches = [
@@ -36,7 +36,16 @@ buildPythonPackage rec {
 
   buildInputs = [
     modest
-    lexbor
+    (lexbor.overrideAttrs (finalAttrs: {
+      version = "0-unstable-2025-11-24";
+      src = fetchFromGitHub {
+        owner = "lexbor";
+        repo = "lexbor";
+        rev = "7d726f1bed2f489e79751496c584304e6859ee1b";
+        hash = "sha256-vLP/YJWu1Z2kiT0sFLcMPjzMJHJe457oyPTIsxafTfc=";
+      };
+      meta.changelog = "https://github.com/lexbor/lexbor/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    }))
   ];
 
   nativeCheckInputs = [

pkgs/development/python-modules/sphinx-click/default.nix

@@ -4,8 +4,8 @@
   fetchPypi,
   sphinxHook,
   # Build system
-  pbr,
   setuptools,
+  setuptools-scm,
   # Dependencies
   click,
   docutils,
@@ -17,14 +17,22 @@
 
 buildPythonPackage rec {
   pname = "sphinx-click";
-  version = "6.0.0";
+  version = "6.1.0";
   pyproject = true;
 
   build-system = [
-    pbr
     setuptools
+    setuptools-scm
   ];
 
+  postPatch = ''
+    # Would require reno which would require the .git directory to stay around
+    substituteInPlace docs/changelog.rst \
+      --replace-fail '.. release-notes::' 'Check https://sphinx-click.readthedocs.io/en/latest/changelog/ for the Release Notes.'
+    substituteInPlace docs/conf.py \
+      --replace-fail "'reno.sphinxext'" ""
+  '';
+
   nativeBuildInputs = [
     sphinxHook
   ];
@@ -47,7 +55,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "sphinx_click";
-    hash = "sha256-9dZkMh3AxmIv8Bnx4chOWM4M7P3etRDgBM9gwqOrRls=";
+    hash = "sha256-xwLgdRwaC2rWSeT3+uvQ3AmjzHyjtQ+Vlpg4N3L1Du8=";
   };
 
   meta = {

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

@@ -7,7 +7,6 @@
   pygobject3,
   pyserial,
   pytestCheckHook,
-  pythonOlder,
   pyzmq,
   setuptools,
   setuptools-scm,
@@ -20,16 +19,14 @@
 
 buildPythonPackage rec {
   pname = "urwid";
-  version = "3.0.2";
+  version = "3.0.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "urwid";
     repo = "urwid";
     tag = version;
-    hash = "sha256-pMGNybuJZeCzZRZr0/+N87/z+ZtLmSaWW47MWDirTjQ=";
+    hash = "sha256-+bvtIjSKWhu1JzyIgM60YZtrzNEaAvVqJrhq8PnkXk0=";
   };
 
   postPatch = ''

pkgs/development/tools/pnpm/default.nix

@@ -15,8 +15,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.23.0";
-      hash = "sha256-oc3XtGg4ap14oIHaBdYEnX5ZjbYqKZ25LfIacGKksYM=";
+      version = "10.24.0";
+      hash = "sha256-GW9L0XTry9mXhrM0UvFEyy3DLvTnE47URJHp1D1wLXU=";
     };
   };
 

pkgs/development/web/nodejs/v20.nix

@@ -34,8 +34,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "20.19.5";
-  sha256 = "230c899f4e2489c4b8d2232edd6cc02f384fb2397c2a246a22e415837ee5da51";
+  version = "20.19.6";
+  sha256 = "2026f9ff52c286d7c7d99932b21be313d1736aea524c5aff1748d41ab0bd9a20";
   patches = [
     ./configure-emulator.patch
     ./configure-armv6-vfpv2.patch

pkgs/kde/gear/kdeconnect-kde/default.nix

@@ -10,6 +10,7 @@
   wayland,
   wayland-protocols,
   libfakekey,
+  fetchpatch,
 }:
 mkKdeDerivation {
   pname = "kdeconnect-kde";
@@ -18,6 +19,12 @@ mkKdeDerivation {
     (replaceVars ./hardcode-sshfs-path.patch {
       sshfs = lib.getExe sshfs;
     })
+    # Fix CVE-2025-66270 (https://kde.org/info/security/advisory-20251128-1.txt)
+    (fetchpatch {
+      name = "CVE-2025-66270.patch";
+      url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/4e53bcdd5d4c28bd9fefd114b807ce35d7b3373e.patch";
+      hash = "sha256-qtcXNJ5qL4xtZQ70R/wWVCzFGzXNltr6XTgs0fpkTi4=";
+    })
   ];
 
   # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically

pkgs/os-specific/windows/mcfgthreads/default.nix

@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mcfgthread";
-  version = "2.1.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "lhmouse";
     repo = "mcfgthread";
     tag = "v${lib.versions.majorMinor finalAttrs.version}-ga.${lib.versions.patch finalAttrs.version}";
-    hash = "sha256-kEqS1+2CB/Ryor2WbI67KALnlTcD9oSFEdC6Av73roE=";
+    hash = "sha256-KI/FweYPKe6mxK+oktIqRN9dltGg7jSgWsoIwDg7xEE=";
   };
 
   postPatch = ''

pkgs/top-level/python-aliases.nix

@@ -398,6 +398,9 @@ mapAliases {
   PyVirtualDisplay = throw "'PyVirtualDisplay' has been renamed to/replaced by 'pyvirtualdisplay'"; # Converted to throw 2025-10-29
   pyvoro = throw "pyvoro has been removed because it is unmaintained upstream and has been marked as broken since 2023."; # Added 2025-10-11
   qds_sdk = throw "'qds_sdk' has been renamed to/replaced by 'qds-sdk'"; # Converted to throw 2025-10-29
+  qiskit-ibmq-provider = throw "qiskit-imbq-provider has been removed, since it was deprecated upstream"; # added 2025-09-13
+  qiskit-ignis = throw "qiskit-ignis has been removed, since it was deprecated upstream"; # added 2025-09-13
+  qiskit-terra = throw "qiskit-terra has been removed, since it was deprecated upstream."; # added 2025-09-13
   Quandl = throw "'Quandl' has been renamed to/replaced by 'quandl'"; # Converted to throw 2025-10-29
   querystring_parser = throw "'querystring_parser' has been renamed to/replaced by 'querystring-parser'"; # Converted to throw 2025-10-29
   radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02

pkgs/top-level/python-packages.nix

@@ -15827,18 +15827,12 @@ self: super: with self; {
 
   qiskit-finance = callPackage ../development/python-modules/qiskit-finance { };
 
-  qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { };
-
-  qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { };
-
   qiskit-machine-learning = callPackage ../development/python-modules/qiskit-machine-learning { };
 
   qiskit-nature = callPackage ../development/python-modules/qiskit-nature { };
 
   qiskit-optimization = callPackage ../development/python-modules/qiskit-optimization { };
 
-  qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };
-
   qnap-qsw = callPackage ../development/python-modules/qnap-qsw { };
 
   qnapstats = callPackage ../development/python-modules/qnapstats { };