Merge master into staging-next

.mergify.yml

@@ -1,21 +0,0 @@
-queue_rules:
-  # This rule is for https://docs.mergify.com/commands/queue/
-  # and can be triggered with: @mergifyio queue
-  - name: default
-    merge_conditions:
-      # all github action checks in this list are required to merge a pull request
-      - check-success=Attributes
-      - check-success=Check
-      - check-success=Outpaths (aarch64-darwin)
-      - check-success=Outpaths (aarch64-linux)
-      - check-success=Outpaths (x86_64-darwin)
-      - check-success=Outpaths (x86_64-linux)
-      - check-success=Process
-      - check-success=Request
-      - check-success=editorconfig-check
-      - check-success=label-pr
-      - check-success=nix-files-parseable-check
-      - check-success=nixfmt-check
-      - check-success=nixpkgs-vet
-    # queue up to 5 pull requests at a time
-    batch_size: 5

pkgs/applications/audio/mixxx/default.nix

@@ -65,6 +65,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-dKk3n3KDindnLbON52SW5h4cz96WVi0OPjwA27HqQCI=";
   };
 
+  # Should be removed when bumping to 2.6.x
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-warn "LIBDJINTEROP_VERSION 0.24.3" "LIBDJINTEROP_VERSION 0.26.1"
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config

pkgs/applications/editors/geany/default.nix

@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "geany";
-  version = "2.0";
+  version = "2.1";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://download.geany.org/geany-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-VltM0vAxHB46Fn7HHEoy26ZC4P5VSuW7a4F3t6dMzJI=";
+    hash = "sha256-a5aohERjMAwQuWkqCl7a2CNu7J6ENC9XX4PU/IkzEig=";
   };
 
   patches = [
@@ -46,9 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs = [
+  buildInputs = [ gtk3 ];
-    gtk3
-  ];
 
   preCheck = ''
     patchShebangs --build tests/ctags/runner.sh

pkgs/applications/editors/geany/disable-test-sidebar.patch

@@ -1,10 +1,11 @@
 --- a/tests/Makefile.in	2023-10-19 18:10:06.000000000 +0200
-+++ b/tests/Makefile.in	2023-11-10 00:13:09.816498568 +0100
++++ b/tests/Makefile.in	2025-07-06 18:09:09.816498568 +0100
-@@ -86,7 +86,7 @@
+@@ -86,8 +86,7 @@
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
--check_PROGRAMS = test_utils$(EXEEXT) test_sidebar$(EXEEXT)
+-check_PROGRAMS = test_utils$(EXEEXT) test_sidebar$(EXEEXT) \
+-	test_encodings$(EXEEXT)
 +check_PROGRAMS = test_utils$(EXEEXT)
  subdir = tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

pkgs/applications/editors/vscode/extensions/default.nix

@@ -1094,26 +1094,26 @@ let
             sources = {
               "x86_64-linux" = {
                 arch = "linux-x64";
-                hash = "sha256-1swpgwNLCMWjzDYziXuvvPv8cox2+8ZaYR4fUDoHRkY=";
+                hash = "sha256-mm7/ITiXuSrFrAwRPVYYJ6l5b4ODyiCPv5H+WioDAWY=";
               };
               "x86_64-darwin" = {
                 arch = "darwin-x64";
-                hash = "sha256-uBSd/6Z2689n0vExoeaEwodLjjeBULo/RaGu8cGgvsQ=";
+                hash = "sha256-ySFiSJ+6AgxECzekBIlPl2BhWJvt5Rf1DFqg6b/6PDs=";
               };
               "aarch64-linux" = {
                 arch = "linux-arm64";
-                hash = "sha256-WdSKNC2DjR3n9VVJh5OBasmVq/sIXiWFajhniSwxPuw=";
+                hash = "sha256-zqvhlA9APWtJowCOceB52HsfU3PaAWciZWxY/QcOYgg=";
               };
               "aarch64-darwin" = {
                 arch = "darwin-arm64";
-                hash = "sha256-cwTUoVai9N2v5VmfYIKC+w8jYLcQhHGK5TLqxOBr05Q=";
+                hash = "sha256-CjzAntSjbYlauVptCnqE/HpwdudoGaTMML6Fyzj48pU=";
               };
             };
           in
           {
             name = "continue";
             publisher = "Continue";
-            version = "1.1.11";
+            version = "1.1.49";
           }
           // sources.${stdenv.system};
         nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
@@ -2133,8 +2133,8 @@ let
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.28.2";
+          version = "6.32.2";
-          hash = "sha256-FOm0EWleDT5+xjb0Jif1TPnJrU+Zc1PfhKBvP6dUtBs=";
+          hash = "sha256-ZPfzCje8mAWr0Ntr1MEGvUsvCSi+ocPDVEXiezAI5N8=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";

pkgs/applications/emulators/libretro/cores/beetle-saturn.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-saturn";
-  version = "0-unstable-2025-06-22";
+  version = "0-unstable-2025-07-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-saturn-libretro";
-    rev = "e6c4275f1bc93163a35db30cbd5399c046cf112d";
+    rev = "ccba5265f60f8e64a1984c9d14d383606193ea6a";
-    hash = "sha256-CnjBf/dWkbzwhvsnmYAJFC254mQ7+QkcLu4GavZhg5s=";
+    hash = "sha256-Ixjduv67sPJmf0BH8GaJyyTdpDV/e1UCWCeOb7vLggo=";
   };
 
   makefile = "Makefile";

