Merge master into staging-next

2026-09-30 03:39:59 +00:00 · 2026-09-22 06:15:41 +00:00
parent 3e9f9df37d a85fa128d1
commit 054ea70695
34 changed files with 320 additions and 236 deletions
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -7,7 +7,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "automatic-timezoned";
-  version = "2.0.158";
+  version = "2.0.159";

  __structuredAttrs = true;

@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "maxbrunet";
    repo = "automatic-timezoned";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-LVkScvoYPog0u1wfRheKT15DicyKc/aIBeye3ZVjHy4=";
+    hash = "sha256-ZxYiRYIttEk+ypTOiLMl0FGl/AOdoc25pNwE4Voe8YA=";
  };

-  cargoHash = "sha256-OS+FDdj6tfgstOQl8I/jzpEFH1AzCtzEFQASKEuN6hY=";
+  cargoHash = "sha256-4heCkeHIZUUAflnYKaxSn5qnUqqO+XbX94pXHDRDUiY=";

  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;
--- a/pkgs/by-name/cl/clerk/package.nix
+++ b/pkgs/by-name/cl/clerk/package.nix
@@ -1,100 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  fzf,
-  installShellFiles,
-  libnotify,
-  makeWrapper,
-  mpc,
-  perlPackages,
-  rofi,
-  stdenv,
-  tmux,
-  unstableGitUpdater,
-  util-linux,
-}:
-
-stdenv.mkDerivation {
-  pname = "clerk";
-  version = "0-unstable-2024-02-20";
-
-  src = fetchFromGitHub {
-    owner = "carnager";
-    repo = "clerk";
-    rev = "a3c4a0b88597e8194a5b29a20bc9eab1a12f4de9";
-    hash = "sha256-UlACMlH4iYj1l/GIpBf6Pb7MuRHWlgxLPgAqzc+Zol8=";
-  };
-
-  nativeBuildInputs = [
-    installShellFiles
-    makeWrapper
-  ];
-
-  buildInputs = with perlPackages; [
-    perl
-    DataMessagePack
-    DataSectionSimple
-    ConfigSimple
-    TryTiny
-    IPCRun
-    HTTPDate
-    FileSlurper
-    ArrayUtils
-    NetMPD
-  ];
-
-  dontBuild = true;
-
-  strictDeps = true;
-
-  postPatch = ''
-    substituteInPlace clerk_rating_client.service \
-      --replace "/usr" "$out"
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mv clerk.pl clerk
-    installBin clerk clerk_rating_client
-    install -D clerk_rating_client.service $out/lib/systemd/user/clerk_rating_client.service
-
-    runHook postInstall
-  '';
-
-  postFixup =
-    let
-      binPath = lib.makeBinPath [
-        fzf
-        libnotify
-        mpc
-        rofi
-        tmux
-        util-linux
-      ];
-    in
-    ''
-      for f in clerk clerk_rating_client; do
-        wrapProgram $out/bin/$f \
-          --prefix PATH : "${binPath}" \
-          --set PERL5LIB $PERL5LIB
-      done
-    '';
-
-  passthru.updateScript = unstableGitUpdater {
-    url = "https://github.com/carnager/clerk.git";
-    hardcodeZeroVersion = true;
-  };
-
-  meta = {
-    homepage = "https://github.com/carnager/clerk";
-    description = "MPD client based on rofi/fzf";
-    license = lib.licenses.mit;
-    mainProgram = "clerk";
-    maintainers = with lib.maintainers; [
-      anderspapitto
-      wineee
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -8,7 +8,7 @@
 }:
 buildGo127Module (finalAttrs: {
  pname = "jjui";
-  version = "0.10.10";
+  version = "0.10.11";
  __structuredAttrs = true;
  strictDeps = true;

@@ -16,10 +16,10 @@ buildGo127Module (finalAttrs: {
    owner = "idursun";
    repo = "jjui";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-bNwWbQq76RztLIiu/uYtHwRvg6H3x59ASCiFRKBib04=";
+    hash = "sha256-dHw1imeAenwa1/+bgcpS9LUs59UlJDS5LAujoIabVH0=";
  };

-  vendorHash = "sha256-T+uv54h89ul0O30HXsngUAIEEfD52bS+zZagCpn8JBU=";
+  vendorHash = "sha256-gHfE924uFXtSyRbt2uxK+1/lU04aC1wCgoHWJ3gE7xo=";

  excludedPackages = [
    # docker-based pty tests
--- a/pkgs/by-name/ko/koka/package.nix
+++ b/pkgs/by-name/ko/koka/package.nix
@@ -9,13 +9,13 @@
 }:

 let
-  version = "3.2.3";
+  version = "3.2.9";

  src = fetchFromGitHub {
    owner = "koka-lang";
    repo = "koka";
    tag = "v${version}";
-    hash = "sha256-sbyiY5zZuVyul98y5xwfxp7kIzeojdJWxDf6zjWnLrI=";
+    hash = "sha256-A2SwpVoRXAJdLzB/1oCSSPySsGnFzHOIaPseq3QAGek=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/me/megasync/package.nix
+++ b/pkgs/by-name/me/megasync/package.nix
@@ -34,13 +34,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "megasync";
-  version = "6.5.1.0";
+  version = "6.6.2.0";

  src = fetchFromGitHub rec {
    owner = "meganz";
    repo = "MEGAsync";
    tag = "v${finalAttrs.version}_Linux";
-    hash = "sha256-SkLh2YmXCzrVJs01FhqrSIeeacJCB2KPu61fKoZ/26s=";
+    hash = "sha256-q3eaq3oZ1SUiZhUoML31GWjWsR8nQm9ec0tEa+AwrXg=";
    fetchSubmodules = false; # DesignTokensImporter cannot be fetched, see #1010 in github:meganz/megasync
    leaveDotGit = true;
    postFetch = ''
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -60,7 +60,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "models-dev";
-  version = "sdk-v0.0.5-unstable-2026-08-31";
+  version = "sdk-v0.0.5-unstable-2026-09-22";

  __structuredAttrs = true;
  strictDeps = true;
@@ -68,8 +68,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "anomalyco";
    repo = "models.dev";
-    rev = "eda98d420a05fbc3d7c87a8805985d24b2c2b79b";
-    hash = "sha256-YPf6aYtQ4rCosltrTILPf/2E002IzaApTGuCqQZzM+0=";
+    rev = "d0a0af81e26a783730ba502b6fbaf7b9ec52714b";
+    hash = "sha256-crR+erCZFBe2pUIHcoT6MWJfJSd7hXWCj1sJ8a1YDJo=";
  };

  nativeBuildInputs = [ bun ];
--- a/pkgs/by-name/pd/pdfium/clang-arm64-target.patch
+++ b/pkgs/by-name/pd/pdfium/clang-arm64-target.patch
@@ -1,15 +1,12 @@
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 58d3a1788e6d2..38f364c6b471d 100644
--- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -1349,8 +1349,8 @@ config("compiler_cpu_abi") {
-       ]
-     } else if (current_cpu == "arm64") {
-       if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device) {
-        cflags += [ "--target=aarch64-linux-gnu" ]
-        ldflags += [ "--target=aarch64-linux-gnu" ]
-+        cflags += [ "--target=aarch64-unknown-linux-gnu" ]
-+        ldflags += [ "--target=aarch64-unknown-linux-gnu" ]
-       }
-       if (target_os == "chromeos" && cros_target_cpu_arch != "" &&
-           is_a_target_toolchain) {
+--- a/build/config/compiler_cpu_abi.gn
+++ b/build/config/compiler_cpu_abi.gn
+@@ -85,8 +85,8 @@
+   } else if (current_cpu == "arm64") {
+     if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device) {
+-      cpu_abi_cflags += [ "--target=aarch64-linux-gnu" ]
+-      cpu_abi_ldflags += [ "--target=aarch64-linux-gnu" ]
+      cpu_abi_cflags += [ "--target=aarch64-unknown-linux-gnu" ]
+      cpu_abi_ldflags += [ "--target=aarch64-unknown-linux-gnu" ]
+     }
+     if (target_os == "chromeos" && cros_target_cpu_arch != "" &&
+         is_a_target_toolchain) {
--- a/pkgs/by-name/pd/pdfium/clang-pre-23-compat.patch
+++ b/pkgs/by-name/pd/pdfium/clang-pre-23-compat.patch
@@ -1,5 +1,19 @@
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
+@@ -589,13 +589,5 @@
+     # Flags for diagnostics.
+     cflags += [ "-fcolor-diagnostics" ]
+-    if (!is_wasm) {
+-      if (!is_win) {
+-        cflags += [ "-fdiagnostics-show-inlining-chain" ]
+-      } else {
+-        # Combine after https://github.com/llvm/llvm-project/pull/192241
+-        cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
+-      }
+-    }
+     if (diagnostics_print_source_range_info && !is_win) {
+       cflags += [ "-fdiagnostics-print-source-range-info" ]
+     }
@@ -613,12 +613,6 @@
       ]
     }
@@ -13,15 +27,20 @@

     # TODO(hans): Remove this once Clang generates better optimized debug info
     # by default. https://crbug.com/765793
-@@ -1881,11 +1875,6 @@
-       "-fsanitize=array-bounds",
-       "-fsanitize-trap=array-bounds",
-
-      # Some code users feature detection to determine if UBSAN (or any
-      # sanitizer) is enabled, they then do expensive debug like operations. We
-      # want to suppress this behaviour since we want to keep performance costs
-      # as low as possible while having these checks.
-      "-fsanitize-ignore-for-ubsan-feature=array-bounds",
-
-       # Because we've enabled array-bounds sanitizing we also want to suppress
-       # the related warning about "unsafe-buffer-usage-in-static-sized-array",
+--- a/build/config/sanitizers/sanitizers.gni
+++ b/build/config/sanitizers/sanitizers.gni
+@@ -543,14 +543,7 @@
+       cflags = [
+         "-fsanitize=${invoker.sanitizer}",
+         "-fsanitize-trap=${invoker.sanitizer}",
+-
+-        # Prevents `__has_feature(undefined_behavior_sanitizer)`
+-        # from evaluating true. Configs defined here are intended to
+-        # be usable even in release builds, i.e. as widely as possible.
+-        # It's important not to have full-on UBSan workarounds activate
+-        # just because we built support for a specific sanitizer.
+-        "-fsanitize-ignore-for-ubsan-feature=${invoker.sanitizer}",
+       ]
+       if (defined(invoker.cflags)) {
+         cflags += invoker.cflags
+       }
--- a/pkgs/by-name/pd/pdfium/darwin-27-failing-embedder-tests.txt
+++ b/pkgs/by-name/pd/pdfium/darwin-27-failing-embedder-tests.txt
@@ -0,0 +1,77 @@
+CPDFSecurityHandlerEmbedderTest.Bug1124998
+CPDFSecurityHandlerEmbedderTest.OwnerPasswordVersion2Latin1
+CPDFSecurityHandlerEmbedderTest.OwnerPasswordVersion2UTF8
+CPDFSecurityHandlerEmbedderTest.OwnerPasswordVersion3Latin1
+CPDFSecurityHandlerEmbedderTest.OwnerPasswordVersion3UTF8
+CPDFSecurityHandlerEmbedderTest.OwnerPasswordVersion5Latin1
+CPDFSecurityHandlerEmbedderTest.OwnerPasswordVersion5UTF8
+CPDFSecurityHandlerEmbedderTest.OwnerPasswordVersion6Latin1
+CPDFSecurityHandlerEmbedderTest.OwnerPasswordVersion6UTF8
+CPDFSecurityHandlerEmbedderTest.PasswordAfterGenerateSave
+CPDFSecurityHandlerEmbedderTest.UserPasswordVersion2Latin1
+CPDFSecurityHandlerEmbedderTest.UserPasswordVersion2UTF8
+CPDFSecurityHandlerEmbedderTest.UserPasswordVersion3Latin1
+CPDFSecurityHandlerEmbedderTest.UserPasswordVersion3UTF8
+CPDFSecurityHandlerEmbedderTest.UserPasswordVersion5Latin1
+CPDFSecurityHandlerEmbedderTest.UserPasswordVersion5UTF8
+CPDFSecurityHandlerEmbedderTest.UserPasswordVersion6Latin1
+CPDFSecurityHandlerEmbedderTest.UserPasswordVersion6UTF8
+FPDFAnnotEmbedderTest.AddAndModifyImage
+FPDFAnnotEmbedderTest.AddAndModifyPath
+FPDFAnnotEmbedderTest.AddAndModifyText
+FPDFAnnotEmbedderTest.AddAndSaveLinkAnnotation
+FPDFAnnotEmbedderTest.AnnotationBorderRendering
+FPDFAnnotEmbedderTest.FocusableAnnotRendering
+FPDFAnnotEmbedderTest.GetSetStringValue
+FPDFAnnotEmbedderTest.ModifyRectQuadpointsWithAP
+FPDFAnnotEmbedderTest.SetFontColor
+FPDFEditEmbedderTest.AddExistingMarkCompressedStream
+FPDFEditEmbedderTest.AddMarkCompressedStream
+FPDFEditEmbedderTest.AddMarkedText
+FPDFEditEmbedderTest.AddMarkedTextWithFloat
+FPDFEditEmbedderTest.AddStandardFontText
+FPDFEditEmbedderTest.AddStandardFontText2
+FPDFEditEmbedderTest.AddTrueTypeFontText
+FPDFEditEmbedderTest.Bug1574
+FPDFEditEmbedderTest.Bug1893
+FPDFEditEmbedderTest.Bug410996566
+FPDFEditEmbedderTest.Bug461845674
+FPDFEditEmbedderTest.GetAndSetMatrixForFormWithText
+FPDFEditEmbedderTest.ModifyFormObject
+FPDFEditEmbedderTest.PathOnTopOfText
+FPDFEditEmbedderTest.RemoveAllFromStream
+FPDFEditEmbedderTest.RemoveExistingPageObjectSplitStreamsLonely
+FPDFEditEmbedderTest.RemoveExistingPageObjectSplitStreamsNotLonely
+FPDFEditEmbedderTest.RemoveFirstFromSingleStream
+FPDFEditEmbedderTest.RemoveLastFromSingleStream
+FPDFEditEmbedderTest.RemoveMarkedObjectsPrime
+FPDFEditEmbedderTest.RemoveTextObject
+FPDFEditEmbedderTest.RemoveTextObjectWithTwoPagesSharingContentArrayAndResources
+FPDFEditEmbedderTest.RemoveTextObjectWithTwoPagesSharingContentStreamAndResources
+FPDFEditEmbedderTest.RemoveTextObjectWithTwoPagesSharingResourcesDict
+FPDFEditEmbedderTest.SetPositions
+FPDFEditEmbedderTest.SetText
+FPDFEditEmbedderTest.SetTextKeepClippingPath
+FPDFEditEmbedderTest.SetTextRenderMode
+FPDFFlattenEmbedderTest.Bug861842
+FPDFFlattenEmbedderTest.Bug889099
+FPDFFormFillComboBoxFormEmbedderTest.FormComboBoxBiDiLiveEdit
+FPDFFormFillEmbedderTest.Bug1302455EditBothForms
+FPDFFormFillEmbedderTest.Bug1302455EditFirstForm
+FPDFFormFillEmbedderTest.Bug1302455EditSecondForm
+FPDFFormFillEmbedderTest.FormText
+FPDFFormFillEmbedderTest.RemoveFormFieldHighlight
+FPDFFormFillTextFormEmbedderTest.FormTextFieldBiDiLiveEdit
+FPDFPPOEmbedderTest.ImportWithZeroLengthStream
+FPDFParserDecodeEmbedderTest.Bug455199
+FPDFProgressiveRenderEmbedderTest.RenderAnnotWithPause
+FPDFProgressiveRenderEmbedderTest.RenderFormsWithPause
+FPDFProgressiveRenderEmbedderTest.RenderHighlightWithColorScheme
+FPDFProgressiveRenderEmbedderTest.RenderHighlightWithColorSchemeAndConvertFillToStroke
+FPDFProgressiveRenderEmbedderTest.RenderStampWithColorScheme
+FPDFProgressiveRenderEmbedderTest.RenderTextWithColorScheme
+FPDFProgressiveRenderEmbedderTest.RenderWithPause
+FPDFProgressiveRenderEmbedderTest.RenderWithoutPause
+FPDFSaveWithFontSubsetEmbedderTest.SaveWithSubsetMultipleFontsMultipleTexts
+FPDFViewEmbedderTest.RenderBug664284WithNoNativeText
+FPDFViewEmbedderTest.RenderHelloWorldWithFlags
--- a/pkgs/by-name/pd/pdfium/darwin-embedder-test-pixel-tolerance.patch
+++ b/pkgs/by-name/pd/pdfium/darwin-embedder-test-pixel-tolerance.patch
@@ -1,13 +1,15 @@
 --- a/testing/embedder_test.cpp
 +++ b/testing/embedder_test.cpp
-@@ -1180,7 +1180,9 @@ void EmbedderTest::CompareBitmapWithExpectationSuffix(
-
+@@ -1155,6 +1155,11 @@ void EmbedderTest::CompareBitmapWithExpectationSuffix(
     SCOPED_TRACE(testing::Message()
                  << "CompareBitmapWithExpectationSuffix() with " << png_path);
-    CompareBitmapToPngFile(bitmap, png_path, max_pixel_per_channel_delta);
-+    CompareBitmapToPngFile(
-+        bitmap, png_path,
-+        std::max(max_pixel_per_channel_delta, GetPlatformMaxPixelDelta()));
+-    CompareBitmapToPngFile(bitmap, png_path, options);
+    DiffOptions adjusted_options = options;
+#if BUILDFLAG(IS_MAC)
+    adjusted_options.max_pixel_per_channel_delta =
+        std::max(adjusted_options.max_pixel_per_channel_delta, 1);
+#endif
+    CompareBitmapToPngFile(bitmap, png_path, adjusted_options);
     if (EmbedderTestEnvironment::GetInstance()->write_pngs()) {
       WriteBitmapToPng(bitmap, png_path);
     }
--- a/pkgs/by-name/pd/pdfium/package.nix
+++ b/pkgs/by-name/pd/pdfium/package.nix
@@ -68,6 +68,14 @@ let
        };
      };

+      "src/third_party/dragonbox/src" = {
+        fetcher = "fetchFromGitiles";
+        args = {
+          url = "https://chromium.googlesource.com/external/github.com/jk-jeon/dragonbox";
+          inherit (sources.dragonbox) rev hash;
+        };
+      };
+
      "src/third_party/fast_float/src" = {
        fetcher = "fetchFromGitiles";
        args = {
@@ -171,6 +179,10 @@ let
    "RetainPtr.SetContains"
  ];

+  darwin27FailingEmbedderTests = lib.filter (test: test != "") (
+    lib.splitString "\n" (builtins.readFile ./darwin-27-failing-embedder-tests.txt)
+  );
+
  disabledEmbedderTests = [
    # These assert exact serialized PDF and font-subset output. With system
    # libraries, output differs from upstream's in-tree stack; known
@@ -181,12 +193,17 @@ let
    # These render tests also differ from upstream's in-tree stack. The known
    # FreeType difference is the system autofit/autohinting configuration.
    "FPDFViewEmbedderTest.RenderAnnotsGrayScale"
+    # The embedded CID font renders with different edge shades from the
+    # shared PNG reference on both Linux and macOS.
+    "FPDFEditEmbedderTest.SetPositionsVertical"
  ]
  ++ lib.optionals stdenv.hostPlatform.isLinux [
    "FPDFProgressiveRenderEmbedderTest.RenderHighlightWithColorScheme"
    "FPDFProgressiveRenderEmbedderTest.RenderHighlightWithColorSchemeAndConvertFillToStroke"
    "FPDFAnnotEmbedderTest.ModifyRectQuadpointsWithAP"
-  ];
+  ]
+  # Changes to CoreGraphics rendering broke these tests when run on macOS 27+.
+  ++ lib.optionals stdenv.hostPlatform.isDarwin darwin27FailingEmbedderTests;

  mkDisabledGtestFilter = disabledTests: "-${lib.concatStringsSep ":" disabledTests}";
  unitTestFilter = mkDisabledGtestFilter disabledUnitTests;
@@ -264,6 +281,10 @@ stdenv.mkDerivation (finalAttrs: {
  };

  postPatch = ''
+    substituteInPlace .gn \
+      --replace-fail 'script_executable = "//third_party/cpython3/host/bin/python3"' \
+        'script_executable = "${lib.getExe buildPackages.python3}"'
+
    substituteInPlace BUILD.gn \
      --replace-fail 'component("pdfium")' 'shared_library("pdfium")'

--- a/pkgs/by-name/pd/pdfium/pkg-config-absolute-paths.patch
+++ b/pkgs/by-name/pd/pdfium/pkg-config-absolute-paths.patch
@@ -1,14 +1,14 @@
 --- a/build/config/linux/pkg-config.py
 +++ b/build/config/linux/pkg-config.py
-@@ -96,8 +96,10 @@
-
+@@ -97,9 +97,11 @@
 def RewritePath(path, strip_prefix, sysroot):
-   """Rewrites a path by stripping the prefix and prepending the sysroot."""
-   if os.path.isabs(path) and not path.startswith(sysroot):
-    if path.startswith(strip_prefix):
-+    if strip_prefix and path.startswith(strip_prefix):
-       path = path[len(strip_prefix):]
-+    elif path != '/usr' and not path.startswith('/usr/'):
-+      return path
-     path = path.lstrip('/')
-     return os.path.join(sysroot, path)
+     """Rewrites a path by stripping the prefix and prepending the sysroot."""
+     if os.path.isabs(path) and not path.startswith(sysroot):
+-        if path.startswith(strip_prefix):
+        if strip_prefix and path.startswith(strip_prefix):
+             path = path[len(strip_prefix) :]
+        elif path != '/usr' and not path.startswith('/usr/'):
+            return path
+         path = path.lstrip('/')
+         return os.path.join(sysroot, path)
+     else:
--- a/pkgs/by-name/pd/pdfium/pkg-config-non-linux.patch
+++ b/pkgs/by-name/pd/pdfium/pkg-config-non-linux.patch
@@ -1,19 +1,18 @@
 --- a/build/config/linux/pkg-config.py
 +++ b/build/config/linux/pkg-config.py
-@@ -122,16 +122,6 @@
-                     dest='version_as_components')
-   (options, args) = parser.parse_args()
+@@ -143,15 +143,5 @@
+     (options, args) = parser.parse_args()

-  # If this is run on non-Linux platforms, just return nothing and indicate
-  # success. This allows us to "kind of emulate" a Linux build from other
-  # platforms.
-  if "linux" not in sys.platform:
-    if options.libdir:
-      sys.stdout.write("")
-      return 0
-    print("[[],[],[],[],[]]")
-    return 0
+-    # If this is run on non-Linux platforms, just return nothing and indicate
+-    # success. This allows us to "kind of emulate" a Linux build from other
+-    # platforms.
+-    if "linux" not in sys.platform:
+-        if options.dridriverdir or options.libdir:
+-            sys.stdout.write("")
+-            return 0
+-        print("[[],[],[],[],[]]")
+-        return 0
 -
-   # Make a list of regular expressions to strip out.
-   strip_out = []
-   if options.strip_out != None:
+     # Make a list of regular expressions to strip out.
+     strip_out = []
+     if options.strip_out != None:
--- a/pkgs/by-name/pd/pdfium/sources.json
+++ b/pkgs/by-name/pd/pdfium/sources.json
@@ -1,34 +1,38 @@
 {
  "version": {
-    "major": 148,
+    "major": 156,
    "minor": 0,
-    "build": 7749,
+    "build": 8066,
    "patch": 2
  },
  "pdfium": {
-    "hash": "sha256-RMkVffwjC8W4YwjlssNIWX1n2CAl97kE7z11yuzMX2o="
+    "hash": "sha256-gABzgxJYoRvkGyWi9EwHGLq+gmdzJsQyzOeXKwbcx/0="
  },
  "build": {
-    "rev": "c9202dd8ca1d4255bd9e505988b945746ddb378a",
-    "hash": "sha256-ovdPiQ4i2sFzjiwG8vZAWVaFQ03OXNB9ZdUULU2/q9g="
+    "rev": "2cd94c0abeada712aeea6906d99021913c9fc28d",
+    "hash": "sha256-ZKYkK/h2Ll8Q2zp3CJlc+mZuZe6b55fwh7xUkT1x27U="
  },
  "chromiumBuildtools": {
-    "hash": "sha256-BvGCdJ3EgUZX6MC3jf86YNl4LzUxpxiptCEBv3bqBIo="
+    "hash": "sha256-hCMtQADZX2xHvnyZneNRuUEZlunLqyLp7cshudfPLuw="
  },
  "abseil": {
-    "rev": "2a7d49fc392cad55159d68d98aa3648bc89795d3",
-    "hash": "sha256-dz2DA+bw/QQcfI9d9AKP7dn0eW0aAnhH+RmSStKS/hY="
+    "rev": "435e7d977fb36fb47854a4c552c0706dad0bd7cf",
+    "hash": "sha256-khfl3Y7Q823BSBmQUgacU83HdODjhVRLY0pu4cGCoec="
+  },
+  "dragonbox": {
+    "rev": "beeeef91cf6fef89a4d4ba5e95d47ca64ccb3a44",
+    "hash": "sha256-j6swuGgYGfiFcK3iqd4EKTeU92rZHKTbF5T1fcak/ko="
  },
  "fastFloat": {
-    "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
-    "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ="
+    "rev": "34164f547b7df3f5d794ff67e9f885c36819ebfc",
+    "hash": "sha256-DOwDLnMwlXAP5SfDJuxhkmLmcBZ1wBvXEJr5RuHepp4="
  },
  "gtest": {
    "rev": "4fe3307fb2d9f86d19777c7eb0e4809e9694dde7",
    "hash": "sha256-gJhv3DQQSP5BQ6GmDobq42/Gkx4AbOg/ZS80bM0WpEw="
  },
  "generateShimHeaders": {
-    "hash": "sha256-tqhnqYoQeXUTN7OSSVwchpEkGJwhCUSk8TG8LUgrHdg="
+    "hash": "sha256-/ViuvxJjjJ4gixjoGu6GXxKX8iXSZuy3BL+Yi0GLVDQ="
  },
  "testFonts": {
    "rev": "7f51783942943e965cd56facf786544ccfc07713",
--- a/pkgs/by-name/pd/pdfium/thin-archive-no-lld.patch
+++ b/pkgs/by-name/pd/pdfium/thin-archive-no-lld.patch
@@ -1,13 +1,12 @@
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 877728afe3b..53a7f7e62d9 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -2596,7 +2596,7 @@
+@@ -2349,8 +2349,8 @@
 # 2. Remove the thin_archive config, so that the .a file actually contains all
 #    .o files, instead of just references to .o files in the build directoy
 config("thin_archive") {
-  if ((is_apple && use_lld) || (is_linux && !is_clang) || current_os == "aix") {
-+  if ((is_apple && use_lld) || (is_linux && (!is_clang || !use_lld)) || current_os == "aix") {
+-  if ((is_apple && use_lld) || (is_linux && !is_clang) || current_os == "aix" ||
+  if ((is_apple && use_lld) || (is_linux && (!is_clang || !use_lld)) || current_os == "aix" ||
+       current_os == "zos") {
     # The macOS and iOS linker ld64.ldd doesn't support thin archive without
     # symbol table, gcc on linux also throws the error `archive has no index`.
     # AIX does support -s option, not -S option.
--- a/pkgs/by-name/pd/pdfium/update.sh
+++ b/pkgs/by-name/pd/pdfium/update.sh
@@ -73,12 +73,13 @@ pdfium_src=$(jq -er '.storePath' <<< "$pdfium_prefetch")
 deps_file="$pdfium_src/DEPS"
 build_rev=$(extract_deps_rev "$deps_file" build_revision)
 abseil_rev=$(extract_deps_rev "$deps_file" abseil_revision)
+dragonbox_rev=$(extract_deps_rev "$deps_file" dragonbox_revision)
 fast_float_rev=$(extract_deps_rev "$deps_file" fast_float_revision)
 gtest_rev=$(extract_deps_rev "$deps_file" gtest_revision)
 test_fonts_rev=$(extract_deps_rev "$deps_file" test_fonts_revision)
 simdutf_rev=$(extract_deps_rev "$deps_file" simdutf_revision)

-for dep_var in build_rev abseil_rev fast_float_rev gtest_rev test_fonts_rev simdutf_rev; do
+for dep_var in build_rev abseil_rev dragonbox_rev fast_float_rev gtest_rev test_fonts_rev simdutf_rev; do
  if [[ -z ${!dep_var} ]]; then
    echo "failed to extract $dep_var from $deps_file" >&2
    exit 1
@@ -104,6 +105,7 @@ done
 build_hash=$(prefetch_archive_hash "${chromium_git_url}/chromium/src/build.git/+archive/${build_rev}.tar.gz")
 chromium_buildtools_hash=$(prefetch_archive_hash "${chromium_git_url}/chromium/src/+archive/refs/branch-heads/${target_version}/buildtools.tar.gz")
 abseil_hash=$(prefetch_archive_hash "${chromium_git_url}/chromium/src/third_party/abseil-cpp/+archive/${abseil_rev}.tar.gz")
+dragonbox_hash=$(prefetch_archive_hash "${chromium_git_url}/external/github.com/jk-jeon/dragonbox/+archive/${dragonbox_rev}.tar.gz")
 fast_float_hash=$(prefetch_archive_hash "${chromium_git_url}/external/github.com/fastfloat/fast_float/+archive/${fast_float_rev}.tar.gz")
 gtest_hash=$(prefetch_archive_hash "${chromium_git_url}/external/github.com/google/googletest/+archive/${gtest_rev}.tar.gz")
 generate_shim_headers_hash=$(prefetch_subdir_archive_hash "${chromium_git_url}/chromium/src/+archive/refs/branch-heads/${target_version}/tools/generate_shim_headers.tar.gz")
@@ -137,6 +139,8 @@ jq -n \
  --arg chromium_buildtools_hash "$chromium_buildtools_hash" \
  --arg abseil_rev "$abseil_rev" \
  --arg abseil_hash "$abseil_hash" \
+  --arg dragonbox_rev "$dragonbox_rev" \
+  --arg dragonbox_hash "$dragonbox_hash" \
  --arg fast_float_rev "$fast_float_rev" \
  --arg fast_float_hash "$fast_float_hash" \
  --arg gtest_rev "$gtest_rev" \
@@ -165,6 +169,10 @@ jq -n \
      rev: $abseil_rev,
      hash: $abseil_hash
    },
+    dragonbox: {
+      rev: $dragonbox_rev,
+      hash: $dragonbox_hash
+    },
    fastFloat: {
      rev: $fast_float_rev,
      hash: $fast_float_hash
--- a/pkgs/by-name/pd/pdfium/use-system-clang-runtime.patch
+++ b/pkgs/by-name/pd/pdfium/use-system-clang-runtime.patch
@@ -1,14 +1,12 @@
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 58d3a1788e6d2..bf834504367d7 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1989,13 +1989,3 @@ config("runtime_library") {
-  # Rust and C++ both provide intrinsics for LLVM to call for math operations. We
-  # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins
-  # library. The Rust symbols are marked as weak, so that they can be replaced by
-  # the C++ symbols. This config ensures the C++ symbols exist and are strong in
-  # order to cause that replacement to occur by explicitly linking in clang's
-  # compiler-rt library.
+@@ -1701,13 +1701,3 @@ config("runtime_library") {
+-  # Rust and C++ both provide intrinsics for LLVM to call for math operations.
+-  # We want to use the C++ intrinsics, not the ones in the Rust
+-  # compiler_builtins library. The Rust symbols are marked as weak, so that they
+-  # can be replaced by the C++ symbols. This config ensures the C++ symbols
+-  # exist and are strong in order to cause that replacement to occur by
+-  # explicitly linking in clang's compiler-rt library.
 -  if (is_clang && !(is_a_target_toolchain && is_cronet_build)) {
 -    configs += [ "//build/config/clang:compiler_builtins" ]
 -  }
--- a/pkgs/by-name/ts/tsukimi/package.nix
+++ b/pkgs/by-name/ts/tsukimi/package.nix
@@ -21,21 +21,24 @@
  versionCheckHook,
  libxml2,
  appstream,
+  blueprint-compiler,
+  glycin-loaders,
+  libglycin,
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "tsukimi";
-  version = "26.7.1";
+  version = "26.9.2";

  src = fetchFromGitHub {
    owner = "tsukinaha";
    repo = "tsukimi";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-PGd2dWmUfdOyBsfn2Jozb7tAxSy2sv8XOKL1K8FwuLE=";
+    hash = "sha256-qlkXQxae8rhDgIJk60NzD6yk6b71S8jTGuChcnW9VuM=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-lfDPrmCl+Fuf/AG8xiFv00HD76Wy63cBc9Iji7Cw2sw=";
+    hash = "sha256-Phwn2qBPVaGEyzaBHIg9vq8LEFI0DsSUWkHrpimjy30=";
  };

  nativeBuildInputs = [
@@ -49,6 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
    desktop-file-utils
    libxml2 # xmllint
    appstream # appstreamcli
+    blueprint-compiler
+    libglycin.patchVendorHook
  ];

  buildInputs = [
@@ -58,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
    openssl
    libepoxy
    dbus
+    libglycin
+    glycin-loaders
  ]
  ++ (with gst_all_1; [
    gstreamer
--- a/pkgs/by-name/wa/warpgate/package.nix
+++ b/pkgs/by-name/wa/warpgate/package.nix
@@ -39,16 +39,16 @@ rustPlatform.buildRustPackage (
  in
  {
    pname = "warpgate";
-    version = "0.28.4";
+    version = "0.29.0";

    src = fetchFromGitHub {
      owner = "warp-tech";
      repo = "warpgate";
      tag = "v${finalAttrs.version}";
-      hash = "sha256-BWfkStxPi4LucoADK1YwRZaQwObPtq08eEVK9XG7vfU=";
+      hash = "sha256-OXVFsscGU+euamUvgyisN2I3kH/SwSo+eag+S+3YW/w=";
    };

-    cargoHash = "sha256-TVNOCMmL8ICtQImA39jhlfCnghvV90NlRBdSol2MGtY=";
+    cargoHash = "sha256-zlECC2p2hs5w1zkKc8ikoMyVFp/jie2HsqXGDLAEW7E=";

    patches = [
      (replaceVars ./hardcode-version.patch { inherit (finalAttrs) version; })
--- a/pkgs/by-name/ya/yazi/plugins/git/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/git/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
  pname = "git.yazi";
-  version = "0-unstable-2026-09-01";
+  version = "0-unstable-2026-09-18";

  src = fetchFromGitHub {
    owner = "yazi-rs";
    repo = "plugins";
-    rev = "4dc7f1b6458c2578f4494f10d468c68c1082214f";
-    hash = "sha256-BSAOkL4H4LVMbTRFv4kzGGRpLgtKkfNTEsDH2EQ219Q=";
+    rev = "f703392df78b5fba5e8f9f1ad0b1cb6d3def9736";
+    hash = "sha256-O1yYAhsf7xMqUrTTSLac06WSxCvUQqedH3DWqGwn/Ok=";
  };

  meta = {
--- a/pkgs/by-name/ya/yazi/plugins/piper/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/piper/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
  pname = "piper.yazi";
-  version = "0-unstable-2026-09-01";
+  version = "0-unstable-2026-09-18";

  src = fetchFromGitHub {
    owner = "yazi-rs";
    repo = "plugins";
-    rev = "4dc7f1b6458c2578f4494f10d468c68c1082214f";
-    hash = "sha256-BSAOkL4H4LVMbTRFv4kzGGRpLgtKkfNTEsDH2EQ219Q=";
+    rev = "f703392df78b5fba5e8f9f1ad0b1cb6d3def9736";
+    hash = "sha256-O1yYAhsf7xMqUrTTSLac06WSxCvUQqedH3DWqGwn/Ok=";
  };

  meta = {
--- a/pkgs/by-name/ya/yazi/plugins/projects/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/projects/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
  pname = "projects.yazi";
-  version = "0-unstable-2026-07-11";
+  version = "0-unstable-2026-09-19";

  src = fetchFromGitHub {
    owner = "MasouShizuka";
    repo = "projects.yazi";
-    rev = "22a4006f531b7c8e71704f64e48feed659164104";
-    hash = "sha256-J3MM4Fc3+6P84OrC4DWqchSPbEOuzhEeO8rzNYXSZXQ=";
+    rev = "181ebafba6320244ffd132f0e234b2a523b5ee00";
+    hash = "sha256-pe1ygeaKtSRUkWhxpq3VMoVFUmqBbEGbO2dTbio6bcw=";
  };

  meta = {
--- a/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/vcs-files/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
  pname = "vcs-files.yazi";
-  version = "0-unstable-2026-09-09";
+  version = "0-unstable-2026-09-18";

  src = fetchFromGitHub {
    owner = "yazi-rs";
    repo = "plugins";
-    rev = "58c4f4e2f4835cc9bf6751f39e3f7c574fc7f55a";
-    hash = "sha256-kwf9+KXOL5JXGDoEGdtwq+JujP8GVoOwDgz76FBM3xk=";
+    rev = "f703392df78b5fba5e8f9f1ad0b1cb6d3def9736";
+    hash = "sha256-O1yYAhsf7xMqUrTTSLac06WSxCvUQqedH3DWqGwn/Ok=";
  };

  meta = {
--- a/pkgs/by-name/ya/yazi/plugins/zoom/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/zoom/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
  pname = "zoom.yazi";
-  version = "0-unstable-2026-09-09";
+  version = "0-unstable-2026-09-18";

  src = fetchFromGitHub {
    owner = "yazi-rs";
    repo = "plugins";
-    rev = "65255958371798cb82643f08ce739a1affc21f07";
-    hash = "sha256-QVGXSvkSF7U/mo3iVywxyF/Xj5aXD+wtKGBtXzdQyqo=";
+    rev = "f703392df78b5fba5e8f9f1ad0b1cb6d3def9736";
+    hash = "sha256-O1yYAhsf7xMqUrTTSLac06WSxCvUQqedH3DWqGwn/Ok=";
  };

  meta = {
--- a/pkgs/development/ocaml-modules/eio/default.nix
+++ b/pkgs/development/ocaml-modules/eio/default.nix
@@ -3,7 +3,7 @@
  ocaml,
  version ?
    if lib.versionAtLeast ocaml.version "5.2" then
-      "1.5"
+      "1.6"
    else if lib.versionAtLeast ocaml.version "5.1" then
      "1.2"
    else
@@ -36,9 +36,9 @@ let
        minimalOCamlVersion = "5.1";
        hash = "sha256-N5LpEr2NSUuy449zCBgl5NISsZcM8sHxspZsqp/WvEA=";
      };
-      "1.5" = {
+      "1.6" = {
        minimalOCamlVersion = "5.2";
-        hash = "sha256-fXDR9fsrcZC/GrKP/+snLaUf/m1snHyU4Ehfq987P9o=";
+        hash = "sha256-wfBJhrQBCUF2SUhj3eHKmykrWf3GeanXAj5VjYD7WxU=";
      };
    }
    ."${version}";
--- a/pkgs/development/ocaml-modules/ppx_deriving_hash/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_hash/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  fetchurl,
+  buildDunePackage,
+  cppo,
+  ppxlib,
+  ppx_deriving,
+  ounit2,
+}:
+
+let
+  param =
+    if lib.versionAtLeast ppxlib.version "0.36" then
+      {
+        version = "0.1.4";
+        hash = "sha256-5EYz9DwAdFW+KmE+9B+iTpsBvHJ9sMt3Dhamgz6oLUU=";
+      }
+    else
+      {
+        version = "0.1.2";
+        hash = "sha256-ss3OALD+9Dm5wtwgvQ0SSL7Cu0xWumwKmLBKPDh4Fa8=";
+      };
+in
+
+buildDunePackage (finalAttrs: {
+  pname = "ppx_deriving_hash";
+  inherit (param) version;
+
+  src = fetchurl {
+    url = "https://github.com/sim642/ppx_deriving_hash/releases/download/${finalAttrs.version}/ppx_deriving_hash-${finalAttrs.version}.tbz";
+    inherit (param) hash;
+  };
+
+  propagatedBuildInputs = [
+    ppxlib
+    ppx_deriving
+  ];
+
+  # The test suite only exists since 0.1.4.
+  doCheck = lib.versionAtLeast finalAttrs.version "0.1.4";
+  nativeCheckInputs = [ cppo ];
+  checkInputs = [ ounit2 ];
+
+  meta = {
+    homepage = "https://github.com/sim642/ppx_deriving_hash";
+    description = "OCaml PPX deriver for standard hash functions without extra dependencies";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ niols ];
+  };
+})
--- a/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/pkgs/development/ocaml-modules/uuseg/default.nix
@@ -9,7 +9,7 @@
  uucp,
  uutf,
  cmdliner,
-  version ? if lib.versionAtLeast ocaml.version "4.14" then "17.0.0" else "15.0.0",
+  version ? if lib.versionAtLeast ocaml.version "4.14" then "18.0.0" else "15.0.0",
  cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1",
 }:

@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
    url = "https://erratique.ch/software/uuseg/releases/uuseg-${finalAttrs.version}.tbz";
    hash =
      {
-        "17.0.0" = "sha256-Fn41ajEFbMv3LLkD+zqy76217/kWFS7q9jm9ubc6TI4=";
+        "18.0.0" = "sha256-bXzGAF6U+HH6B0TEzvPuB25fC+TlMcSu7wy4budLvRA=";
        "15.0.0" = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM=";
      }
      ."${finalAttrs.version}";
--- a/pkgs/development/python-modules/colcon-output/default.nix
+++ b/pkgs/development/python-modules/colcon-output/default.nix
@@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "colcon-output";
-  version = "0.2.14";
+  version = "0.2.15";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "colcon";
    repo = "colcon-output";
    tag = version;
-    hash = "sha256-Zt8ZG2SZAgS1iXMnu3b2dSoP9IzrwLwMUXVSJWqRV9w=";
+    hash = "sha256-kRMe4cg7ZUHAHdbyopJK61XQn7mPKpmbHj+qisrGO1E=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/munkres/default.nix
+++ b/pkgs/development/python-modules/munkres/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [ pytestCheckHook ];

  meta = {
-    homepage = "http://bmc.github.com/munkres/";
+    homepage = "https://software.clapper.org/munkres/";
    description = "Munkres algorithm for the Assignment Problem";
    license = lib.licenses.bsd3;
    maintainers = [ ];
--- a/pkgs/development/python-modules/prefect/default.nix
+++ b/pkgs/development/python-modules/prefect/default.nix
@@ -92,7 +92,7 @@

 buildPythonPackage (finalAttrs: {
  pname = "prefect";
-  version = "3.8.5";
+  version = "3.8.6";
  pyproject = true;

  # keeps list elements containing spaces intact, which disabledTests below needs
@@ -102,7 +102,7 @@ buildPythonPackage (finalAttrs: {
    owner = "PrefectHQ";
    repo = "prefect";
    tag = finalAttrs.version;
-    hash = "sha256-ZKPYdsTo/SaptGo3TiBiBZq64JCXPLJFztHg1KVNAPE=";
+    hash = "sha256-B9JWnAVZCGZADoO6TdgCpCVmFqDBeXpc6FFb1NzcA5E=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/urlobject/default.nix
+++ b/pkgs/development/python-modules/urlobject/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {

  meta = {
    description = "Python library for manipulating URLs (and some URIs) in a more natural way";
-    homepage = "http://zacharyvoase.github.com/urlobject";
+    homepage = "https://zacharyvoase.github.io/urlobject/";
    license = lib.licenses.unlicense;
    maintainers = with lib.maintainers; [ getchoo ];
  };
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -569,6 +569,7 @@ mapAliases {
  claude-code-acp = warnAlias "'claude-code-acp' has been renamed to 'claude-agent-acp'" claude-agent-acp; # Added 2026-03-31
  claude-code-bin = warnAlias "'claude-code-bin' has been merged into 'claude-code'" claude-code; # Added 2026-04-18
  clearlyU = clearly-u; # Added 2026-02-08
+  clerk = throw "'clerk' has been removed as the upstream repository has been archived"; # Added 2026-09-21
  cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
  cliairplay = throw "'cliairplay' has been removed because Music-Assistant switched fully to airplay-cli"; # Added 2026-07-31
  clima = throw "'clima' has been removed, as it has been unmaintained upstream since December 2024, use glow instead"; # Added 2026-01-01
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1825,6 +1825,8 @@ let

        ppx_deriving_encoding = callPackage ../development/ocaml-modules/ppx_deriving_encoding { };

+        ppx_deriving_hash = callPackage ../development/ocaml-modules/ppx_deriving_hash { };
+
        ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf { };

        ppx_deriving_qcheck = callPackage ../development/ocaml-modules/qcheck/ppx_deriving_qcheck.nix { };
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7490,7 +7490,7 @@ with self;
    };
    meta = {
      description = "Perl extension for the RIPEMD-160 Hash function";
-      homepage = "https://wiki.github.com/toddr/Crypt-RIPEMD160";
+      homepage = "https://github.com/cpan-authors/Crypt-RIPEMD160";
      license = with lib.licenses; [
        artistic1
        gpl1Plus
@@ -12530,7 +12530,7 @@ with self;
    propagatedBuildInputs = [ ArchiveZip ];
    meta = {
      description = "Create a new file in the Excel 2007+ XLSX format";
-      homepage = "https://jmcnamara.github.com/excel-writer-xlsx";
+      homepage = "https://jmcnamara.github.io/excel-writer-xlsx/";
      license = with lib.licenses; [
        artistic1
        gpl1Plus
@@ -17963,7 +17963,7 @@ with self;
    installPhase = "make install";
    meta = {
      description = "Change and print terminal line settings";
-      homepage = "https://wiki.github.com/toddr/IO-Stty";
+      homepage = "https://github.com/cpan-authors/IO-Stty";
      license = with lib.licenses; [
        artistic1
        gpl1Plus
@@ -30190,7 +30190,7 @@ with self;
    };
    meta = {
      description = "Base class for parsing regexes";
-      homepage = "https://wiki.github.com/toddr/Regexp-Parser";
+      homepage = "https://github.com/cpan-authors/Regexp-Parser";
      license = with lib.licenses; [
        artistic1
        gpl1Plus
@@ -30246,7 +30246,7 @@ with self;
    ];
    meta = {
      description = "Utility functions for REST applications";
-      homepage = "https://jaldhar.github.com/REST-Utils";
+      homepage = "https://jaldhar.github.io/REST-Utils/";
      license = with lib.licenses; [
        artistic1
        gpl1Plus