Merge staging-next into staging

doc/languages-frameworks/javascript.section.md

@@ -342,7 +342,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
-    fetcherVersion = 3;
+    fetcherVersion = 4;
     hash = "...";
   };
 })
@@ -384,7 +384,7 @@ It is highly recommended to use a pinned version of pnpm (i.e., `pnpm_9` or `pnp
    pnpmDeps = fetchPnpmDeps {
      inherit (finalAttrs) pname version src;
 +    pnpm = pnpm_10;
-     fetcherVersion = 3;
+     fetcherVersion = 4;
      hash = "...";
    };
  })
@@ -498,7 +498,7 @@ This is the version of the output of `fetchPnpmDeps`. New packages should use `3
   # ...
   pnpmDeps = fetchPnpmDeps {
     # ...
-    fetcherVersion = 3;
+    fetcherVersion = 4;
     hash = "..."; # clear this hash and generate a new one
   };
 }
@@ -516,6 +516,7 @@ Version 3 is the recommended value for new packages. Versions 1 and 2 are deprec
 - 1: Initial version, nothing special.
 - 2: [Ensure consistent permissions](https://github.com/NixOS/nixpkgs/pull/422975)
 - 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950)
+- 4: [Dump SQLite database to an SQL file](https://github.com/NixOS/nixpkgs/pull/522703)
 
 ### Yarn {#javascript-yarn}
 

doc/release-notes/rl-2605.section.md

@@ -304,6 +304,8 @@
 
 - The `pie` hardening flag has been removed and will now error, after being deprecated in 25.11. Compilers are expected to enable PIE by default, as has been common practice since 2016 outside of Nixpkgs. If a package needs `pie` disabled pass `-no-pie` in `CFLAGS`. It is unlikely this will be necessary in many cases; due to the prevalence of default PIE toolchains, most packages incompatible with PIE already pass `-no-pie`.
 
+- `pqos-wrapper` was removed as it has been unmaintained since 2022 and not widely used.
+
 ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

doc/release-notes/rl-2611.section.md

@@ -10,9 +10,7 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- `pqos-wrapper` was removed
-  as it has been unmaintained since 2022
-  and not widely used.
+- Create the first release note entry in this section!
 
 ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes}
 

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