pkgs/applications/networking/instant-messengers/discord/linux.nix

@@ -54,7 +54,6 @@
   pipewire,
   python3,
   runCommand,
-  libunity,
   speechd-minimal,
   wayland,
   branch,
@@ -142,7 +141,6 @@ stdenv.mkDerivation rec {
       libnotify
       libX11
       libXcomposite
-      libunity
       libuuid
       libXcursor
       libXdamage

pkgs/by-name/ap/apko/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "0.29.1";
+  version = "0.29.2";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PRT29c7WqjkWR4hqzzz8ek5IytsS3ntDlPQ/tzpARCk=";
+    hash = "sha256-szUOl5nKrra7Vvyfcd60/Oy/QFiXZpGJR2gtw3lriKE=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-j7f9cbcbX4PdaRxg5lare6aRz1B5lCfj2RSvs+XOfe4=";
+  vendorHash = "sha256-gN8lAmLJmoGQA0l62d4EPx2w2SbhUwbNYhIcyAamaqU=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -85,7 +85,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     homepage = "https://apko.dev/";
-    changelog = "https://github.com/chainguard-dev/apko/blob/main/NEWS.md";
+    changelog = "https://github.com/chainguard-dev/apko/releases/tag/v${finalAttrs.version}";
     description = "Build OCI images using APK directly without Dockerfile";
     mainProgram = "apko";
     license = lib.licenses.asl20;

pkgs/by-name/br/brave/package.nix

@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.80.113";
+  version = "1.80.115";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-fWNRiLLFfbVsvLaay878PEIAK9rKCbRCHZ/Uv/dBuCM=";
+      hash = "sha256-Fg3zcl9loAypW3ca2ffBxi8+NQ09kdIFIXsEteGsoSs=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-xs9Bywb5ZWj/OINP1HEVxAMWhs2BTJVyU+dBOI+w6f8=";
+      hash = "sha256-Cf7My5mTkiZh5xMTinhmKnHPJWMX5QfijO7bEV6h6rU=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-SWalaT/+TvKvNBaVX9CQbCDMvPUgvJLG5rYhIHtXVkM=";
+      hash = "sha256-eEcRA7W+eUSg5+LXgTvs85VNIx+0ldCGRJCT3I6EgaI=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-YpEAOZZegpAH9UbNCsEAJeLjjAPJYhJcEF5wd/3ewGE=";
+      hash = "sha256-beFYyTS2GbJloYsJQISKDhF/zgXHPBetfJt1t2EzFfE=";
     };
   };
 

pkgs/by-name/fa/famistudio/package.nix

@@ -29,13 +29,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "famistudio";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "BleuBleu";
     repo = "FamiStudio";
     tag = finalAttrs.version;
-    hash = "sha256-QKgKPXb7NgbN37oCrwW9cLn701nsu55EsVXzOOKyc0A=";
+    hash = "sha256-2QDolO0eF5nYmxS376nG41LOJVB0LQOrcC7FeVQknfE=";
   };
 
   postPatch =

pkgs/by-name/fl/flyctl/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.145";
+  version = "0.3.149";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-fMBKuIzycuBMtkaGZPJmfRhYntER+yFzAA6mTCLuhws=";
+    hash = "sha256-9kzyQH5oJr8e0yYgTi7wBmnYRjyeiFffJccuPiAF5JQ=";
   };
 
   vendorHash = "sha256-G+RT2teg1+AoLJRjYKnQtVcGH3sbtrxhklQfGMIod+0=";

pkgs/by-name/gd/gdu/package.nix

@@ -4,34 +4,36 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
-  testers,
+  versionCheckHook,
-  gdu,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gdu";
-  version = "5.30.1";
+  version = "5.31.0";
 
   src = fetchFromGitHub {
     owner = "dundee";
     repo = "gdu";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
-    hash = "sha256-3SymmE3J+lphyRKTQ+sLsnXaBvLyjJRlwpy79U4+t5o=";
+    hash = "sha256-MAkD4Mh7aXWc8Y4TkXH7NSDgPQugB7Gjhr4nfOr/X1U=";
   };
 
   vendorHash = "sha256-aKhHC3sPRyi/l9BxeUgx+3TdYulb0cI9WxuPvbLoswg=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    versionCheckHook