@@ -386,6 +386,10 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
 
 - `services.esphome` no longer uses `DynamicUser`. The service now runs as a static `esphome` system user. systemd handles the migration from `/var/lib/private/esphome` automatically, but users with [impermanence](https://github.com/nix-community/impermanence) setups should ensure `/var/lib/esphome` is persisted.
 
+- `programs.pqos-wrapper` module has been deleted as the corresponding package has been dropped from nixpkgs.
+
+- `programs.benchexec.enable = true` no longer sets `programs.pqos-wrapper.enable = true` as the corresponding module has been deleted.
+
 ## Other Notable Changes {#sec-release-26.05-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

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

@@ -16,12 +16,7 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- `programs.pqos-wrapper` module has been deleted
-  as the corresponding package has been dropped from nixpkgs.
-
-- `programs.benchexec.enable = true`
-  no longer sets `programs.pqos-wrapper.enable = true`
-  as the corresponding module has been deleted.
+- Create the first release note entry in this section!
 
 ## Other Notable Changes {#sec-release-26.11-notable-changes}
 

nixos/modules/services/networking/netbird.nix

@@ -591,7 +591,7 @@ in
           after = [ "network.target" ];
           wantedBy = [ "multi-user.target" ];
 
-          path = optionals (!config.services.resolved.enable) [ pkgs.openresolv ];
+          path = [ pkgs.shadow ] ++ optionals (!config.services.resolved.enable) [ pkgs.openresolv ];
 
           serviceConfig = {
             ExecStart = "${getExe client.wrapper} service run";

nixos/tests/evcc.nix

@@ -7,7 +7,7 @@ in
   name = "evcc";
   meta.maintainers = with lib.maintainers; [ hexa ];
 
-  nodes = {
+  containers = {
     machine = {
       services.evcc = {
         enable = true;

nixos/tests/pinnwand.nix

@@ -12,7 +12,7 @@ in
     maintainers = [ hexa ];
   };
 
-  nodes = {
+  containers = {
     server =
       { config, ... }:
       {

nixos/tests/postfix-tlspol.nix

@@ -7,7 +7,7 @@
 
   meta.maintainers = with lib.maintainers; [ hexa ];
 
-  nodes.machine = {
+  containers.machine = {
     services.postfix.enable = true;
     services.postfix-tlspol.enable = true;
 

nixos/tests/zigbee2mqtt.nix

@@ -6,7 +6,7 @@
 
 {
   name = "zigbee2mqtt";
-  nodes.machine = {
+  containers.machine = {
     systemd.services.dummy-serial = {
       wantedBy = [
         "multi-user.target"

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

@@ -675,8 +675,8 @@ let
         mktplcRef = {
           name = "markdown-mermaid";
           publisher = "bierner";
-          version = "1.32.0";
-          hash = "sha256-1LlRTkskBAlYV+fq3GVyOUGYXbILvKIByBu2uKwTUUc=";
+          version = "1.32.1";
+          hash = "sha256-bH8JBZOfj2Km5/tfaiSzrkOl2kOU+XwZcuWOpU9iVEM=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog";
@@ -4244,8 +4244,8 @@ let
         mktplcRef = {
           publisher = "shopify";
           name = "ruby-lsp";
-          version = "0.10.3";
-          hash = "sha256-PzK3cQYgLmSya4YPaOTBa3P1tOb4iO+Of4JsdbZFwxk=";
+          version = "0.10.4";
+          hash = "sha256-fonAbZ2nvC3Dz/9j4J23hiiJ/xgT8z/LI1HYYQh6u9w=";
         };
         meta = {
           description = "VS Code plugin for connecting with the Ruby LSP";
@@ -4867,8 +4867,8 @@ let
         mktplcRef = {
           name = "uiua-vscode";
           publisher = "uiua-lang";
-          version = "0.0.69";
-          hash = "sha256-wP2Mw4K0Fh4xKaffzl1OwrWnWu6npZ2PyVDaT5LUeeY=";
+          version = "0.0.70";
+          hash = "sha256-chp6chYUg3HzWm68NfSs3B8obSJxPSCjFHMwBK31ps4=";
         };
         meta = {
           description = "VSCode language extension for Uiua";
@@ -5110,8 +5110,8 @@ let
         mktplcRef = {
           publisher = "vscjava";
           name = "vscode-java-dependency";
-          version = "0.27.3";
-          hash = "sha256-8ZkdAZLplf9RI5sFGqsjVMlsletck/qXJ6D1Dxz9AuI=";
+          version = "0.27.4";
+          hash = "sha256-nEONTcT0chv+gpi43naszDCh3R0aKnwC91hZ8hqje7s=";
         };
         meta = {
           license = lib.licenses.mit;

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

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x";
-  version = "0-unstable-2026-04-14";
+  version = "0-unstable-2026-05-20";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
-    rev = "121bb374d0d9a5ba2dd73c7b14a58c95c236a9bf";
-    hash = "sha256-8/Xe8T2+FP/l07AsW19arreXvygZhwTvIBypyvRBfnk=";
+    rev = "f8aff9cbd0ab3ee92679f039298d57b55f9d790e";
+    hash = "sha256-4tOXpK2OBY6u5NnuIq5NWT3haOp2y+4BtBlHVAzEuRE=";
   };
 
   makefile = "Makefile";

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

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2026-05-16";
+  version = "0-unstable-2026-05-24";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "03dbb069fd2d6fee0d58c5d96077bdf9c686a1e2";
-    hash = "sha256-BiyicKZsoRXd/w0U2uvCjd0E3gzNvfNPbAt34nGdXdw=";
+    rev = "a720cccc55ae9bce007e748b53371914951f9f32";
+    hash = "sha256-TAR1/FiVMz6YYzbLB8maZcsU+0h6lo8lpY31Y+gGj1k=";
   };
 
   makefile = "Makefile";

pkgs/build-support/node/fetch-pnpm-deps/default.nix

@@ -8,6 +8,7 @@
   makeSetupHook,
   pnpm,
   pnpm-fixup-state-db,
+  sqlite,
   writableTmpDirAsHomeHook,
   yq,
   zstd,
@@ -19,6 +20,7 @@ let
     1 # First version. Here to preserve backwards compatibility
     2 # Ensure consistent permissions. See https://github.com/NixOS/nixpkgs/pull/422975
     3 # Build a reproducible tarball. See https://github.com/NixOS/nixpkgs/pull/469950
+    4 # Dump SQLite database to an SQL file. See https://github.com/NixOS/nixpkgs/pull/522703
   ];
 in
 {
@@ -87,6 +89,7 @@ in
               moreutils
               pnpm # from args
               pnpm-fixup-state-db'
+              sqlite
               writableTmpDirAsHomeHook
               yq
               zstd
@@ -172,6 +175,13 @@ in
 
               if [ -f "$storePath/v11/index.db" ]; then
                 pnpm-fixup-state-db "$storePath/v11";
+                # Dump the SQLite database to a SQL text file for reproducibility.
+                # SQLite's binary format is non-deterministic (version-valid-for number, etc),
+                # so we store the logical contents as SQL statements and reconstruct during build.
+                if [[ ${toString fetcherVersion} -ge 4 ]]; then
+                  sqlite3 "$storePath/v11/index.db" .dump > "$storePath/v11/index.db.sql"
+                  rm "$storePath/v11/index.db"
+                fi
               fi
 
               # This folder contains symlinks to /build/source which we don't need
@@ -231,6 +241,7 @@ in
   pnpmConfigHook = makeSetupHook {
     name = "pnpm-config-hook";
     propagatedBuildInputs = [
+      sqlite
       writableTmpDirAsHomeHook
       zstd
     ];

pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh

@@ -55,6 +55,14 @@ pnpmConfigHook() {
 
     chmod -R +w "$STORE_PATH"
 
+    # Reconstruct the SQLite database from the SQL dump if needed.
+    # The fetch phase stores a text SQL dump instead of the binary db
+    # to ensure reproducibility across platforms.
+    if [ -f "$STORE_PATH/v11/index.db.sql" ]; then
+      sqlite3 "$STORE_PATH/v11/index.db" < "$STORE_PATH/v11/index.db.sql"
+      rm "$STORE_PATH/v11/index.db.sql"
+    fi
+
     pnpm config set store-dir "$STORE_PATH"
 
     # Prevent hard linking on file systems without clone support.

pkgs/build-support/trivial-builders/default.nix

@@ -732,7 +732,7 @@ rec {
           # turn off __structuredAttrs to unbreak substituteAll
           __structuredAttrs = false;
           pname = name;
-          version = lib.trivial.release + "pre-git";
+          version = "26.05pre-git";
           inherit meta;
           inherit depsTargetTargetPropagated;
           inherit propagatedBuildInputs;

pkgs/by-name/au/autobrr/package.nix

@@ -45,8 +45,8 @@ let
         sourceRoot
         ;
       pnpm = pnpm_11;
-      fetcherVersion = 3;
-      hash = "sha256-zyY54pqlQnYdOyrNZA/WiALzdf4ZGwMLnwm6Mpb0S5k=";
+      fetcherVersion = 4;
+      hash = "sha256-jkPm7SySkzriOTcLpibJazNAzUKE48s6vBEzY7+ypBU=";
     };
 
     postBuild = ''

pkgs/by-name/dn/dnscontrol/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dnscontrol";
-  version = "4.38.0";
+  version = "4.39.0";
 
   src = fetchFromGitHub {
     owner = "DNSControl";
     repo = "dnscontrol";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lM+9xuNB88csciIC5eu2oRl0IBqZE7CCPCxf8BEZSz0=";
+    hash = "sha256-2pesk5yT7YPROZiX7bqjRhQi4bk3YS0nxSkP+RjZ1so=";
   };
 
   vendorHash = "sha256-pzdOW+L/w74ANaCKXWQviBMDlSTOfebAVE7Cdd+lZLo=";

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

@@ -12,13 +12,13 @@
 }:
 
 let
-  version = "2.63.3";
+  version = "2.63.5";
 
   src = fetchFromGitHub {
     owner = "filebrowser";
     repo = "filebrowser";
     rev = "v${version}";
-    hash = "sha256-v3cC8opClvt91MqUIKNZdvCv0hPeCvWPi0IlOMHlWbQ=";
+    hash = "sha256-/X/TztbZDC1hkRL97jkm6Ak8QmKFDMycekLl6NVPS0k=";
   };
 
   frontend = buildNpmPackage rec {
@@ -41,7 +41,7 @@ let
         ;
       fetcherVersion = 3;
       pnpm = pnpm_10;
-      hash = "sha256-g8BWDEymQNOkLYBws0ii4iLnpjB7X4EQl0OzR3GXeq0=";
+      hash = "sha256-UwTA7Eogp2GrvmXDbdfGBTJS3DuOTJ42e6fHlQxSHoA=";
     };
 
     installPhase = ''

pkgs/by-name/fo/fop/package.nix

@@ -7,12 +7,12 @@
   stripJavaArchivesHook,
 }:
 
-maven.buildMavenPackage rec {
+maven.buildMavenPackage (finalAttrs: {
   pname = "fop";
   version = "2.11";
 
   src = fetchurl {
-    url = "https://dlcdn.apache.org/xmlgraphics/fop/source/fop-${version}-src.tar.gz";
+    url = "https://dlcdn.apache.org/xmlgraphics/fop/source/fop-${finalAttrs.version}-src.tar.gz";
     hash = "sha256-uY6cUjmyuenfK3jAWvugsYa5qg8rbnvRZZ6qA/g2fZM=";
   };
 
@@ -75,4 +75,4 @@ maven.buildMavenPackage rec {
       binaryBytecode # source bundles dependencies as jars
     ];
   };
-}
+})

pkgs/by-name/gt/gtree/package.nix

@@ -11,16 +11,16 @@
 # it's updated.
 buildGo126Module (finalAttrs: {
   pname = "gtree";
-  version = "1.13.5";
+  version = "1.13.6";
 
   src = fetchFromGitHub {
     owner = "ddddddO";
     repo = "gtree";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2OhXb6ivje7Li/sUO+YHfZPRBKoQnUhNbhbFtqlyjyM=";
+    hash = "sha256-E3Nri8kFMh6NYp29vFFNAlJxdfOvLR1inbD+KALXZms=";
   };
 
-  vendorHash = "sha256-UTJQvoiqdF1q4VRUfAx7a7V5UyH+zjwDM5YU7cqVDKE=";
+  vendorHash = "sha256-Pkc2UV/77YdKm5ZWKCSKE0dljUzC5dw1f08T+3MvFTE=";
 
   subPackages = [
     "cmd/gtree"

pkgs/by-name/ma/maigret/package.nix

@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "maigret";
-  version = "0.6.0";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "soxoj";
     repo = "maigret";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3X8mRgsI0y1F/gUTWeYw83mQJKglJporpw7l9jI1Hvw=";
+    hash = "sha256-gojeqNZd0n5Qs7YVFBy6zDdjXR6KKdebcu8vfNs/AE8=";
   };
 
   pythonRelaxDeps = true;

pkgs/by-name/md/mdwatch/package.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdwatch";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "vimlinuz";
     repo = "mdwatch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Oz0vBg+jfB24WT3n5v/7clCk37YaRBPnpfNQth0kxio=";
+    hash = "sha256-h2ZUcvRkCxvVZWIroyzLGkzW4B3+iMCU5GRvIcNTrWk=";
   };
 
-  cargoHash = "sha256-dMZpDuyKtheKRcBvVsHjVpJEnQRf92E2fb6JRH2fXO4=";
+  cargoHash = "sha256-03qTW1NuNEzU6krG2S9C/9sCB6U9nM3nu4isdPR+3Aw=";
 
   passthru.updateScript = nix-update-script { };
 
@@ -29,7 +29,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/vimlinuz/mdwatch";
     changelog = "https://github.com/vimlinuz/mdwatch/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ x123 ];
+    maintainers = with lib.maintainers; [
+      x123
+      vimlinuz
+    ];
     mainProgram = "mdwatch";
   };
 })

pkgs/by-name/mi/mint-l-icons/package.nix

@@ -10,14 +10,14 @@
 
 stdenvNoCC.mkDerivation {
   pname = "mint-l-icons";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-l-icons";
     # They don't really do tags, this is just a named commit.
-    rev = "256fe2e44655ce197701e35aefc40f49fe30356d";
-    hash = "sha256-BYzgGOVmUZBkz6lG1vFXtqiyUf3xnhXsoP+q4aLLMJs=";
+    rev = "f9f679c9bed2f2462040fed9872988e705bf5630";
+    hash = "sha256-nfdG1AVF/bIgRZ+9dZ14qw5cajhO3Q6oY5ZqkgTnuCA=";
   };
 
   propagatedBuildInputs = [

pkgs/by-name/mi/mint-x-icons/package.nix

@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-x-icons";
-  version = "1.7.5";
+  version = "1.7.6";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-x-icons";
     rev = version;
-    hash = "sha256-UNta7sj5xzZglYJekhxa0N/2RJU4cyqjX2fCFdWqoiY=";
+    hash = "sha256-gGldt2tGko3IukpKjn0xGAe4cL21YPCECJfcOX5F8n0=";
   };
 
   propagatedBuildInputs = [

pkgs/by-name/mi/mint-y-icons/package.nix

@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-y-icons";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "mint-y-icons";
     rev = version;
-    hash = "sha256-YciWUzvu+2krbSGz5mqpCVRE22T8/gl4Ln4rILB5Tq8=";
+    hash = "sha256-kB6JEl6CjVfZ/aY9qotfTogKxcPdZzNLlbA9OoKEvAc=";
   };
 
   propagatedBuildInputs = [

pkgs/by-name/mk/mkvtoolnix/package.nix

@@ -8,8 +8,6 @@
   boost,
   cmark,
   docbook_xsl,
-  expat,
-  file,
   flac,
   fmt,
   gettext,
@@ -26,7 +24,6 @@
   pugixml,
   qt6,
   utf8cpp,
-  xdg-utils,
   zlib,
   nix-update-script,
   withGUI ? true,
@@ -67,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     autoreconfHook
     docbook_xsl
@@ -81,8 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
   # qtbase and qtmultimedia are needed without the GUI
   buildInputs = [
     boost
-    expat
-    file
     flac
     fmt
     gmp
@@ -96,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtbase
     qt6.qtmultimedia
     utf8cpp
-    xdg-utils
     zlib
   ]
   ++ optionals withGUI [ cmark ]

pkgs/by-name/mo/monkeys-audio/package.nix

@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "12.93";
+  version = "12.97";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-T5Bt4g3xmxYb1YQyZ1/VnlJgk6JCPe8SiBT016dGPCA=";
+    hash = "sha256-Ra6F+msApdIIJdYLcv+EysnDPmAXDYI8W3theLla25w=";
     stripRoot = false;
   };
 

pkgs/by-name/mo/moosefs/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "moosefs";
-  version = "4.59.1";
+  version = "4.59.2";
 
   src = fetchFromGitHub {
     owner = "moosefs";
     repo = "moosefs";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-ASI3iwygGeF9HaoZaSMUIuELJ/pMzRwJL8VmOAXs8cM=";
+    sha256 = "sha256-kWJI0lsVy4KmCIUbuIHswuN/lnMgG/eR6goya+keoy0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/on/onlyoffice-documentserver/package.nix

@@ -27,6 +27,20 @@ let
     tag = "v9.3.1.1";
     hash = "sha256-uN1L/4I7wrg0BqAAu3zdn8LqtdfJDAHnAMbCvzQnOvI=";
   };
+  # This is required but not included in the submodules for some reason.
+  # https://github.com/ONLYOFFICE/server/blob/34adaeeb4cc1e032a5cf188924880a25546dc67c/Makefile#L81-L83
+  document-templates-src = fetchFromGitHub {
+    owner = "ONLYOFFICE";
+    repo = "document-templates";
+    tag = "v9.3.1.1";
+    hash = "sha256-+52+MK/8DARJrQRbIpN5nk3j3J9cy6Wd1FDMnCVZKRE=";
+  };
+  document-formats-src = fetchFromGitHub {
+    owner = "ONLYOFFICE";
+    repo = "document-formats";
+    tag = "v9.3.1.1";
+    hash = "sha256-HpGhV+PGbQ5hHH6mPQTAdFpBT3nUni4VtDxTExJypAc=";
+  };
   common = buildNpmPackage (finalAttrs: {
     name = "onlyoffice-server-Common";
     src = server-src;
@@ -181,6 +195,9 @@ let
       mkdir -p $out/var/www/onlyoffice/documentserver/server/schema
       cp -r ${server-src}/schema/* $out/var/www/onlyoffice/documentserver/server/schema
 
+      ln -s ${document-templates-src} $out/var/www/onlyoffice/documentserver/document-templates
+      ln -s ${document-formats-src} $out/var/www/onlyoffice/documentserver/document-formats
+
       ## required for bwrap --bind
       chmod u+w $out/var
       mkdir -p $out/var/lib/onlyoffice

pkgs/by-name/op/openrct2/package.nix

@@ -64,13 +64,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openrct2";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sGdtiEUmZux6FCXuxefRulfIEO8FY7wYfIBOhdSYtF8=";
+    hash = "sha256-5GPepF013XhymzlgfYjlB/XPE2/w18/kv3IDgJ4vPuY=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ot/otfcc/package.nix

@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
     ./move-makefiles.patch
   ];
 
+  postPatch = ''
+    substituteInPlace premake5.lua \
+      --replace-fail 'flags { "StaticRuntime" }' 'staticruntime "On"'
+  '';
+
   buildFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "config=release_arm" ];
 
   installPhase = ''
@@ -39,11 +44,5 @@ stdenv.mkDerivation rec {
     license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ ttuegel ];
-    # Build fails on all platforms with
-    #        > configure flags: gmake
-    #   > ** Warning: action 'xcode4' sets 'os' field, which is deprecated, use 'targetos' instead.
-    #   > Error: invalid value 'StaticRuntime' for flags
-    broken = true;
   };
-
 }

pkgs/by-name/pa/par-lang/package.nix

@@ -19,16 +19,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "par-lang";
-  version = "0-unstable-2026-05-13";
+  version = "0-unstable-2026-05-23";
 
   src = fetchFromGitHub {
     owner = "par-team";
     repo = "par-lang";
-    rev = "c850458a4732bbe7d14551c1b50d8a2055622625";
-    hash = "sha256-1YEtq71chZhPO1q5V+QwRhqJDMUdDw5cFv8s8PRzUHc=";
+    rev = "56ecfe8ee657e5ef853bf29a791f3779cca8bae3";
+    hash = "sha256-St1mIPuX0BMibOWHhEQ73/V0ZY6tHuxb7/VVI3hOxfk=";
   };
 
-  cargoHash = "sha256-hg5okkDqOFRkUc4e/cs/C5AB1EROIUtfYpoDatJ0EAo=";
+  cargoHash = "sha256-lX67nywrM0SZp6qbvTeojVVp5ZSvAEw5fvklQ+SX1hU=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/pi/pihole-ftl/package.nix

@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pihole-ftl";
-  version = "6.6.1";
+  version = "6.6.2";
 
   src = fetchFromGitHub {
     owner = "pi-hole";
     repo = "FTL";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UMLTym9LSx8rlWKkFtHGtSEM0Stdpkfkz/7Iy/05jf8=";
+    hash = "sha256-dYeW5r96xGt0wkR8CeWJUHEn+BCS8fIBAjSVtRdsDkM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/pl/plasma-panel-colorizer/package.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-colorizer";
-  version = "7.1.0";
+  version = "7.2.0";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-colorizer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OyOFQZzsWRbsvv0jAFRXWo4AMeu4t1KMtubg3R/jb50=";
+    hash = "sha256-CRuiHVRCstpD3LtT52Xiu4f2+d0Y4RKKLLt056kqNwg=";
   };
 
   nativeBuildInputs = [

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

@@ -17,7 +17,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "rclone";
-  version = "1.74.1";
+  version = "1.74.2";
 
   outputs = [
     "out"
@@ -28,10 +28,10 @@ buildGoModule (finalAttrs: {
     owner = "rclone";
     repo = "rclone";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KbaOIrz7v3NheTcPQ8ZoZP5HSAY/THmywLxU3WdD4xA=";
+    hash = "sha256-ynPRzzS0aoEbDiCgeIyi2Ce3+NHjQcazm7KJeK6cdiM=";
   };
 
-  vendorHash = "sha256-snYmkzE+ao8Qxz4uA04LFPWqzf601EtnTk/LAeYNhyk=";
+  vendorHash = "sha256-fiZyN94l0Eq3BjJzW3lF5ld37VBurWjtr1v5kVWCc/Q=";
 
   subPackages = [ "." ];
 

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

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,14 +15,6 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-lLhF8taK6PqWo4u6pMZDN2PZavnWwsz4NbEUT7EtULo=";
   };
 
-  patches = [
-    # Fixes gcc-15 build.
-    (fetchpatch2 {
-      url = "https://github.com/jerome-pouiller/reredirect/commit/b85df395e18d09b54e1fb73dfe344f8f04224a83.patch";
-      hash = "sha256-RTzJrgiJGmUf0iVaSvXw/NLwWRTch1aLdDdLp50sAD8=";
-    })
-  ];
-
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   postFixup = ''

pkgs/by-name/rp/rpi-imager/package.nix

@@ -7,6 +7,7 @@
   gnutls,
   libarchive,
   libtasn1,
+  libusb1,
   liburing,
   nix-update-script,
   pkg-config,
@@ -22,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rpi-imager";
-  version = "2.0.6";
+  version = "2.0.9";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "rpi-imager";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YbPGxc6EWE3B+7MWgtwTDRdjin9FM7KpWfw38FqKXYA=";
+    hash = "sha256-hoypze5EyJKRVQNI8x5sh3LqVyK8tEze1/vxogrqckA=";
   };
 
   patches = [ ./remove-vendoring.patch ];
@@ -72,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnutls
     libarchive
     libtasn1
+    libusb1
     qt6.qtbase
     qt6.qtdeclarative
     qt6.qtsvg
@@ -124,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "rpi-imager";
     maintainers = with lib.maintainers; [
       anthonyroussel
+      agustinmista
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     # could not find xz

pkgs/by-name/rp/rpi-imager/remove-vendoring.patch

@@ -1,8 +1,8 @@
-diff --git i/src/CMakeLists.txt w/src/CMakeLists.txt
-index de474c4d..36b6cf2c 100644
---- i/src/CMakeLists.txt
-+++ w/src/CMakeLists.txt
-@@ -129,26 +129,37 @@ set(BUILD_SHARED_LIBS OFF)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 19f931b..ca78f8f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -158,26 +158,40 @@ set(BUILD_SHARED_LIBS OFF)
  include(FetchContent)
  
  # Bundled liblzma
@@ -15,6 +15,9 @@ index de474c4d..36b6cf2c 100644
 +find_package(zstd ${ZSTD_VERSION})
 +if(NOT zstd_FOUND)
  include(dependencies/zstd.cmake)
++else()
++set(ZSTD_LIBRARIES zstd::libzstd_shared)
++set(ZSTD_INCLUDE_DIR ${zstd_INCLUDE_DIR})
 +endif()
  
  # Remote nghttp2
@@ -42,11 +45,25 @@ index de474c4d..36b6cf2c 100644
      # In version 8.15.0, libcurl dropped support for Secure Transport, because it
      # does not implement TLS 1.3. Unfortunately, there was no replacement Network.framework implementation,
      # so on macOS we're forced to use the macOS SDK version of libcurl, including libcurl's own OpenSSL-analogue.
-@@ -506,7 +517,6 @@ else()
+@@ -193,7 +207,13 @@ endif()
+ 
+ 
+ # Bundled libusb (for rpiboot Compute Module support)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(LIBUSB libusb-1.0)
++if(NOT LIBUSB_FOUND)
+ include(dependencies/libusb.cmake)
++else()
++set(LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIRS})
++endif()
+ 
+ # Add dependencies
+ if (APPLE)
+@@ -553,7 +573,6 @@ else()
      include(linux/PlatformPackaging.cmake)
  endif()
  
--add_dependencies(${PROJECT_NAME} zlibstatic yescrypt)
- include_directories(${CURL_INCLUDE_DIR} ${LibArchive_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS} ${LIBDRM_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIR} ${YESCRYPT_INCLUDE_DIR})
+-add_dependencies(${PROJECT_NAME} zlibstatic yescrypt usb-1.0-static)
+ include_directories(${CURL_INCLUDE_DIR} ${LibArchive_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS} ${LIBDRM_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIR} ${YESCRYPT_INCLUDE_DIR} ${LIBUSB_INCLUDE_DIR})
  
  # Link different Qt components based on build type

pkgs/by-name/rs/rss2email/package.nix

@@ -73,7 +73,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   meta = {
     description = "Tool that converts RSS/Atom newsfeeds to email";
-    homepage = "https://pypi.python.org/pypi/rss2email";
+    homepage = "https://pypi.org/project/rss2email/";
     license = lib.licenses.gpl2;
     mainProgram = "r2e";
   };

pkgs/by-name/ru/rusty-path-of-building/package.nix

@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rusty-path-of-building";
-  version = "0.2.16";
+  version = "0.2.17";
 
   src = fetchFromGitHub {
     owner = "meehl";
     repo = "rusty-path-of-building";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2pXT9Wyn49sGHDqjlmlCRUyIIAEERAKNK6cDTUwwjGM=";
+    hash = "sha256-Yfx81we74Ovt7RitEYH8Ez3cPykU75tteM7wqiIs63U=";
   };
 
-  cargoHash = "sha256-VZfwk6Yf4JPkjC9XY93t1jXTJCrwwfkRFFgqNYWx8HE=";
+  cargoHash = "sha256-kMPjPABquLKTuund8JJZTM1igfwmcVoUjtKXCNwbRgo=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/te/teams-for-linux/package.nix

@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-lJduUoD/bw4cAvk30fmYWsQznAFQOnUiVzIubuN7/Mk=";
+    hash = "sha256-/e/NpyfcrHsgMf8tJ8VgUyCOrdfAaRH0/+kUqItd1+s=";
   };
 
-  npmDepsHash = "sha256-CxAPb5MXc6auF219Rg0ocfijSY59j7R9lXeFhFglTPI=";
+  npmDepsHash = "sha256-RvIjGXhjNqxey3zhACGj7Zd0dnmLb1IqIg/PnfEdjz0=";
 
   nativeBuildInputs = [
     makeWrapper

pkgs/by-name/ty/typescript-language-server/package.nix

@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "typescript-language-server";
-  version = "5.2.0";
+  version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "typescript-language-server";
     repo = "typescript-language-server";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OqAhk8TG/xwF/xZE2kiMmYiYIpxCdjpn+Yx5vWeP4xs=";
+    hash = "sha256-9xK1maMfWowWlzAtmwoR3CVqQCkUf6i9uBWVsobBQPA=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-7aBQwl5xdJCa3r3ZbntcC3gzOL1GrkTto0x2+Sg1Ikg=";
+    hash = "sha256-68aXoafE/wc1iS7HHwF7g/i8ZREoTj4bV/RL3XYc0Rs=";
   };
 
   nativeBuildInputs = [

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

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typos";
-  version = "1.46.1";
+  version = "1.46.3";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "typos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PEN9RA/8YdcjJcRTpT8i5D/HweLBEE162/WLWCEizZQ=";
+    hash = "sha256-vxBFu+zflG56spXPRrvnXtgDUIrWndjBkcuZheMHwEo=";
   };
 
-  cargoHash = "sha256-uHfKSS0Qlo3dU8w1h2ia4D8JYxIPq1ZLTsTFPBIuwc0=";
+  cargoHash = "sha256-8fOZgCLjQrl/UyCMXY2NOrC96kuICNPOtpdYiVZ1rrY=";
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/ur/url-parser/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "url-parser";
-  version = "2.1.16";
+  version = "2.1.17";
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "url-parser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y3tbEpAp3kTjkAuB0gjRPD+gWskTzOKdB4/rilHbyxU=";
+    hash = "sha256-/lXMqeiPAf8YLA7ZRkzXYCHztd9YXNM8RHJwsKwxeJY=";
   };
 
   vendorHash = "sha256-smSFWfuQ3wq/ZfDwUBIUdb4DBu9TPKtJ5Ttys5xFAsE=";

pkgs/by-name/wa/warpinator/package.nix

@@ -42,13 +42,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "warpinator";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "warpinator";
     rev = finalAttrs.version;
-    hash = "sha256-3ZkufMZFTn8BQO9DHr3s9ELRuDrTflE4Ym73dO7rrKs=";
+    hash = "sha256-JMUa2EFmdEu0n+iha4N+0HRYoOvf6M9ImH/j7eOAi7Y=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/xr/xreader/package.nix

@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xreader";
-  version = "4.6.4";
+  version = "4.6.5";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xreader";
     rev = finalAttrs.version;
-    hash = "sha256-upX2+Hwdss7OfIWFg5MALoF9LIw5mk6+NYR+NEbcDX4=";
+    hash = "sha256-wycQmScxuSlo6Ln6piSBF7kmzvi6FnTm/ES/Ds+/h8I=";
   };
 
   nativeBuildInputs = [

pkgs/development/misc/resholve/deps.nix

@@ -54,7 +54,7 @@ rec {
 
     meta = {
       description = "Python 2 and 3 compatibility library";
-      homepage = "https://pypi.python.org/pypi/six/";
+      homepage = "https://pypi.org/project/six/";
       license = lib.licenses.mit;
     };
   };

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

@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Atomic file writes on POSIX";
-    homepage = "https://pypi.python.org/pypi/atomicwrites";
+    homepage = "https://pypi.org/project/atomicwrites/";
     maintainers = with lib.maintainers; [ matthiasbeyer ];
     license = lib.licenses.mit;
   };

pkgs/development/python-modules/avro-python3/default.nix

@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Serialization and RPC framework";
     mainProgram = "avro";
-    homepage = "https://pypi.python.org/pypi/avro-python3/";
+    homepage = "https://pypi.org/project/avro-python3/";
     license = lib.licenses.asl20;
 
     maintainers = [

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

@@ -30,7 +30,7 @@ buildPythonPackage rec {
   meta = {
     description = "Serialization and RPC framework";
     mainProgram = "avro";
-    homepage = "https://pypi.python.org/pypi/avro3k/";
+    homepage = "https://pypi.org/project/avro3k/";
     license = lib.licenses.asl20;
   };
 }

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

@@ -8,7 +8,6 @@
   pytestCheckHook,
   pytest-cache,
   webtest,
-  marshmallow,
   colander,
 }:
 
@@ -35,7 +34,6 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-cache
     webtest
-    marshmallow
     colander
   ];
   pythonImportsCheck = [ "cornice" ];

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

@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python port of YUI CSS Compressor";
-    homepage = "https://pypi.python.org/pypi/csscompressor";
+    homepage = "https://pypi.org/project/csscompressor/";
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };

pkgs/development/python-modules/dissect-hypervisor/default.nix

@@ -5,6 +5,7 @@
   dissect-cstruct,
   dissect-util,
   fetchFromGitHub,
+  fetchpatch2,
   pycryptodome,
   pytestCheckHook,
   setuptools,
@@ -23,6 +24,20 @@ buildPythonPackage rec {
     hash = "sha256-/b/7u3b0G3XRqXxjyhHn5dYzueQOPoacYGeDYv21I0w=";
   };
 
+  patches = [
+    # Fix vmtar compat with python 3.13.13+ tarfile refactor.
+    (fetchpatch2 {
+      url = "https://github.com/fox-it/dissect.hypervisor/commit/8baa8f6ac1ae9a7cfd99095472d9f8e933d290f5.patch?full_index=1";
+      excludes = [ "tests/util/test_vmtar.py" ];
+      hash = "sha256-Ot0rV1j+yQrXi7v1ARX+Pamnbr+/Q7T1YidY80QdgDo=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace tests/util/test_vmtar.py \
+      --replace-fail '"test/file1",' '"test", "test/file1",'
+  '';
+
   build-system = [
     setuptools
     setuptools-scm

pkgs/development/python-modules/django-stubs/default.nix

@@ -66,6 +66,7 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # Skip type checking
     "tests/typecheck/"
+    "ext/tests/typecheck/"
   ];
 
   pythonImportsCheck = [ "django-stubs" ];

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

@@ -32,7 +32,10 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-TirYLziPa1xRm7D54Unl5oVjsnsv6Gl0LRVUXzd9o/E=";
   };
 
-  pythonRelaxDeps = [ "typer" ];
+  pythonRelaxDeps = [
+    "cryptography"
+    "typer"
+  ];
 
   build-system = [
     hatch-vcs

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

@@ -34,6 +34,13 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
   ];
 
+  patches = [
+    # Python update caused one of the tests to fail. A patch that fixes this
+    # has been submitted upstream, yet to be applied.
+    # https://github.com/tlsfuzzer/python-ecdsa/pull/371
+    ./pr-371-fix-test-2026-05-23.patch
+  ];
+
   passthru.updateScript = gitUpdater {
     rev-prefix = "python-ecdsa-";
   };

pkgs/development/python-modules/ecdsa/pr-371-fix-test-2026-05-23.patch

@@ -0,0 +1,30 @@
+From f8e0f3a0035b44fa2541e2c447ed1599f220c4b5 Mon Sep 17 00:00:00 2001
+From: Alexander Shadchin <shadchin@yandex-team.com>
+Date: Thu, 9 Apr 2026 12:22:29 +0300
+Subject: [PATCH] Fix tests with new Python
+
+---
+ src/ecdsa/der.py | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/ecdsa/der.py b/src/ecdsa/der.py
+index 5d35d698..587d7852 100644
+--- a/src/ecdsa/der.py
++++ b/src/ecdsa/der.py
+@@ -464,12 +464,11 @@ def unpem(pem):
+     if isinstance(pem, text_type):  # pragma: no branch
+         pem = pem.encode()
+ 
++    lines = (l.strip() for l in pem.split(b"\n"))
+     d = b"".join(
+-        [
+-            l.strip()
+-            for l in pem.split(b"\n")
+-            if l and not l.startswith(b"-----")
+-        ]
++        l
++        for l in lines
++        if l and not l.startswith(b"-----")
+     )
+     return base64.b64decode(d)
+ 

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

@@ -8,21 +8,21 @@
   libiconv,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "evtx";
-  version = "0.11.0";
+  version = "0.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "omerbenamram";
     repo = "pyevtx-rs";
-    tag = version;
-    hash = "sha256-06pRNGEUmk2llD5CPbgHiJSHTR8tm/nv0eJL1UKHPEM=";
+    tag = finalAttrs.version;
+    hash = "sha256-oF/Hvox294/Vi7TqaJVAboAFreavnlhmqa5rpVsOv6o=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    hash = "sha256-POEqKRJ/g0bWYs89yrVyD4RFhc7iq+5J67P0rowB2/g=";
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-4pDLwM1ylZbqymG+cL7QVByc43p8XJi2MKb/cL3aWak=";
   };
 
   nativeBuildInputs = with rustPlatform; [
@@ -39,8 +39,8 @@ buildPythonPackage rec {
   meta = {
     description = "Bindings for evtx";
     homepage = "https://github.com/omerbenamram/pyevtx-rs";
-    changelog = "https://github.com/omerbenamram/pyevtx-rs/releases/tag/${src.tag}";
+    changelog = "https://github.com/omerbenamram/pyevtx-rs/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

pkgs/development/python-modules/fastapi-versionizer/default.nix

@@ -44,6 +44,12 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # openapi schema expectations drift with newer fastapi/pydantic
+    "tests/test_simple.py"
+    "tests/test_with_root_path.py"
+  ];
+
   meta = {
     changelog = "https://github.com/alexschimpf/fastapi-versionizer/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "API versionizer for FastAPI web applications";

pkgs/development/python-modules/filebrowser-safe/default.nix

@@ -29,7 +29,7 @@ buildPythonPackage rec {
       dependency for the Mezzanine CMS for Django.
     '';
     homepage = "https://github.com/stephenmcd/filebrowser-safe";
-    downloadPage = "https://pypi.python.org/pypi/filebrowser_safe/";
+    downloadPage = "https://pypi.org/project/filebrowser_safe/";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ prikhi ];
     platforms = lib.platforms.unix;

pkgs/development/python-modules/github-to-sqlite/default.nix

@@ -8,22 +8,25 @@
   requests,
   requests-mock,
   sqlite-utils,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "github-to-sqlite";
   version = "2.9";
-  format = "setuptools";
+  pyproject = true;
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "dogsheep";
     repo = "github-to-sqlite";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-KwLaaZxBBzRhiBv4p8Imb5XI1hyka9rmr/rxA6wDc7Q=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     sqlite-utils
     pyyaml
     requests
@@ -43,4 +46,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ sarcasticadmin ];
   };
-}
+})

pkgs/development/python-modules/github-webhook/default.nix

@@ -4,19 +4,21 @@
   fetchPypi,
   flask,
   six,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "github-webhook";
   version = "1.0.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     sha256 = "b2444dbfd03deda35792bd00ebd1692597c2605c61445da79da6322afaca7a8d";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+  dependencies = [
     flask
     six
   ];
@@ -29,4 +31,4 @@ buildPythonPackage rec {
     homepage = "https://github.com/bloomberg/python-github-webhook";
     license = lib.licenses.mit;
   };
-}
+})

pkgs/development/python-modules/grappelli-safe/default.nix

@@ -36,7 +36,7 @@ buildPythonPackage rec {
       address these specific issues.
     '';
     homepage = "https://github.com/stephenmcd/grappelli-safe";
-    downloadPage = "http://pypi.python.org/pypi/grappelli_safe/";
+    downloadPage = "http://pypi.org/pypi/grappelli_safe/";
     changelog = "https://github.com/stephenmcd/grappelli-safe/releases/tag/v${version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ prikhi ];

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

@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202605221";
+  version = "0.1.202605231";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GstgvzhYFTFTUIXXajfcSYDYlGcoZCftUzHlJYhrbbo=";
+    hash = "sha256-j2JUMNy2rPKcVnOeoCy1zr0k976QC+Ajs1hYJhQMsg8=";
   };
 
   __darwinAllowLocalNetworking = true;

pkgs/development/python-modules/jsonrpclib-pelix/default.nix

@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "JSON RPC client library - Pelix compatible fork";
-    homepage = "https://pypi.python.org/pypi/jsonrpclib-pelix/";
+    homepage = "https://pypi.org/project/jsonrpclib-pelix/";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };

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

@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Documentation builder";
-    homepage = "https://pypi.python.org/pypi/manuel";
+    homepage = "https://pypi.org/project/manuel/";
     license = lib.licenses.zpl20;
   };
 }

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

@@ -43,6 +43,8 @@ buildPythonPackage rec {
 
   build-system = [ uv-build ];
 
+  pythonRelaxDeps = [ "jedi" ];
+
   dependencies = [
     click
     docutils

pkgs/development/python-modules/memory-profiler/default.nix

@@ -27,7 +27,7 @@ python.pkgs.buildPythonPackage rec {
       This is a python module for monitoring memory consumption of a process as
       well as line-by-line analysis of memory consumption for python programs.
     '';
-    homepage = "https://pypi.python.org/pypi/memory_profiler";
+    homepage = "https://pypi.org/project/memory_profiler/";
     license = lib.licenses.bsd3;
   };
 }

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

@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Minimalistic mocking library";
-    homepage = "https://pypi.python.org/pypi/MiniMock";
+    homepage = "https://pypi.org/project/MiniMock/";
     license = lib.licenses.mit;
     maintainers = [ ];
   };

pkgs/development/python-modules/modern-colorthief/default.nix

@@ -11,19 +11,19 @@
 
 buildPythonPackage rec {
   pname = "modern-colorthief";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "baseplate-admin";
     repo = "modern_colorthief";
     tag = version;
-    hash = "sha256-dXJbVXa/urMUL6YSVhQWcC3UMhv8uouaF8SQ39GdB1E=";
+    hash = "sha256-pBCL4ejBcqTWRxb5t/L4fiJLj8Jm8diwXE91RoQ/NSU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-ED8dDz5dHkiqbbzD+Q3Zk71Xck7SAdkt9enPgwzpWuQ=";
+    hash = "sha256-x9TxXE0BGXnTFCTbbctAKWlT37NE18IpevvTFzfb/G0=";
   };
 
   nativeBuildInputs = [

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

@@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: {
   ];
 
   meta = {
-    homepage = "http://pypi.python.org/pypi/numericalunits";
+    homepage = "http://pypi.org/pypi/numericalunits/";
     description = "Package that lets you define quantities with unit";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nickcao ];

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

@@ -18,7 +18,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = "https://pypi.python.org/pypi/pdfkit";
+    homepage = "https://pypi.org/project/pdfkit/";
     description = "Wkhtmltopdf python wrapper to convert html to pdf using the webkit rendering engine and qt";
     license = lib.licenses.mit;
   };

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

@@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: {
   doCheck = false;
 
   meta = {
-    homepage = "https://pypi.python.org/pypi/progressbar";
+    homepage = "https://pypi.org/project/progressbar/";
     description = "Text progressbar library for python";
     license = lib.licenses.lgpl3Plus;
     maintainers = [ ];

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

@@ -18,7 +18,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    homepage = "https://pypi.python.org/pypi/progressbar33";
+    homepage = "https://pypi.org/project/progressbar33/";
     description = "Text progressbar library for python";
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ twey ];

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

@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Test classes and test cases using decorators, execute test cases by command line, and get clear reports";
-    homepage = "https://pypi.python.org/pypi/ptest";
+    homepage = "https://pypi.org/project/ptest/";
     license = lib.licenses.asl20;
     mainProgram = "ptest";
   };

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

@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "PyMySQL dialect for SQL Alchemy";
-    homepage = "https://pypi.python.org/pypi/pymysql_sa";
+    homepage = "https://pypi.org/project/pymysql_sa/";
     license = lib.licenses.mit;
   };
 }

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

@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python Wrapper for Mac OS 10.8 Notification Center";
-    homepage = "https://pypi.python.org/pypi/pync";
+    homepage = "https://pypi.org/project/pync/";
     license = lib.licenses.mit;
     platforms = lib.platforms.darwin;
     maintainers = [ ];

pkgs/development/python-modules/pytest-catchlog/default.nix

@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   meta = {
     license = lib.licenses.mit;
-    homepage = "https://pypi.python.org/pypi/pytest-catchlog/";
+    homepage = "https://pypi.org/project/pytest-catchlog/";
     description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog";
   };
 }

pkgs/development/python-modules/pytest-flakes/default.nix

@@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: {
 
   meta = {
     license = lib.licenses.mit;
-    homepage = "https://pypi.python.org/pypi/pytest-flakes";
+    homepage = "https://pypi.org/project/pytest-flakes/";
     description = "Pytest plugin to check source code with pyflakes";
   };
 })

pkgs/development/python-modules/pytest-postgresql/default.nix

@@ -70,7 +70,7 @@ buildPythonPackage rec {
   doCheck = !stdenv.buildPlatform.isDarwin;
 
   meta = {
-    homepage = "https://pypi.python.org/pypi/pytest-postgresql";
+    homepage = "https://pypi.org/project/pytest-postgresql/";
     description = "Pytest plugin that enables you to test code on a temporary PostgreSQL database";
     changelog = "https://github.com/dbfixtures/pytest-postgresql/blob/v${version}/CHANGES.rst";
     license = lib.licenses.lgpl3Plus;

pkgs/development/python-modules/pytest-quickcheck/default.nix

@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   meta = {
     license = lib.licenses.asl20;
-    homepage = "https://pypi.python.org/pypi/pytest-quickcheck";
+    homepage = "https://pypi.org/project/pytest-quickcheck/";
     description = "Pytest plugin to generate random data inspired by QuickCheck";
     maintainers = with lib.maintainers; [ onny ];
   };

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

@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   meta = {
     license = lib.licenses.mit;
-    homepage = "https://pypi.python.org/pypi/pytest-cache/";
+    homepage = "https://pypi.org/project/pytest-cache/";
     description = "Pytest plugin with mechanisms for caching across test runs";
   };
 }

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

@@ -63,7 +63,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python bindings for the remote Jenkins API";
-    homepage = "https://pypi.python.org/pypi/python-jenkins";
+    homepage = "https://pypi.org/project/python-jenkins/";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ gador ];
   };

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

@@ -7,17 +7,18 @@
   replaceVars,
   file,
   pytestCheckHook,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "python-magic";
   version = "0.4.27";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ahupp";
     repo = "python-magic";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-fZ+5xJ3P0EYK+6rQ8VzXv2zckKfEH5VUdISIR6ybIfQ=";
   };
 
@@ -43,6 +44,8 @@ buildPythonPackage rec {
     ./fix-parquet-test.patch
   ];
 
+  build-system = [ setuptools ];
+
   preCheck = ''
     export LC_ALL=en_US.UTF-8
   '';
@@ -59,4 +62,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

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

@@ -27,7 +27,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    homepage = "http://pypi.python.org/pypi/random2";
+    homepage = "http://pypi.org/pypi/random2/";
     description = "Python 3 compatible Python 2 `random` Module";
     license = lib.licenses.psfl;
   };

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

@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Import exceptions from potentially bundled packages in requests";
-    homepage = "https://pypi.python.org/pypi/requestsexceptions";
+    homepage = "https://pypi.org/project/requestsexceptions/";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ makefu ];
     platforms = lib.platforms.all;

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

@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   doCheck = false;
   meta = {
-    homepage = "https://pypi.python.org/pypi/rfc3987";
+    homepage = "https://pypi.org/project/rfc3987/";
     license = lib.licenses.gpl3Plus;
     description = "Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)";
     maintainers = with lib.maintainers; [ vanschelven ];

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

@@ -2,6 +2,7 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+  pythonAtLeast,
   poetry-core,
   lxml,
   docopt-ng,
@@ -43,6 +44,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = lib.optionals (pythonAtLeast "3.14") [
+    # pathname2url now emits RFC 1738 authority-prefixed file URLs for absolute paths
+    "test_file_url_roundtrip"
+  ];
+
   pythonImportsCheck = [ "rnginline" ];
 
   meta = {

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

@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Integer to Roman numerals converter";
     changelog = "https://github.com/zopefoundation/roman/blob/${finalAttrs.version}/CHANGES.rst";
-    homepage = "https://pypi.python.org/pypi/roman";
+    homepage = "https://pypi.org/project/roman/";
     license = lib.licenses.psfl;
     maintainers = with lib.maintainers; [ sigmanificient ];
     mainProgram = "roman";

pkgs/development/python-modules/salmon-mail/default.nix

@@ -23,6 +23,11 @@ buildPythonPackage rec {
     hash = "sha256-ysBO/ridfy7YPoTsVwAxar9UvfM/qxrx2dp0EtDNLvE=";
   };
 
+  patches = [
+    # Fix test_main expecting exit code 0 from click group with no args (click 8.2 returns 2).
+    ./test-main-click-8.2-exit-code.patch
+  ];
+
   nativeCheckInputs = [
     jinja2
     unittestCheckHook

pkgs/development/python-modules/salmon-mail/test-main-click-8.2-exit-code.patch

@@ -0,0 +1,12 @@
+--- a/tests/test_command.py
++++ b/tests/test_command.py
+@@ -48,7 +48,8 @@
+     def test_main(self):
+         runner = CliRunner()
+         result = runner.invoke(commands.main)
+-        self.assertEqual(result.exit_code, 0)
++        # click 8.2 changed the exit code when no_args_is_help displays help: 0 -> 2.
++        self.assertEqual(result.exit_code, 2)
+
+     @patch('salmon.queue.Queue')
+     def test_queue_command(self, MockQueue):

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

@@ -51,7 +51,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python subprocess interface";
-    homepage = "https://pypi.python.org/pypi/sh/";
+    homepage = "https://pypi.org/project/sh/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ siriobalmelli ];
   };

pkgs/development/python-modules/solidpython2/difftool_tests.patch

@@ -2,7 +2,16 @@ diff --git a/tests/examples_test.py b/tests/examples_test.py
 index 77204fd..9784389 100644
 --- a/tests/examples_test.py
 +++ b/tests/examples_test.py
-@@ -48,14 +48,19 @@ class ExamplesTest(unittest.TestCase):
+@@ -41,6 +41,8 @@ class ExamplesTest(unittest.TestCase):
+                 continue
+             if f.stem.endswith(".x"):
+                 continue
++            if f.stem.startswith("18-"):
++                continue
+
+             test_scad_file = root / "tests" / "examples_scad" \
+                              / f.with_suffix('.scad').name
+@@ -48,14 +50,19 @@ class ExamplesTest(unittest.TestCase):
              subprocess.check_call(["python3", f.as_posix()])
              # copy generated scad file to examples_scad/
              copyWithRelativeIncludes(f.with_suffix(".scad"), test_scad_file)

pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix

@@ -27,6 +27,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-ZTR+s6a/++xXrLMtfFRmSmAeMWa/1de12ukxfsx85g4=";
   };
 
+  patches = [
+    # sphinx.testing.path.path was removed in Sphinx 8; use pathlib.Path.
+    ./sphinx-8-testing-path.patch
+  ];
+
   nativeBuildInputs = [ flit-core ];
 
   propagatedBuildInputs = [
@@ -34,8 +39,6 @@ buildPythonPackage (finalAttrs: {
     sphinx
   ];
 
-  pythonImportsCheck = [ "sphinx_jupyterbook_latex" ];
-
   nativeCheckInputs = [
     click
     myst-parser
@@ -47,6 +50,14 @@ buildPythonPackage (finalAttrs: {
     defusedxml
   ];
 
+  disabledTests = [
+    "test_jblatex_show_tocs"
+    "test_build_no_ext"
+    "test_build_with_ext"
+  ];
+
+  pythonImportsCheck = [ "sphinx_jupyterbook_latex" ];
+
   meta = {
     description = "Latex specific features for jupyter book";
     homepage = "https://github.com/executablebooks/sphinx-jupyterbook-latex";

pkgs/development/python-modules/sphinx-jupyterbook-latex/sphinx-8-testing-path.patch

@@ -0,0 +1,23 @@
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -7,7 +7,6 @@ import pytest
+ from click.testing import CliRunner
+ import sphinx
+ import sphinx.config
+-from sphinx.testing.path import path
+ from sphinx.testing.util import SphinxTestApp
+ from sphinx import version_info as sphinx_version_info
+
+@@ -16,10 +15,10 @@ pytest_plugins = "sphinx.testing.fixtures"
+
+ @pytest.fixture
+ def rootdir(tmpdir):
+-    src = path(__file__).parent.abspath() / "roots"
++    src = Path(__file__).parent.resolve() / "roots"
+     dst = tmpdir.join("roots")
+     shutil.copytree(src, dst)
+-    roots = path(dst)
++    roots = Path(str(dst))
+     yield roots
+     shutil.rmtree(dst)
+

pkgs/development/python-modules/std-uritemplate/default.nix

@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "std-uritemplate";
-  version = "2.0.8";
+  version = "2.0.10";
   pyproject = true;
 
   src = fetchPypi {
     pname = "std_uritemplate";
     inherit version;
-    hash = "sha256-E4zv8sW/7ximUDcqXoyC/n94DIcjVRPebDQvtffhg0c=";
+    hash = "sha256-NQSKMiIXrtl2b9/+WmnwYy9zGVd6SiZSaHYc1P+jIF4=";
   };
 
   build-system = [ poetry-core ];

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

@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Console colouring for python";
-    homepage = "https://pypi.python.org/pypi/python-termstyle/0.1.10";
+    homepage = "https://pypi.org/project/python-termstyle/";
     license = lib.licenses.bsdOriginal;
   };
 }

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

@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "Database of test results which can be used as part of developer workflow";
     mainProgram = "testr";
-    homepage = "https://pypi.python.org/pypi/testrepository";
+    homepage = "https://pypi.org/project/testrepository/";
     license = lib.licenses.bsd2;
   };
 }

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

@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Pure Python implementation of SSL and TLS";
-    homepage = "https://pypi.python.org/pypi/tlslite";
+    homepage = "https://pypi.org/project/tlslite/";
     license = lib.licenses.bsd3;
   };
 }