+  ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X=github.com/dundee/gdu/v${lib.versions.major version}/build.Version=${version}"
+    "-X=github.com/dundee/gdu/v${lib.versions.major finalAttrs.version}/build.Version=${finalAttrs.version}"
   ];
 
   postPatch = ''
     substituteInPlace cmd/gdu/app/app_test.go \
-      --replace-fail "development" "${version}"
+      --replace-fail "development" "${finalAttrs.version}"
   '';
 
   postInstall = ''
@@ -43,9 +45,10 @@ buildGoModule rec {
   checkFlags = [
     # https://github.com/dundee/gdu/issues/371
     "-skip=TestStoredAnalyzer"
+    "-skip=TestAnalyzePathWithIgnoring"
   ];
 
-  passthru.tests.version = testers.testVersion { package = gdu; };
+  doInstallCheck = true;
 
   meta = {
     description = "Disk usage analyzer with console interface";
@@ -55,7 +58,7 @@ buildGoModule rec {
       the performance gain is not so huge.
     '';
     homepage = "https://github.com/dundee/gdu";
-    changelog = "https://github.com/dundee/gdu/releases/tag/v${version}";
+    changelog = "https://github.com/dundee/gdu/releases/tag/${finalAttrs.src.tag}";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [
       fab
@@ -63,4 +66,4 @@ buildGoModule rec {
     ];
     mainProgram = "gdu";
   };
-}
+})

pkgs/by-name/hi/hifile/package.nix

@@ -2,8 +2,8 @@
   lib,
   appimageTools,
   fetchurl,
-  version ? "0.9.10.5",
+  version ? "0.9.11.0",
-  hash ? "sha256-SOngYWpkea/G9Uqulv0/l9suzKA6aaDtqcz4UC75Uqo=",
+  hash ? "sha256-I13NEku2oM9HYDhZZI7Sflwhnnjhe1mAr8Cuu9shvms=",
 }:
 
 let

pkgs/by-name/ku/kubectl-ai/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-ai";
-  version = "0.0.14";
+  version = "0.0.15";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubectl-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W3HY47ALhUl79TvLc8MMAZ1ixYnWkNF931dvzL9T8Jg=";
+    hash = "sha256-dQ6ct7f0iAFTFCjaxKvFlCoqm5U45XQrvWNMsz9lBac=";
   };
 
-  vendorHash = "sha256-ixuSGh7HvS2POs2J8sNBObtbiZqegftCAE2JEVBR/Hc=";
+  vendorHash = "sha256-tYBWGbdHB4vsBlFqE7mLmO5n30qxfEXPOG0YqU8sZsY=";
 
   # Build the main command
   subPackages = [ "cmd" ];

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

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   boost,
   cmake,
   ninja,
@@ -10,18 +11,26 @@
   zlib,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   name = "libdjinterop";
 
-  version = "unstable";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "xsco";
     repo = "libdjinterop";
-    rev = "0.24.3";
+    rev = finalAttrs.version;
-    hash = "sha256-Fp7AwEOq2JOpL60GDAXmA15ptFeLoG79nnnPXHl1Hjw=";
+    hash = "sha256-HwNhCemqVR1xNSbcht0AuwTfpRhVi70ZH5ksSTSRFoc=";
   };
 
+  patches = [
+    # https://github.com/xsco/libdjinterop/pull/161
+    (fetchpatch2 {
+      url = "https://github.com/xsco/libdjinterop/commit/94ce315cd5155bd031eeccfec12fbeb8e399dd14.patch";
+      hash = "sha256-WahMsFeetSlHHiIyaC04YxTiXDxD1ooASqoIP2TK9R0=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -46,4 +55,4 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+})

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

@@ -19,14 +19,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsidplayfp";
-  version = "2.14.0";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libsidplayfp";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-q1cUv4gpzL3wfssP7pWtDfDzFO47+kzpGy4GYLzEM50=";
+    hash = "sha256-rK7Il8WE4AJbn7GKn21fXr1o+DDdyOjfJ0saeqcZ5Pg=";
   };
 
   outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];

pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix

@@ -32,16 +32,18 @@ stdenv.mkDerivation {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    python3
+  ];
 
   buildInputs = [
     boostPython
     openssl
-    zlib
-    python3
-    ncurses
   ];
 
+  strictDeps = true;
+
   patches = [
     # provide distutils alternative for python 3.12
     ./distutils.patch
@@ -50,11 +52,11 @@ stdenv.mkDerivation {
   # https://github.com/arvidn/libtorrent/issues/6865
   postPatch = ''
     substituteInPlace cmake/Modules/GeneratePkgConfig/target-compile-settings.cmake.in \
-      --replace 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")' \
+      --replace-fail 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")' \
-                'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")
+                     'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")
-                 set(_INSTALL_FULL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@")'
+                      set(_INSTALL_FULL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@")'
     substituteInPlace cmake/Modules/GeneratePkgConfig/pkg-config.cmake.in \
-      --replace '$'{prefix}/@_INSTALL_LIBDIR@ @_INSTALL_FULL_LIBDIR@
+      --replace-fail '$'{prefix}/@_INSTALL_LIBDIR@ @_INSTALL_FULL_LIBDIR@
   '';
 
   postInstall = ''
@@ -64,7 +66,7 @@ stdenv.mkDerivation {
 
   postFixup = ''
     substituteInPlace "$dev/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-release.cmake" \
-      --replace "\''${_IMPORT_PREFIX}/lib" "$out/lib"
+      --replace-fail "\''${_IMPORT_PREFIX}/lib" "$out/lib"
   '';
 
   outputs = [

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

@@ -8,23 +8,23 @@
 
 let
   hlsJs = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/hls.js@v1.6.2/dist/hls.min.js";
+    url = "https://cdn.jsdelivr.net/npm/hls.js@v1.6.6/dist/hls.min.js";
-    hash = "sha256-5lAT3DQ1tVo0tSV6fmWDWSbB9NVyCduomoENNQX08UM=";
+    hash = "sha256-/h3dYaJYJLB1VfHXjr2sqjCqZ+c+ngKhEYgmZAgsRlE=";
   };
 in
 buildGoModule (finalAttrs: {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.12.3";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = "mediamtx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2eTvRWFSR6sXnUJJPKvzQhSqbg1Unh8QuxmyixAw8Cc=";
+    hash = "sha256-/ngWlUKhvRJEb3JN5yUFVziMPxo/YY8CiN2UBJUglqs=";
   };
 
-  vendorHash = "sha256-CdJS+RebJA6CpOo6YLlTpCXzE0eWSAnWzVXECvgMBvc=";
+  vendorHash = "sha256-LBxE2X1aJPoK/e5Z9Rw9XTjucYOj/bdDUVsPbRDiVOE=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js

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

@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
-  version = "1.0rc-unstable-2025-06-18";
+  version = "1.0rc-unstable-2025-07-07";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "71edf793fcd2726c4212f7915194c60107dc2809";
+    rev = "85dcf65231224f34e25b5007b644d8987e33838c";
-    hash = "sha256-B/qWdt+fWSov54zA+7S25bEVxqQuspo5oT3MyMk4Ato=";
+    hash = "sha256-ZKPsE3+kkv2xlIHB+TBKp2J5GnKU7BA1+O4Y1Rq4low=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/pt/ptyxis/package.nix

@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ptyxis";
-  version = "48.4";
+  version = "48.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "chergert";
     repo = "ptyxis";
     tag = finalAttrs.version;
-    hash = "sha256-Z5tTvKFivLKsRj/Ba9ZzQh/LCts4ngzYdHsRTy/ocXg=";
+    hash = "sha256-qZ2nDX1ivnKYJQSqh29L23ayQ4wV9Ss4XD4JRpK35UU=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/rt/rtorrent/package.nix

@@ -14,6 +14,8 @@
   zlib,
   nixosTests,
   gitUpdater,
+  withLua ? false,
+  lua5_4_compat,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,12 +52,12 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
     openssl
     zlib
-  ];
+  ] ++ lib.optionals withLua [ lua5_4_compat ];
 
   configureFlags = [
     "--with-xmlrpc-tinyxml2"
     "--with-posix-fallocate"
-  ];
+  ] ++ lib.optionals withLua [ "--with-lua" ];
 
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };

pkgs/by-name/sv/svix-server/package.nix

@@ -10,19 +10,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svix-server";
-  version = "1.68.0";
+  version = "1.69.0";
 
   src = fetchFromGitHub {
     owner = "svix";
     repo = "svix-webhooks";
     rev = "v${version}";
-    hash = "sha256-AiMaYSLON4H39dUvRyXQDymE/SQ7gK9JrgXBc1Gn7no=";
+    hash = "sha256-1boqSBDm91cOeHvecYb21MHpzUkSWkG20lPr/HpQSxQ=";
   };
 
   sourceRoot = "${src.name}/server";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-wNaI5/AtStekJslO8wDl1/PzHaEi02xBEO8IvcqbMZM=";
+  cargoHash = "sha256-IJvGDMEI4bmJGsX5mM3xJ5eg/jqCoR/13s6KBrkFH/E=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/ty/ty/package.nix

@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.1-alpha.13";
+  version = "0.0.1-alpha.14";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-w+eYclC9X0T1f/oj8MY4KG72lpAVGpMjjchER167sp0=";
+    hash = "sha256-q99wzor6inHggInT3R1mX7vLVZwoz68h41+mRg1oayk=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-blf+ISQgOFZ99jZIHQec8Bhccb0ajZiNLvl0F1xUi/Y=";
+  cargoHash = "sha256-+MlTidF5g15ojRksfVpJIife+Dd3YTge5aBfrjz6qv8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/development/python-modules/bokeh-sampledata/default.nix

@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "bokeh-sampledata";
-  version = "2024.2";
+  version = "2025.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "bokeh_sampledata";
     inherit version;
-    hash = "sha256-5j2qluedVj7IuE8gZy/+lPkFshRV+rjYPuM05G2jNiQ=";
+    hash = "sha256-a4dK9bh45w8WEzaVrAfhXeOGQvqfrf33I/fUIzOWevQ=";
   };
 
   build-system = [

pkgs/development/python-modules/cdxj-indexer/default.nix

@@ -0,0 +1,57 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  warcio,
+  surt,
+  py3amf,
+  multipart,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "cdxj-indexer";
+  version = "1.4.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "webrecorder";
+    repo = "cdxj-indexer";
+    tag = "v${version}";
+    hash = "sha256-E3b/IfjngyXhWvRYP9CkQGvBFeC8pAm4KxZA9MwOo4s=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    warcio
+    surt
+    py3amf
+    multipart
+  ];
+
+  pythonRemoveDeps = [
+    # Transitive dependency that does not need to be pinned
+    # Proposed fix in <https://github.com/webrecorder/cdxj-indexer/pull/25>
+    "idna"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "cdxj_indexer"
+  ];
+
+  meta = {
+    description = "CDXJ Indexing of WARC/ARCs";
+    homepage = "https://github.com/webrecorder/cdxj-indexer";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ zhaofengli ];
+    mainProgram = "cdxj-indexer";
+  };
+}

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

@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  lxml,
+  unittestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "ezodf";
+  version = "0.3.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "T0ha";
+    repo = "ezodf";
+    tag = version;
+    hash = "sha256-d66CTj9CpCnMICqNdUP07M9elEfoxuPg8x1kxqgXTTE=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    lxml
+  ];
+
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+
+  unittestFlags = [
+    "tests"
+  ];
+
+  pythonImportsCheck = [
+    "ezodf"
+  ];
+
+  meta = {
+    description = "Extract, add, modify, or delete document data in OpenDocument (ODF) files";
+    homepage = "https://github.com/T0ha/ezodf";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zhaofengli ];
+  };
+}

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

@@ -0,0 +1,215 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  attrs,
+  chardet,
+  humanize,
+  isodate,
+  jinja2,
+  jsonschema,
+  marko,
+  petl,
+  pydantic,
+  python-dateutil,
+  python-slugify,
+  pyyaml,
+  requests,
+  rfc3986,
+  simpleeval,
+  tabulate,
+  typer,
+  typing-extensions,
+  validators,
+
+  # Optional formats
+  boto3,
+  google-api-python-client,
+  datasette,
+  duckdb,
+  duckdb-engine,
+  sqlalchemy,
+  pygithub,
+  pyquery,
+  ijson,
+  jsonlines,
+  pymysql,
+  ezodf,
+  lxml,
+  pandas,
+  pyarrow,
+  fastparquet,
+  psycopg,
+  psycopg2,
+  visidata,
+  tatsu,
+
+  # Tests
+  pytestCheckHook,
+  pytest-cov,
+  pytest-dotenv,
+  pytest-lazy-fixtures,
+  pytest-mock,
+  pytest-timeout,
+  pytest-vcr,
+  moto,
+  requests-mock,
+
+  # Tests depending on excel
+  openpyxl,
+  xlrd,
+}:
+
+buildPythonPackage rec {
+  pname = "frictionless";
+  version = "5.18.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "frictionlessdata";
+    repo = "frictionless-py";
+    tag = "v${version}";
+    hash = "sha256-svspEHcEw994pEjnuzWf0FFaYeFZuqriK96yFAB6/gI=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    attrs
+    chardet
+    humanize
+    isodate
+    jinja2
+    jsonschema
+    marko
+    petl
+    pydantic
+    python-dateutil
+    python-slugify
+    pyyaml
+    requests
+    rfc3986
+    simpleeval
+    tabulate
+    typer
+    typing-extensions
+    validators
+  ];
+
+  optional-dependencies = {
+    # The commented-out formats require dependencies that have not been packaged
+    # They are intentionally left in for reference - Please do not remove them
+    aws = [
+      boto3
+    ];
+    bigquery = [
+      google-api-python-client
+    ];
+    #ckan = [
+    #  frictionless-ckan-mapper # not packaged
+    #];
+    datasette = [
+      datasette
+    ];
+    duckdb = [
+      duckdb
+      duckdb-engine
+      sqlalchemy
+    ];
+    #excel = [
+    #  openpyxl
+    #  tableschema-to-template # not packaged
+    #  xlrd
+    #  xlwt
+    #];
+    github = [
+      pygithub
+    ];
+    #gsheets = [
+    #  pygsheets # not packaged
+    #];
+    html = [
+      pyquery
+    ];
+    json = [
+      ijson
+      jsonlines
+    ];
+    mysql = [
+      pymysql
+      sqlalchemy
+    ];
+    ods = [
+      ezodf
+      lxml
+    ];
+    pandas = [
+      pandas
+      pyarrow
+    ];
+    parquet = [
+      fastparquet
+    ];
+    postgresql = [
+      psycopg
+      psycopg2
+      sqlalchemy
+    ];
+    #spss = [
+    #  savreaderwriter # not packaged
+    #];
+    sql = [
+      sqlalchemy
+    ];
+    visidata = [
+      # Not ideal: This is actually outside pythonPackages set and depends on whatever
+      # Python version the top-level python3Packages set refers to
+      visidata
+    ];
+    wkt = [
+      tatsu
+    ];
+    #zenodo = [
+    #  pyzenodo3 # not packaged
+    #];
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov
+    pytest-dotenv
+    pytest-lazy-fixtures
+    pytest-mock
+    pytest-timeout
+    pytest-vcr
+    moto
+    requests-mock
+
+    # We do not have all packages for the `excel` format to fully function,
+    # but it's required for some of the tests.
+    openpyxl
+    xlrd
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  disabledTestPaths = [
+    # Requires optional dependencies that have not been packaged (commented out above)
+    # The tests of other unavailable formats are auto-skipped
+    "frictionless/formats/excel"
+    "frictionless/formats/spss"
+  ];
+
+  pythonImportsCheck = [
+    "frictionless"
+  ];
+
+  meta = {
+    description = "Data management framework for Python that provides functionality to describe, extract, validate, and transform tabular data";
+    homepage = "https://github.com/frictionlessdata/frictionless-py";
+    changelog = "https://github.com/frictionlessdata/frictionless-py/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zhaofengli ];
+  };
+}

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

@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "llm-ollama";
-  version = "0.11.0";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "taketwo";
     repo = "llm-ollama";
     tag = version;
-    hash = "sha256-iwrDqrPt/zwXypBwD7zDAcen4fQq6PXl7Xj5VUL2KWA=";
+    hash = "sha256-+4YslGYY8AVwHnj1ahFqtclnaywPVJ0pt2CL9NewuUE=";
   };
 
   build-system = [ setuptools ];

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

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250627";
+  version = "1.0.2.20250707";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AwLhjTojOEML4vU/xmv99M3TjtYXJAX1AcjCZuu58Ds=";
+    hash = "sha256-oA2VDeMEI7GzRiFPNUi7Q/lf5ZGyd0WT5Uaz1rc3Xs8=";
   };
 
   build-system = [ setuptools ];

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

@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  setuptools,
+  fetchFromGitHub,
+  defusedxml,
+}:
+
+buildPythonPackage rec {
+  pname = "py3amf";
+  version = "0.8.11";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "StdCarrot";
+    repo = "Py3AMF";
+    tag = "v${version}";
+    hash = "sha256-9zuHh5+ggIjv1LcjpBNHy2yh09KsFpxUdGrtKGm94Zg=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    defusedxml
+  ];
+
+  pythonImportsCheck = [
+    "pyamf"
+  ];
+
+  meta = {
+    description = "Action Message Format (AMF) support for Python 3";
+    homepage = "https://github.com/StdCarrot/Py3AMF";
+    changelog = "https://github.com/StdCarrot/Py3AMF/blob/${src.rev}/CHANGES.txt";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zhaofengli ];
+  };
+}

pkgs/development/python-modules/tencentcloud-sdk-python/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1417";
+  version = "3.0.1418";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-B/qY903tbNJvzrlpDqpnUUVOFWFPkZOQHedpng86kVg=";
+    hash = "sha256-5Od11muwnm0yb+3NmRyAUc4zX9PZcnHscWsljwEFiwE=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/unstructured-client/default.nix

@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "unstructured-client";
-  version = "0.36.0";
+  version = "0.38.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-python-client";
     tag = "v${version}";
-    hash = "sha256-WEltF3puitytIFN/CxG6TCpWGxs8dubCqvU7byba1Yg=";
+    hash = "sha256-gzNPzS//7MU6nX3cA0p6dPqIG273VlGMU0ePyObn4d4=";
   };
 
   preBuild = ''

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

@@ -0,0 +1,82 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchpatch,
+  setuptools,
+  boilerpy3,
+  cdxj-indexer,
+  frictionless,
+  pytest-cov,
+  pyyaml,
+  shortuuid,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "wacz";
+  version = "0.5.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "webrecorder";
+    repo = "py-wacz";
+    tag = "v${version}";
+    hash = "sha256-bGY6G7qBAN1Vu+pTNqRG0xh34sR62pMhQFHFGlJaTPQ=";
+  };
+
+  patches = [
+    # <https://github.com/webrecorder/py-wacz/pull/47>
+    (fetchpatch {
+      name = "clean-up-deps.patch";
+      url = "https://github.com/webrecorder/py-wacz/compare/1e8f724a527f28855eedeb0d969ee39b00b2a80a...9d3ad60f125247b8a4354511d9123b85ce6a23c5.patch";
+      hash = "sha256-zH6BKhsq9ybjzaWcNbVkk1sWh8vVCkv7Qxuwl0MQhNM=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "pytest-runner" ""
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    boilerpy3
+    cdxj-indexer
+    frictionless
+    pyyaml
+    shortuuid
+  ] ++ frictionless.optional-dependencies.json;
+
+  optional-dependencies = {
+    # signing = [
+    #   authsign # not packaged
+    # ];
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov
+  ];
+
+  disabledTests = [
+    # authsign is not packaged
+    "test_verify_signed"
+  ];
+
+  pythonImportsCheck = [
+    "wacz"
+  ];
+
+  meta = {
+    description = "Utility for working with web archive data using the WACZ format specification";
+    homepage = "https://github.com/webrecorder/py-wacz";
+    changelog = "https://github.com/webrecorder/py-wacz/blob/${src.rev}/CHANGES.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zhaofengli ];
+    mainProgram = "wacz";
+  };
+}

pkgs/development/tools/parsing/antlr/3.5.nix

@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.antlr.org/";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ lib.maintainers.workflow ];
   };
 }

pkgs/test/texlive/default.nix

@@ -636,6 +636,9 @@ rec {
         # pfarrei: require working kpse to find lua module
         "a5toa4"
 
+        # show-pdf-tags: require working kpse to find lualatex and lua modules
+        "show-pdf-tags"
+
         # bibexport: requires kpsewhich
         "bibexport"
 

pkgs/tools/typesetting/tex/texlive/UPGRADING.md

@@ -74,10 +74,11 @@ hashes for the relevant package, or for all packages.
 
 ### Upgrading the ConTeXt binaries
 
-The LuaMetaTeX sources required for ConTeXt are distributed separately from the
+ConTeXt in TeX Live is packaged as described
-TeX Live tarballs and must be updated manually (see `texlive.bin.context`). You
+[here](https://github.com/gucci-on-fleek/context-packaging). With every update
-must use the latest tarball at https://tug.org/svn/texlive/trunk/Master/source/
+to the ConTeXt package, the LuaMetaTeX compiler also needs to be updated. For
-whose revision number is less than or equal to that of the package `context`.
+this, we fetch the source from the releases of the above repo. Make sure to
+update this in `texlive.bin.context`, when updating TeX Live.
 
 ### Updating the licensing information
 

pkgs/tools/typesetting/tex/texlive/bin.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchzip,
   fetchFromGitHub,
   fetchpatch,
   buildPackages,
@@ -533,35 +534,42 @@ rec {
     enableParallelBuilding = true;
   };
 
-  # the LuaMetaTeX engine (distributed since TeX Live 2023) must be built separately
+  # The LuaMetaTeX engine (distributed since TeX Live 2023) must be built separately.
-  # the sources used by TL are stored in the source TL repo
+  # For details on how TeX Live packages ConTeXt, see
-  # for details see https://wiki.contextgarden.net/Building_LuaMetaTeX_for_TeX_Live
+  # https://github.com/gucci-on-fleek/context-packaging
-  context = stdenv.mkDerivation rec {
+  context =
-    pname = "luametatex";
+    let
-    version = "2.11.07";
+      # The latest release of the context-packaging repo before the CTAN version in tlpdb.nix
+      # https://github.com/gucci-on-fleek/context-packaging
+      context_packaging_release = "2025-06-12-14-21-B";
+    in
+    stdenv.mkDerivation rec {
+      pname = "luametatex";
+      version = "2.11.07";
 
-    src = fetchurl {
+      src = fetchzip {
-      name = "luametatex-${version}.tar.xz";
+        name = "luametatex.src.zip";
-      url = "https://tug.org/svn/texlive/trunk/Master/source/luametatex-${version}.tar.xz?pathrev=75382&view=co";
+        url = "https://github.com/gucci-on-fleek/context-packaging/releases/download/${context_packaging_release}/luametatex.src.zip";
-      hash = "sha256-ou04WcKnyEJTkUV4HhlGwDTscdEJTflGv0cpN69qkWE=";
+        hash = "sha256-9TLTIUSqA3g8QP9EF+tQ4VfLLLQwMrbeXPPy58uFWDo=";
-    };
+        stripRoot = false;
+      };
 
-    enableParallelBuilding = true;
+      enableParallelBuilding = true;
-    nativeBuildInputs = [
+      nativeBuildInputs = [
-      cmake
+        cmake
-      ninja
+        ninja
-    ];
-
-    meta = with lib; {
-      description = "LUAMETATEX engine is a follow up on LUATEX and is again part of CONTEXT development";
-      homepage = "https://www.pragma-ade.nl/luametatex-1.htm";
-      license = licenses.gpl2Plus;
-      maintainers = with lib.maintainers; [
-        apfelkuchen6
-        xworld21
       ];
+
+      meta = with lib; {
+        description = "LUAMETATEX engine is a follow up on LUATEX and is again part of CONTEXT development";
+        homepage = "https://www.pragma-ade.nl/luametatex-1.htm";
+        license = licenses.gpl2Plus;
+        maintainers = with lib.maintainers; [
+          apfelkuchen6
+          xworld21
+        ];
+      };
     };
-  };
 
   dvisvgm = stdenv.mkDerivation rec {
     pname = "dvisvgm";

pkgs/tools/typesetting/tex/texlive/default.nix

@@ -101,7 +101,7 @@ let
   version = {
     # day of the snapshot being taken
     year = "2025";
-    month = "06";
+    month = "07";
     day = "03";
     # TeX Live version
     texliveYear = 2025;
@@ -141,7 +141,7 @@ let
         # use last mirror for daily snapshots as texlive.tlpdb.xz changes every day
         # TODO make this less hacky
         (if version.final then mirrors else [ (lib.last mirrors) ]);
-    hash = "sha256-K8BoBuMRv5Lp5+trLF5PZOTjzW86i0ZL/jKqP6n7LwA=";
+    hash = "sha256-hTWTs5meP6X7+bBGEHP9pDv8eJTfvBZFKX0WeK8+aZg=";
   };
 
   tlpdbNix =
@@ -334,6 +334,7 @@ let
       bsd3
       cc-by-sa-40
       eupl12
+      fdl13Only
       free
       gfl
       gfsl

pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix

@@ -57,7 +57,6 @@ lib.recursiveUpdate orig rec {
   #### overrides of texlive.tlpdb
 
   #### nonstandard script folders
-  context-texlive.scriptsFolder = "context-texlive/stubs-mkiv/unix";
   cyrillic-bin.scriptsFolder = "texlive-extra";
   fontinst.scriptsFolder = "texlive-extra";
   mptopdf.scriptsFolder = "context/perl";
@@ -518,7 +517,10 @@ lib.recursiveUpdate orig rec {
   #### dependency changes
 
   # Since 2025 OpTeX is based on luahbtex
-  optex.deps = orig.optex.deps ++ [ "luahbtex" ];
+  optex.deps = (orig.optex.deps or [ ]) ++ [ "luahbtex" ];
+
+  # Since the packaging change for ConTeXt, context-legacy is missing the xetex dependency
+  context-legacy.deps = (orig.context-legacy.deps or [ ]) ++ [ "xetex" ];
 
   # it seems to need it to transform fonts
   xdvi.deps = (orig.xdvi.deps or [ ]) ++ [ "metafont" ];

pkgs/top-level/all-packages.nix

@@ -11894,6 +11894,8 @@ with pkgs;
 
   cdparanoia = cdparanoiaIII;
 
+  cdxj-indexer = with python3Packages; toPythonApplication cdxj-indexer;
+
   chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or { });
 
   chuck = callPackage ../applications/audio/chuck {
@@ -16323,6 +16325,8 @@ with pkgs;
     ffmpeg = ffmpeg-full;
   };
 
+  py-wacz = with python3Packages; toPythonApplication wacz;
+
   wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };
 
   wasmer = callPackage ../development/interpreters/wasmer {

pkgs/top-level/python-packages.nix

@@ -2354,6 +2354,8 @@ self: super: with self; {
 
   cddlparser = callPackage ../development/python-modules/cddlparser { };
 
+  cdxj-indexer = callPackage ../development/python-modules/cdxj-indexer { };
+
   celery = callPackage ../development/python-modules/celery { };
 
   celery-batches = callPackage ../development/python-modules/celery-batches { };
@@ -4833,6 +4835,8 @@ self: super: with self; {
 
   ezdxf = callPackage ../development/python-modules/ezdxf { };
 
+  ezodf = callPackage ../development/python-modules/ezodf { };
+
   ezyrb = callPackage ../development/python-modules/ezyrb { };
 
   f3d = toPythonModule (
@@ -5451,6 +5455,8 @@ self: super: with self; {
 
   freud = callPackage ../development/python-modules/freud { };
 
+  frictionless = callPackage ../development/python-modules/frictionless { };
+
   frida-python = callPackage ../development/python-modules/frida-python { };
 
   frigidaire = callPackage ../development/python-modules/frigidaire { };
@@ -12202,6 +12208,8 @@ self: super: with self; {
 
   py2vega = callPackage ../development/python-modules/py2vega { };
 
+  py3amf = callPackage ../development/python-modules/py3amf { };
+
   py3buddy = callPackage ../development/python-modules/py3buddy { };
 
   py3dns = callPackage ../development/python-modules/py3dns { };
@@ -19279,6 +19287,8 @@ self: super: with self; {
 
   w3lib = callPackage ../development/python-modules/w3lib { };
 
+  wacz = callPackage ../development/python-modules/wacz { };
+
   wadler-lindig = callPackage ../development/python-modules/wadler-lindig { };
 
   wadllib = callPackage ../development/python-modules/wadllib { };