diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index 362130e5ba5f..643a6e510f1f 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -356,7 +356,7 @@ It is highly recommended to use a pinned version of pnpm (i.e., `pnpm_9` or `pnp
 +let
 +  # Optionally override pnpm to use a custom nodejs version
 +  # Make sure that the same nodejs version is referenced in nativeBuildInputs
-+  # pnpm = pnpm_10.override { nodejs = nodejs_20; };
++  # pnpm = pnpm_10.override { nodejs = nodejs-slim_22; };
 +in
  stdenv.mkDerivation (finalAttrs: {
    pname = "foo";
diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index ab63631ace2b..7b21f0092b8d 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -383,7 +383,7 @@ gnuradioMinimal.override {
 
 ### Breaking changes {#sec-nixpkgs-release-26.05-lib-breaking}
 
-- The `nodejs_latest` alias now points to `nodejs_25` instead of `nodejs_24`.
+- The `nodejs_latest` alias now points to `nodejs_26` instead of `nodejs_24`.
 
 - `nodejs-slim` no longer exposes a `corepack` executable, it has been moved to an ad-hoc output; to restore the previous behavior, `nodejs-slim.corepack` must be explicitely included.
 
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 85a354481d6d..afc9cb5d437c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -862,6 +862,13 @@
     githubId = 209175;
     name = "Alesya Huzik";
   };
+  Ai-Ya-Ya = {
+    email = "spg2500@gmail.com";
+    github = "Ai-Ya-Ya";
+    githubId = 72513839;
+    matrix = "aiya:catgirl.cloud";
+    name = "aiya";
+  };
   aij = {
     email = "aij+git@mrph.org";
     github = "aij";
diff --git a/maintainers/scripts/haskell/test-configurations.nix b/maintainers/scripts/haskell/test-configurations.nix
index 49d2459c87fe..056caea2a60c 100644
--- a/maintainers/scripts/haskell/test-configurations.nix
+++ b/maintainers/scripts/haskell/test-configurations.nix
@@ -6,7 +6,7 @@
   and builds all derivations (or at least a reasonable subset) affected by
   these overrides.
 
-  By default, it checks `configuration-{common,nix,ghc-9.8.x}.nix`. You can
+  By default, it checks `configuration-{common,nix,ghc-9.10.x}.nix`. You can
   invoke it like this:
 
     nix-build maintainers/scripts/haskell/test-configurations.nix --keep-going
@@ -55,6 +55,8 @@
   nixpkgsPath ? ../../..,
   config ? {
     allowBroken = true;
+    # TODO(@sternenseemann): better way to workaround throw-ing aliases?
+    allowAliases = false;
   },
   skipEvalErrors ? true,
   skipBinaryGHCs ? true,
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index 598f4663f909..02559e16572b 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -104,6 +104,7 @@ sed -r \
     -e '/ hledger-lib /d' \
     -e '/ hledger-ui /d' \
     -e '/ hledger-web /d' \
+    -e '/ spacecookie /d' \
     < "${tmpfile_new}" >> $stackage_config
 # Explanations:
 # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.
@@ -111,9 +112,4 @@ sed -r \
 # ShellCheck: latest version of command-line dev tool.
 # Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs.
 
-# Work around Stackage LTS including a bogus version of cassava which has been deprecated on Hackage.
-# See <https://github.com/haskell-hvr/cassava/issues/248>.
-# TODO(@sternenseemann): drop this once the situation has been resolved in Stackage LTS
-sed -e 's/cassava ==0.5.5.0/cassava >= 0.5.4.0 && (> 0.5.5.0 || < 0.5.5.0) && < 0.6.0.0/' -i "$stackage_config"
-
 echo "$old_version -> $version"
diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index c3a7986810e5..020ff252f3f8 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -181,6 +181,17 @@
 
 - `services.pyload` has been removed because the package it relies on does not exist anymore in nixpkgs due to vulnerabilities and being unmaintained.
 
+- Removed the ability from systemd to start units installed via `nix-env -i`.
+  This feature is hardly used and most units do not work without NixOS specific
+  changes anyways. Removing this allows us to drop a custom systemd patch
+  improving systemd maintainability and update speed.
+
+- Removed the ability from systemd to depend on open-yet-unformatted dm-crypt
+  devices as systemd device units. For example you cannot call systemd-makefs
+  on such devices. This was never implemented upstream but patched into
+  Nixpkgs's systemd. Removing this allows us to drop a custom systemd patch
+  improving systemd maintainability and update speed.
+
 - `linux_hardened` kernel has been removed due to a lack of maintenance.
 
 - `services.tandoor-recipes` now uses a sub-directory for media files by default starting with `26.05`. Existing setups should move media files out of the data directory and adjust `services.tandoor-recipes.extraConfig.MEDIA_ROOT` accordingly. See [Migrating media files for pre 26.05 installations](#module-services-tandoor-recipes-migrating-media).
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index 74653918f893..e57a5e8981a4 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -6,6 +6,7 @@
 }:
 let
   cfg = config.console;
+  i18nCfg = config.i18n;
 
   makeColor = i: lib.concatMapStringsSep "," (x: "0x" + lib.substring (2 * i) 2 x);
 
@@ -162,8 +163,10 @@ in
           environment.systemPackages = [ pkgs.kbd ];
 
           # Let systemd-vconsole-setup.service do the work of setting up the
-          # virtual consoles.
-          environment.etc."vconsole.conf".source = vconsoleConf;
+          # virtual consoles. Skip when imperative so localectl can manage it.
+          environment.etc."vconsole.conf" = lib.mkIf (!i18nCfg.imperativeLocale) {
+            source = vconsoleConf;
+          };
           # Provide kbd with additional packages.
           environment.etc.kbd.source = "${consoleEnv pkgs.kbd}/share";
 
@@ -212,13 +215,22 @@ in
             "systemd-vconsole-setup.service"
           ];
 
+          # When imperative, seed /etc/vconsole.conf on first boot from declared
+          # defaults so the keymap isn't lost before localectl is ever used
+          systemd.tmpfiles.rules = lib.mkIf i18nCfg.imperativeLocale [
+            "C /etc/vconsole.conf - - - - ${vconsoleConf}"
+          ];
+
           systemd.services.reload-systemd-vconsole-setup = {
             description = "Reset console on configuration changes";
             wantedBy = [ "multi-user.target" ];
-            restartTriggers = [
-              vconsoleConf
-              (consoleEnv pkgs.kbd)
-            ];
+            restartTriggers =
+              lib.optionals (!i18nCfg.imperativeLocale) [
+                vconsoleConf
+              ]
+              ++ [
+                (consoleEnv pkgs.kbd)
+              ];
             reloadIfChanged = true;
             serviceConfig = {
               RemainAfterExit = true;
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index aa8f06d1c7f2..3d043b330fc7 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -5,24 +5,29 @@
   ...
 }:
 let
+  cfg = config.i18n;
+  localeConf = pkgs.writeText "locale.conf" ''
+    LANG=${cfg.defaultLocale}
+    ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "${n}=${v}") cfg.extraLocaleSettings)}
+  '';
   sanitizeUTF8Capitalization =
     lang: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] lang);
   aggregatedLocales =
-    lib.optionals (config.i18n.defaultLocale != "C") [
-      "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}"
+    lib.optionals (cfg.defaultLocale != "C") [
+      "${cfg.defaultLocale}/${cfg.defaultCharset}"
     ]
-    ++ lib.pipe config.i18n.extraLocaleSettings [
+    ++ lib.pipe cfg.extraLocaleSettings [
       # See description of extraLocaleSettings for why is this ignored here.
       (x: lib.removeAttrs x [ "LANGUAGE" ])
       (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v)))
       # C locales are always installed
       (lib.filterAttrs (n: v: v != "C"))
-      (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8")))
+      (lib.mapAttrsToList (LCRole: lang: lang + "/" + (cfg.localeCharsets.${LCRole} or "UTF-8")))
     ]
     ++ (map sanitizeUTF8Capitalization (
-      lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales
+      lib.optionals (builtins.isList cfg.extraLocales) cfg.extraLocales
     ))
-    ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales);
+    ++ (lib.optional (builtins.isString cfg.extraLocales) cfg.extraLocales);
 in
 {
   ###### interface
@@ -33,8 +38,8 @@ in
       glibcLocales = lib.mkOption {
         type = lib.types.path;
         default = pkgs.glibcLocales.override {
-          allLocales = lib.elem "all" config.i18n.supportedLocales;
-          locales = config.i18n.supportedLocales;
+          allLocales = lib.elem "all" cfg.supportedLocales;
+          locales = cfg.supportedLocales;
         };
         defaultText = lib.literalExpression ''
           pkgs.glibcLocales.override {
@@ -143,6 +148,16 @@ in
         '';
       };
 
+      imperativeLocale = lib.mkEnableOption ''
+        imperative locale and keyboard management via localectl.
+
+        When enabled, locale and keyboard settings can be changed at runtime
+        using `localectl set-locale` and `localectl set-keymap`.
+        When disabled (the default), these settings are managed declaratively
+        through {option}`i18n.defaultLocale`, {option}`i18n.extraLocaleSettings`,
+        and {option}`console.keyMap`.
+      '';
+
     };
 
   };
@@ -154,8 +169,8 @@ in
       lib.optional
         (
           !(
-            (lib.subtractLists config.i18n.supportedLocales aggregatedLocales) == [ ]
-            || lib.elem "all" config.i18n.supportedLocales
+            (lib.subtractLists cfg.supportedLocales aggregatedLocales) == [ ]
+            || lib.elem "all" cfg.supportedLocales
           )
         )
         ''
@@ -171,25 +186,34 @@ in
 
     environment.systemPackages =
       # We increase the priority a little, so that plain glibc in systemPackages can't win.
-      lib.optional (config.i18n.supportedLocales != [ ]) (lib.setPrio (-1) config.i18n.glibcLocales);
+      lib.optional (cfg.supportedLocales != [ ]) (lib.setPrio (-1) cfg.glibcLocales);
 
     environment.sessionVariables = {
-      LANG = config.i18n.defaultLocale;
       LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
     }
-    // config.i18n.extraLocaleSettings;
+    # When imperative, leave LANG/LC_* to pam_systemd so /etc/set-environment
+    # does not override what localectl wrote to /etc/locale.conf.
+    // lib.optionalAttrs (!cfg.imperativeLocale) (
+      {
+        LANG = cfg.defaultLocale;
+      }
+      // cfg.extraLocaleSettings
+    );
 
-    systemd.globalEnvironment = lib.mkIf (config.i18n.supportedLocales != [ ]) {
-      LOCALE_ARCHIVE = "${config.i18n.glibcLocales}/lib/locale/locale-archive";
+    systemd.globalEnvironment = lib.mkIf (cfg.supportedLocales != [ ]) {
+      LOCALE_ARCHIVE = "${cfg.glibcLocales}/lib/locale/locale-archive";
     };
 
     # ‘/etc/locale.conf’ is used by systemd.
-    environment.etc."locale.conf".source = pkgs.writeText "locale.conf" ''
-      LANG=${config.i18n.defaultLocale}
-      ${lib.concatStringsSep "\n" (
-        lib.mapAttrsToList (n: v: "${n}=${v}") config.i18n.extraLocaleSettings
-      )}
-    '';
+    # If imperative, see below
+    environment.etc."locale.conf" = lib.mkIf (!cfg.imperativeLocale) {
+      source = localeConf;
+    };
 
+    # When imperative, seed /etc/locale.conf on first boot from declared defaults
+    # so the system doesn’t fall back to C.UTF-8
+    systemd.tmpfiles.rules = lib.mkIf cfg.imperativeLocale [
+      "C /etc/locale.conf - - - - ${localeConf}"
+    ];
   };
 }
diff --git a/nixos/modules/config/locale.nix b/nixos/modules/config/locale.nix
index 8fe61ca6cb22..a3a8dfab7b25 100644
--- a/nixos/modules/config/locale.nix
+++ b/nixos/modules/config/locale.nix
@@ -86,10 +86,6 @@ in
     # This way services are restarted when tzdata changes.
     systemd.globalEnvironment.TZDIR = tzdir;
 
-    systemd.services.systemd-timedated.environment = lib.optionalAttrs (config.time.timeZone != null) {
-      NIXOS_STATIC_TIMEZONE = "1";
-    };
-
     environment.etc = {
       zoneinfo.source = tzdir;
     }
diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix
index 6de21115eb2a..38b9f919bab2 100644
--- a/nixos/modules/services/display-managers/gdm.nix
+++ b/nixos/modules/services/display-managers/gdm.nix
@@ -103,6 +103,12 @@ in
       [ "services" "xserver" "displayManager" "gdm" "autoLogin" "delay" ]
       [ "services" "displayManager" "gdm" "autoLogin" "delay" ]
     )
+    (lib.mkRemovedOptionModule [
+      "services"
+      "displayManager"
+      "gdm"
+      "wayland"
+    ] "Disabling this option is no longer supported with GNOME 50.")
   ];
 
   meta = {
@@ -128,14 +134,6 @@ in
         '';
       };
 
-      wayland = lib.mkOption {
-        type = lib.types.bool;
-        default = true;
-        description = ''
-          Allow GDM to run on Wayland instead of Xserver.
-        '';
-      };
-
       autoSuspend = lib.mkOption {
         default = true;
         description = ''
@@ -361,7 +359,6 @@ in
     # presented and there's a little delay.
     services.displayManager.gdm.settings = {
       daemon = lib.mkMerge [
-        { WaylandEnable = cfg.wayland; }
         # nested if else didn't work
         (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.autoLogin.delay != 0) {
           TimedLoginEnable = true;
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 50a5204b0d70..8ac90f40663d 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -42,7 +42,7 @@ let
 
     ${config.system.systemBuilderCommands}
 
-    cp "$extraDependenciesPath" "$out/extra-dependencies"
+    printf "%s" "$extraDependencies" > "$out/extra-dependencies"
 
     ${optionalString (!config.boot.isContainer && config.boot.bootspec.enable) ''
       ${config.boot.bootspec.writer}
@@ -60,7 +60,6 @@ let
       name = "nixos-system-${config.system.name}-${config.system.nixos.label}";
       preferLocalBuild = true;
       allowSubstitutes = false;
-      passAsFile = [ "extraDependencies" ];
       buildCommand = systemBuilder;
 
       systemd = config.systemd.package;
@@ -70,6 +69,9 @@ let
       inherit (config.system) extraDependencies;
     }
     // config.system.systemBuilderArgs
+    // {
+      __structuredAttrs = true;
+    }
   );
 
   # Handle assertions and warnings
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index de2168281c80..c4f799bfb009 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -603,6 +603,10 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
+    environment.variables = {
+      SYSTEMD_XKB_DIRECTORY = "/etc/X11/xkb";
+    };
+
     environment.etc =
       let
         # generate contents for /etc/systemd/${dir} from attrset of links and packages
@@ -800,7 +804,10 @@ in
     systemd.services.systemd-update-utmp.restartIfChanged = false;
     systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
     systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
-    systemd.services.systemd-importd.environment = proxy_env;
+    systemd.services.systemd-importd = lib.mkIf cfg.package.withImportd {
+      environment = proxy_env;
+      path = [ pkgs.gnupg ];
+    };
     systemd.services.systemd-pstore.wantedBy = [ "sysinit.target" ]; # see #81138
 
     # NixOS has kernel modules in a different location, so override that here.
@@ -822,10 +829,12 @@ in
     # because either the overlay is mutable (and users can legitimately change
     # values without them being overridden) or it is immutable and systemd will
     # suggest to only make runtime changes.
-    systemd.services."systemd-localed".environment = lib.mkIf (!config.system.etc.overlay.enable) {
-      SYSTEMD_ETC_LOCALE_CONF = "/etc/static/locale.conf";
-      SYSTEMD_ETC_VCONSOLE_CONF = "/etc/static/vconsole.conf";
-    };
+    systemd.services."systemd-localed".environment =
+      lib.mkIf (!config.system.etc.overlay.enable && !config.i18n.imperativeLocale)
+        {
+          SYSTEMD_ETC_LOCALE_CONF = "/etc/static/locale.conf";
+          SYSTEMD_ETC_VCONSOLE_CONF = "/etc/static/vconsole.conf";
+        };
     systemd.services."systemd-timedated".environment =
       lib.mkIf (!config.system.etc.overlay.enable && config.time.timeZone != null)
         {
diff --git a/nixos/modules/system/boot/systemd/sysupdate.nix b/nixos/modules/system/boot/systemd/sysupdate.nix
index 0f8bc2dd966b..3fa8dc212ea2 100644
--- a/nixos/modules/system/boot/systemd/sysupdate.nix
+++ b/nixos/modules/system/boot/systemd/sysupdate.nix
@@ -136,7 +136,10 @@ in
       "systemd-sysupdated.service"
     ];
 
-    systemd.services.systemd-sysupdated.aliases = [ "dbus-org.freedesktop.sysupdate1.service" ];
+    systemd.services.systemd-sysupdated = {
+      aliases = [ "dbus-org.freedesktop.sysupdate1.service" ];
+      path = [ pkgs.gnupg ];
+    };
 
     systemd.timers = {
       "systemd-sysupdate" = {
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index f6164ed44abc..70922e101fc2 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -378,6 +378,7 @@ in
   collectd = runTest ./collectd.nix;
   commafeed = runTest ./commafeed.nix;
   connman = runTest ./connman.nix;
+  console = runTest ./console.nix;
   console-xkb-and-i18n = runTest ./console-xkb-and-i18n.nix;
   consul = runTest ./consul.nix;
   consul-template = runTest ./consul-template.nix;
@@ -911,6 +912,7 @@ in
   llama-swap = runTest ./web-servers/llama-swap.nix;
   lldap = runTest ./lldap.nix;
   local-content-share = runTest ./local-content-share.nix;
+  locale = runTest ./locale.nix;
   localsend = runTest ./localsend.nix;
   locate = runTest ./locate.nix;
   login = runTest ./login.nix;
diff --git a/nixos/tests/console.nix b/nixos/tests/console.nix
new file mode 100644
index 000000000000..6403eb2bbac4
--- /dev/null
+++ b/nixos/tests/console.nix
@@ -0,0 +1,72 @@
+{ ... }:
+{
+  name = "console";
+  meta.maintainers = [ ];
+
+  nodes =
+    let
+      # Temporary dirty workaround for nixpkgs/issues/286283
+      # Point directly to pkgs.kbd (real files) rather than /etc/kbd/keymaps
+      # (which goes through consoleEnv's buildEnv and contains only symlinks).
+      # systemd-localed follows the directory symlink but not individual file
+      # symlinks inside it, so buildEnv-based paths yield no usable keymaps.
+      missingKeymapsWorkaround =
+        { pkgs, ... }:
+        {
+          systemd.tmpfiles.rules = [
+            "L /usr/share/keymaps - - - - ${pkgs.kbd}/share/keymaps"
+          ];
+        };
+    in
+    {
+      node_static =
+        { ... }:
+        {
+          imports = [ missingKeymapsWorkaround ];
+          console.keyMap = "lt";
+        };
+
+      node_imperative =
+        { ... }:
+        {
+          imports = [ missingKeymapsWorkaround ];
+          console.keyMap = "lt";
+          i18n.imperativeLocale = true;
+        };
+    };
+
+  testScript =
+    { ... }:
+    ''
+      node_static.wait_for_unit("dbus.socket")
+
+      with subtest("static - declared keymap is reported by localectl"):
+          node_static.succeed("localectl status | grep -q 'VC Keymap: lt'")
+
+      with subtest("static - keymap reverts to declared value after reboot"):
+          # Unlike localectl set-locale, vconsole_write_data() in systemd's
+          # localed-util.c writes to a hardcoded /etc/vconsole.conf path rather
+          # than respecting SYSTEMD_ETC_VCONSOLE_CONF, so the set-keymap call
+          # itself always succeeds. The static guarantee is that NixOS activation
+          # restores the symlink on reboot, reverting any runtime changes.
+          node_static.succeed("localectl set-keymap fr")
+          node_static.succeed("localectl status | grep -q 'VC Keymap: fr'")
+          node_static.shutdown()
+          node_static.wait_for_unit("dbus.socket")
+          node_static.succeed("localectl status | grep -q 'VC Keymap: lt'")
+
+      node_imperative.wait_for_unit("dbus.socket")
+
+      with subtest("imperative - declared keymap is reported by localectl on first boot"):
+          node_imperative.succeed("localectl status | grep -q 'VC Keymap: lt'")
+
+      with subtest("imperative - localectl set-keymap changes the keymap"):
+          node_imperative.succeed("localectl set-keymap --no-convert fr")
+          node_imperative.succeed("localectl status | grep -q 'VC Keymap: fr'")
+
+      with subtest("imperative - keymap change persists across reboot"):
+          node_imperative.shutdown()
+          node_imperative.wait_for_unit("dbus.socket")
+          node_imperative.succeed("localectl status | grep -q 'VC Keymap: fr'")
+    '';
+}
diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix
index 66003daa09d9..d3047abd39a6 100644
--- a/nixos/tests/gnome-extensions.nix
+++ b/nixos/tests/gnome-extensions.nix
@@ -23,10 +23,9 @@
 
       # Configure GDM
       services.xserver.enable = true;
-      services.xserver.displayManager.gdm = {
+      services.displayManager.gdm = {
         enable = true;
         debug = true;
-        wayland = true;
       };
       services.displayManager.autoLogin = {
         enable = true;
@@ -38,7 +37,7 @@
       services.desktopManager.gnome.debug = true;
 
       systemd.user.services = {
-        "org.gnome.Shell@wayland" = {
+        "org.gnome.Shell@" = {
           serviceConfig = {
             ExecStart = [
               # Clear the list before overriding it.
diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix
index 0bb2e7061133..41dfdf43f79c 100644
--- a/nixos/tests/gnome.nix
+++ b/nixos/tests/gnome.nix
@@ -9,8 +9,6 @@
     {
       imports = [ ./common/user-account.nix ];
 
-      services.xserver.enable = true;
-
       services.displayManager.gdm = {
         enable = true;
         debug = true;
@@ -25,7 +23,7 @@
       services.desktopManager.gnome.debug = true;
 
       systemd.user.services = {
-        "org.gnome.Shell@wayland" = {
+        "org.gnome.Shell@" = {
           serviceConfig = {
             ExecStart = [
               # Clear the list before overriding it.
diff --git a/nixos/tests/locale.nix b/nixos/tests/locale.nix
new file mode 100644
index 000000000000..6c1ef5e3724f
--- /dev/null
+++ b/nixos/tests/locale.nix
@@ -0,0 +1,53 @@
+{ ... }:
+{
+  name = "imperative-locale";
+  meta.maintainers = [ ];
+
+  nodes = {
+    node_static =
+      { ... }:
+      {
+        i18n = {
+          defaultLocale = "lt_LT.UTF-8";
+          extraLocales = [ "en_US.UTF-8/UTF-8" ];
+        };
+      };
+
+    node_imperative =
+      { ... }:
+      {
+        i18n = {
+          defaultLocale = "lt_LT.UTF-8";
+          imperativeLocale = true;
+          extraLocales = [ "en_US.UTF-8/UTF-8" ];
+        };
+      };
+  };
+
+  testScript =
+    { ... }:
+    ''
+      node_static.wait_for_unit("dbus.socket")
+
+      with subtest("static - declared locale is reported by localectl"):
+          node_static.succeed("localectl status | grep -q 'System Locale: LANG=lt_LT.UTF-8'")
+
+      with subtest("static - localectl set-locale is blocked"):
+          node_static.fail("localectl set-locale LANG=en_US.UTF-8")
+          node_static.succeed("localectl status | grep -q 'System Locale: LANG=lt_LT.UTF-8'")
+
+      node_imperative.wait_for_unit("dbus.socket")
+
+      with subtest("imperative - declared locale is reported by localectl on first boot"):
+          node_imperative.succeed("localectl status | grep -q 'System Locale: LANG=lt_LT.UTF-8'")
+
+      with subtest("imperative - localectl set-locale changes the locale"):
+          node_imperative.succeed("localectl set-locale LANG=en_US.UTF-8")
+          node_imperative.succeed("localectl status | grep -q 'System Locale: LANG=en_US.UTF-8'")
+
+      with subtest("imperative - locale change persists across reboot"):
+          node_imperative.shutdown()
+          node_imperative.wait_for_unit("dbus.socket")
+          node_imperative.succeed("localectl status | grep -q 'System Locale: LANG=en_US.UTF-8'")
+    '';
+}
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index 98cc88a0326f..d04b3a374570 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -125,17 +125,6 @@
       # wait for user services
       machine.wait_for_unit("default.target", "alice")
 
-      with subtest("systemctl edit suggests --runtime"):
-          # --runtime is suggested when using `systemctl edit`
-          ret, out = machine.execute("systemctl edit testservice1.service 2>&1")
-          assert ret == 1
-          assert out.rstrip("\n") == "The unit-directory '/etc/systemd/system' is read-only on NixOS, so it's not possible to edit system-units directly. Use 'systemctl edit --runtime' instead."
-          # editing w/o `--runtime` is possible for user-services, however
-          # it's not possible because we're not in a tty when grepping
-          # (i.e. hacky way to ensure that the error from above doesn't appear here).
-          _, out = machine.execute("systemctl --user edit testservice2.service 2>&1")
-          assert out.rstrip("\n") == "Cannot edit units interactively if not on a tty."
-
       # Regression test for https://github.com/NixOS/nixpkgs/issues/105049
       with subtest("systemd reads timezone database in /etc/zoneinfo"):
           timer = machine.succeed("TZ=UTC systemctl show --property=TimersCalendar oncalendar-test.timer")
@@ -179,7 +168,6 @@
       # Regression test for https://github.com/NixOS/nixpkgs/pull/91232
       with subtest("setting transient hostnames works"):
           machine.succeed("hostnamectl set-hostname --transient machine-transient")
-          machine.fail("hostnamectl set-hostname machine-all")
 
       with subtest("systemd-shutdown works"):
           machine.shutdown()
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 89e564a2118c..05ac73b9f13e 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -4,7 +4,7 @@
   stdenv,
 }:
 rec {
-  version = "9.2.0340";
+  version = "9.2.0389";
 
   outputs = [
     "out"
@@ -15,7 +15,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-jCnOVIafx+0o1nlHv7QJQrmxs1IAxh9BBshDOFdZdCM=";
+    hash = "sha256-shhdJn1bPJ/68a54UZMn1fla7P4tjVUN4DGLbx3ohOg=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index c0aaf6369ae1..a4997eb3d576 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -204,7 +204,7 @@ stdenv.mkDerivation {
       ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
 
       mkdir -p "$out/share"
-      for f in '${chromium.browser}'/share/*; do # hello emacs */
+      for f in '${chromium.browser}'/share/*; do
         ln -s -t "$out/share/" "$f"
       done
     '';
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 8eafd1626333..28ecc9faf3e1 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -49,7 +49,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "evolution";
-  version = "3.58.3";
+  version = "3.60.1";
 
   outputs = [
     "out"
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor finalAttrs.version}/evolution-${finalAttrs.version}.tar.xz";
-    hash = "sha256-XQG3mlvr3y06mHG2E1CTnPJQH26gPCQVQ/dEqShtTXk=";
+    hash = "sha256-jzM860wxzOfXdJXokBoA79xTdtpUKcHClNfj77xvcwg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index f5cce8daac55..a18048f3fdcd 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -11,23 +11,11 @@
   docbook_xml_dtd_45,
   docbook_xsl,
   libxslt,
-  pkgs,
+  darwin,
 }:
 
 let
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  xnu = bootstrapSourceRelease "xnu";
+  xnu = darwin.sourceRelease "xnu";
 in
 stdenv.mkDerivation rec {
   pname = "lsyncd";
diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index ea266422c6d8..69a6121722d5 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -283,7 +283,7 @@ lib.extendMkDerivation {
 
               exclude='\(/_\|examples\|Godeps\|testdata'
               if [[ -n "$excludedPackages" ]]; then
-                IFS=' ' read -r -a excludedArr <<<$excludedPackages
+                IFS=' ' read -r -a excludedArr <<<"''${excludedPackages[@]}"
                 printf -v excludedAlternates '%s\\|' "''${excludedArr[@]}"
                 excludedAlternates=''${excludedAlternates%\\|} # drop final \| added by printf
                 exclude+='\|'"$excludedAlternates"
diff --git a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs
index 85449c7eb027..b04e546d388a 100644
--- a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs
+++ b/pkgs/build-support/kernel/make-initrd-ng/src/main.rs
@@ -5,9 +5,7 @@ use std::fs;
 use std::hash::Hash;
 use std::iter::FromIterator;
 use std::os::unix;
-use std::os::unix::fs::PermissionsExt;
 use std::path::{Component, Path, PathBuf};
-use std::process::Command;
 
 use libc::umask;
 
@@ -159,13 +157,22 @@ fn add_dependencies<P: AsRef<Path> + AsRef<OsStr> + std::fmt::Debug>(
             }
         }
         if !found {
-            // glibc makes it tricky to make this an error because
-            // none of the files have a useful rpath.
-            println!(
-                "Warning: Couldn't satisfy dependency {} for {:?}",
-                line,
-                OsStr::new(&source)
-            );
+            // In Nix, glibc's own libraries lack rpath entries pointing to
+            // themselves, so the dynamic linker (ld-linux-*.so.*) and libc.so.*
+            // can never be resolved through rpath alone. They are always present
+            // in the initrd: the linker via elf.interpreter above, and libc via
+            // at least one binary's rpath. Suppress these known-benign cases.
+            // See also: the ld*.so.? skip in stage-1.nix findLibs.
+            let is_glibc_runtime = (line.starts_with("ld-") && line.contains(".so"))
+                || line.starts_with("libc.so");
+
+            if !is_glibc_runtime {
+                eprintln!(
+                    "Warning: Couldn't satisfy dependency {} for {:?}",
+                    line,
+                    OsStr::new(&source)
+                );
+            }
         }
     }
 
diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh
index c341f672363a..0304dc88765a 100644
--- a/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh
+++ b/pkgs/build-support/node/build-npm-package/hooks/npm-build-hook.sh
@@ -16,7 +16,7 @@ npmBuildHook() {
 
     if ! npm run ${npmWorkspace+--workspace=$npmWorkspace} "$npmBuildScript" $npmBuildFlags "${npmBuildFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}"; then
         echo
-        echo 'ERROR: `npm build` failed'
+        echo "ERROR: \`npm run $npmBuildScript [...]\` failed"
         echo
         echo "Here are a few things you can try, depending on the error:"
         echo "1. Make sure your build script ($npmBuildScript) exists"
diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 4c7a35e15bb6..3e9a8f15bb4a 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -97,72 +97,86 @@ rec {
 
   # Docs in doc/build-helpers/trivial-build-helpers.chapter.md
   # See https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-writeTextFile
-  writeTextFile =
-    {
-      name,
-      text,
-      executable ? false,
-      destination ? "",
-      checkPhase ? "",
-      meta ? { },
-      passthru ? { },
-      allowSubstitutes ? false,
-      preferLocalBuild ? true,
-      derivationArgs ? { },
-      pos ? builtins.unsafeGetAttrPos "name" args,
-    }@args:
-    assert lib.assertMsg (destination != "" -> (lib.hasPrefix "/" destination && destination != "/")) ''
-      destination must be an absolute path, relative to the derivation's out path,
-      got '${destination}' instead.
+  writeTextFile = lib.extendMkDerivation {
+    constructDrv = stdenvNoCC.mkDerivation;
 
-      Ensure that the path starts with a / and specifies at least the filename.
-    '';
+    excludeDrvArgNames = [
+      "derivationArgs"
+    ];
 
-    let
-      matches = builtins.match "/bin/([^/]+)" destination;
-    in
-    runCommand name
-      (
-        {
-          inherit
-            pos
-            text
-            executable
-            checkPhase
-            allowSubstitutes
-            preferLocalBuild
-            ;
-          passAsFile = [ "text" ] ++ derivationArgs.passAsFile or [ ];
-          meta =
-            lib.optionalAttrs (executable && matches != null) {
-              mainProgram = lib.head matches;
-            }
-            // meta
-            // derivationArgs.meta or { };
-          passthru = passthru // derivationArgs.passthru or { };
-        }
-        // removeAttrs derivationArgs [
-          "passAsFile"
-          "meta"
-          "passthru"
-        ]
-      )
-      ''
-        target=$out${lib.escapeShellArg destination}
-        mkdir -p "$(dirname "$target")"
+    extendDrvArgs =
+      finalAttrs:
+      {
+        name,
+        text,
+        executable ? false,
+        destination ? "",
+        checkPhase ? "",
+        meta ? { },
+        passthru ? { },
+        allowSubstitutes ? false,
+        preferLocalBuild ? true,
+        derivationArgs ? { },
+        pos ? builtins.unsafeGetAttrPos "name" args,
+      }@args:
+      {
+        inherit
+          pos
+          name
+          text
+          executable
+          checkPhase
+          allowSubstitutes
+          preferLocalBuild
+          ;
+        destination =
+          assert lib.assertMsg (destination != "" -> (lib.hasPrefix "/" destination && destination != "/")) ''
+            destination must be an absolute path, relative to the derivation's out path,
+            got '${destination}' instead.
 
-        if [ -e "$textPath" ]; then
-          mv "$textPath" "$target"
-        else
-          echo -n "$text" > "$target"
-        fi
+            Ensure that the path starts with a / and specifies at least the filename.
+          '';
+          destination;
+        passAsFile = [ "text" ] ++ derivationArgs.passAsFile or [ ];
 
-        if [ -n "$executable" ]; then
-          chmod +x "$target"
-        fi
+        buildCommand = ''
+          target=$out$destination
+          mkdir -p "$(dirname "$target")"
 
-        eval "$checkPhase"
-      '';
+          if [ -e "$textPath" ]; then
+            mv "$textPath" "$target"
+          else
+            printf "%s" "$text" > "$target"
+          fi
+
+          if [ -n "$executable" ]; then
+            chmod +x "$target"
+          fi
+
+          eval "$checkPhase"
+        '';
+
+        meta =
+          let
+            matches = builtins.match "/bin/([^/]+)" finalAttrs.destination;
+            isProgram = finalAttrs.executable && matches != null;
+          in
+          {
+            ${if isProgram then "mainProgram" else null} = lib.head matches;
+          }
+          // meta
+          // derivationArgs.meta or { };
+        passthru = passthru // derivationArgs.passthru or { };
+      }
+      // removeAttrs derivationArgs [
+        "passAsFile"
+        "meta"
+        "passthru"
+      ];
+
+    # `writeTextFile`'s set pattern doesn't have ellipses.
+    inheritFunctionArgs = false;
+  };
 
   # See doc/build-helpers/trivial-build-helpers.chapter.md
   # or https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-text-writing
@@ -333,10 +347,10 @@ rec {
       {
         inherit pname code;
         executable = true;
-        passAsFile = [ "code" ];
         # Pointless to do this on a remote machine.
         preferLocalBuild = true;
         allowSubstitutes = false;
+        __structuredAttrs = true;
         meta = {
           mainProgram = pname;
         };
@@ -344,7 +358,7 @@ rec {
       ''
         n=$out/bin/${pname}
         mkdir -p "$(dirname "$n")"
-        mv "$codePath" code.c
+        printf "%s" "$code" > code.c
         $CC -x c code.c -o "$n"
       '';
 
@@ -559,7 +573,10 @@ rec {
         paths = mapPaths (path: "${path}${stripPrefix}") paths;
         buildCommand = ''
           mkdir -p $out
-          for i in $(cat $pathsPath); do
+          if [ -n "''${pathsPath:-}" ] && [ -f "$pathsPath" ]; then
+            mapfile -d " " -t paths < "$pathsPath"
+          fi
+          for i in "''${paths[@]}"; do
             ${optionalString (!failOnMissing) "if test -d $i; then "}${lndir}/bin/lndir -silent $i $out${
               optionalString (!failOnMissing) "; fi"
             }
diff --git a/pkgs/build-support/trivial-builders/test/symlink-join.nix b/pkgs/build-support/trivial-builders/test/symlink-join.nix
index d50581d3f38a..4750d9680d4a 100644
--- a/pkgs/build-support/trivial-builders/test/symlink-join.nix
+++ b/pkgs/build-support/trivial-builders/test/symlink-join.nix
@@ -55,6 +55,24 @@ in
     '';
   };
 
+  symlinkJoin-structured-attrs = testEqualContents {
+    assertion = "symlinkJoin-structured-attrs";
+    actual = symlinkJoin {
+      __structuredAttrs = true;
+      name = "symlinkJoin-structured-attrs";
+      paths = [
+        foo
+        bar
+        baz
+      ];
+    };
+    expected = runCommand "symlinkJoin-foo-bar-baz" { } ''
+      mkdir -p $out/{var/lib/arbitrary,etc/test.d}
+      ln -s {${foo},${bar}}/etc/test.d/* $out/etc/test.d
+      ln -s ${baz}/var/lib/arbitrary/baz $out/var/lib/arbitrary/
+    '';
+  };
+
   symlinkJoin-strip-paths = testEqualContents {
     assertion = "symlinkJoin-strip-paths";
     actual = symlinkJoin {
diff --git a/pkgs/by-name/ad/adwaita-fonts/package.nix b/pkgs/by-name/ad/adwaita-fonts/package.nix
index 493e04ccefb9..494925b08e6d 100644
--- a/pkgs/by-name/ad/adwaita-fonts/package.nix
+++ b/pkgs/by-name/ad/adwaita-fonts/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "adwaita-fonts";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/adwaita-fonts/${lib.versions.major finalAttrs.version}/adwaita-fonts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MVfGIOtbcrJasVbRlKpOsiP5hw1Uf+g/298G0+e+yzc=";
+    hash = "sha256-TJJ/v+7BxQOAG6UQwslOAFTILFIs97oNO+XU1B/PXIY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix
index 3d9035b013bd..40d65bc2599b 100644
--- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix
+++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "adwaita-icon-theme";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major finalAttrs.version}/adwaita-icon-theme-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ZRZkYdGyeKqUL1mqjQ/M8RCNccZfNyxiZuFyRJeRdVw=";
+    hash = "sha256-+sbgQB/KcUeAVhoIG49+J8O8HbNOvaTaF1CB8msk1GA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ap/apache-airflow/providers.nix b/pkgs/by-name/ap/apache-airflow/providers.nix
index d20c06f64e48..daeb8ea84589 100644
--- a/pkgs/by-name/ap/apache-airflow/providers.nix
+++ b/pkgs/by-name/ap/apache-airflow/providers.nix
@@ -6,7 +6,7 @@
       "airflow.providers.airbyte"
       "airflow.providers.airbyte.get_provider_info"
     ];
-    version = "5.2.3";
+    version = "5.3.3";
   };
 
   alibaba = {
@@ -15,7 +15,7 @@
       "airflow.providers.alibaba"
       "airflow.providers.alibaba.get_provider_info"
     ];
-    version = "3.2.2";
+    version = "3.3.5";
   };
 
   amazon = {
@@ -29,17 +29,19 @@
       "jsonpath-ng"
       "lxml"
       "marshmallow"
+      "pandas"
       "pyathena"
       "python3-saml"
       "redshift-connector"
       "s3fs"
+      "sqlalchemy"
       "xmlsec"
     ];
     imports = [
       "airflow.providers.amazon"
       "airflow.providers.amazon.get_provider_info"
     ];
-    version = "9.13.0";
+    version = "9.23.0";
   };
 
   apache_beam = {
@@ -52,7 +54,7 @@
       "airflow.providers.apache.beam"
       "airflow.providers.apache.beam.get_provider_info"
     ];
-    version = "6.1.4";
+    version = "6.2.3";
   };
 
   apache_cassandra = {
@@ -61,7 +63,7 @@
       "airflow.providers.apache.cassandra"
       "airflow.providers.apache.cassandra.get_provider_info"
     ];
-    version = "3.8.2";
+    version = "3.9.2";
   };
 
   apache_drill = {
@@ -70,7 +72,7 @@
       "airflow.providers.apache.drill"
       "airflow.providers.apache.drill.get_provider_info"
     ];
-    version = "3.1.2";
+    version = "3.3.0";
   };
 
   apache_druid = {
@@ -79,7 +81,7 @@
       "airflow.providers.apache.druid"
       "airflow.providers.apache.druid.get_provider_info"
     ];
-    version = "4.3.0";
+    version = "4.5.0";
   };
 
   apache_flink = {
@@ -88,11 +90,12 @@
       "airflow.providers.apache.flink"
       "airflow.providers.apache.flink.get_provider_info"
     ];
-    version = "1.7.2";
+    version = "1.8.3";
   };
 
   apache_hdfs = {
     deps = [
+      "fastavro"
       "hdfs"
       "pandas"
     ];
@@ -100,20 +103,21 @@
       "airflow.providers.apache.hdfs"
       "airflow.providers.apache.hdfs.get_provider_info"
     ];
-    version = "4.10.2";
+    version = "4.11.3";
   };
 
   apache_hive = {
     deps = [
       "jmespath"
+      "kerberos"
       "pandas"
-      "thrift"
+      "sqlalchemy"
     ];
     imports = [
       "airflow.providers.apache.hive"
       "airflow.providers.apache.hive.get_provider_info"
     ];
-    version = "9.1.2";
+    version = "9.4.0";
   };
 
   apache_iceberg = {
@@ -122,16 +126,19 @@
       "airflow.providers.apache.iceberg"
       "airflow.providers.apache.iceberg.get_provider_info"
     ];
-    version = "1.3.2";
+    version = "2.0.0";
   };
 
   apache_impala = {
-    deps = [ "kerberos" ];
+    deps = [
+      "kerberos"
+      "sqlalchemy"
+    ];
     imports = [
       "airflow.providers.apache.impala"
       "airflow.providers.apache.impala.get_provider_info"
     ];
-    version = "1.7.2";
+    version = "1.9.0";
   };
 
   apache_kafka = {
@@ -143,7 +150,7 @@
       "airflow.providers.apache.kafka"
       "airflow.providers.apache.kafka.get_provider_info"
     ];
-    version = "1.10.3";
+    version = "1.13.0";
   };
 
   apache_kylin = {
@@ -152,19 +159,16 @@
       "airflow.providers.apache.kylin"
       "airflow.providers.apache.kylin.get_provider_info"
     ];
-    version = "3.9.2";
+    version = "3.10.2";
   };
 
   apache_livy = {
-    deps = [
-      "aiohttp"
-      "asgiref"
-    ];
+    deps = [ "aiohttp" ];
     imports = [
       "airflow.providers.apache.livy"
       "airflow.providers.apache.livy.get_provider_info"
     ];
-    version = "4.4.2";
+    version = "4.5.3";
   };
 
   apache_pig = {
@@ -173,7 +177,7 @@
       "airflow.providers.apache.pig"
       "airflow.providers.apache.pig.get_provider_info"
     ];
-    version = "4.7.2";
+    version = "4.8.2";
   };
 
   apache_pinot = {
@@ -182,7 +186,7 @@
       "airflow.providers.apache.pinot"
       "airflow.providers.apache.pinot.get_provider_info"
     ];
-    version = "4.8.2";
+    version = "4.10.0";
   };
 
   apache_spark = {
@@ -194,7 +198,7 @@
       "airflow.providers.apache.spark"
       "airflow.providers.apache.spark.get_provider_info"
     ];
-    version = "5.3.2";
+    version = "5.6.0";
   };
 
   apache_tinkerpop = {
@@ -203,7 +207,7 @@
       "airflow.providers.apache.tinkerpop"
       "airflow.providers.apache.tinkerpop.get_provider_info"
     ];
-    version = "1.0.3";
+    version = "1.1.1";
   };
 
   apprise = {
@@ -212,7 +216,7 @@
       "airflow.providers.apprise"
       "airflow.providers.apprise.get_provider_info"
     ];
-    version = "2.1.2";
+    version = "2.3.1";
   };
 
   arangodb = {
@@ -221,7 +225,7 @@
       "airflow.providers.arangodb"
       "airflow.providers.arangodb.get_provider_info"
     ];
-    version = "2.8.2";
+    version = "2.9.2";
   };
 
   asana = {
@@ -230,7 +234,7 @@
       "airflow.providers.asana"
       "airflow.providers.asana.get_provider_info"
     ];
-    version = "2.10.2";
+    version = "2.11.1";
   };
 
   atlassian_jira = {
@@ -239,7 +243,7 @@
       "airflow.providers.atlassian.jira"
       "airflow.providers.atlassian.jira.get_provider_info"
     ];
-    version = "3.1.2";
+    version = "3.3.1";
   };
 
   celery = {
@@ -251,7 +255,7 @@
       "airflow.providers.celery"
       "airflow.providers.celery.get_provider_info"
     ];
-    version = "3.12.3";
+    version = "3.17.1";
   };
 
   cloudant = {
@@ -260,7 +264,7 @@
       "airflow.providers.cloudant"
       "airflow.providers.cloudant.get_provider_info"
     ];
-    version = "4.2.2";
+    version = "4.3.2";
   };
 
   cncf_kubernetes = {
@@ -276,25 +280,40 @@
       "airflow.providers.cncf.kubernetes"
       "airflow.providers.cncf.kubernetes.get_provider_info"
     ];
-    version = "10.8.0";
+    version = "10.14.0";
   };
 
   cohere = {
-    deps = [ "cohere" ];
+    deps = [
+      "cohere"
+      "fastavro"
+    ];
     imports = [
       "airflow.providers.cohere"
       "airflow.providers.cohere.get_provider_info"
     ];
-    version = "1.5.3";
+    version = "1.6.3";
+  };
+
+  common_ai = {
+    deps = [
+      "pydantic-ai-slim"
+      "sqlglot"
+    ];
+    imports = [
+      "airflow.providers.common.ai"
+      "airflow.providers.common.ai.get_provider_info"
+    ];
+    version = "0.0.1";
   };
 
   common_compat = {
-    deps = [ ];
+    deps = [ "asgiref" ];
     imports = [
       "airflow.providers.common.compat"
       "airflow.providers.common.compat.get_provider_info"
     ];
-    version = "1.7.4";
+    version = "1.14.1";
   };
 
   common_io = {
@@ -303,7 +322,7 @@
       "airflow.providers.common.io"
       "airflow.providers.common.io.get_provider_info"
     ];
-    version = "1.6.3";
+    version = "1.7.1";
   };
 
   common_messaging = {
@@ -312,22 +331,25 @@
       "airflow.providers.common.messaging"
       "airflow.providers.common.messaging.get_provider_info"
     ];
-    version = "2.0.0";
+    version = "2.0.2";
   };
 
   common_sql = {
     deps = [
+      "datafusion"
       "methodtools"
       "more-itertools"
       "pandas"
       "polars"
+      "pyiceberg-core"
+      "sqlalchemy"
       "sqlparse"
     ];
     imports = [
       "airflow.providers.common.sql"
       "airflow.providers.common.sql.get_provider_info"
     ];
-    version = "1.28.1";
+    version = "1.33.0";
   };
 
   databricks = {
@@ -336,6 +358,7 @@
       "azure-identity"
       "databricks-sdk"
       "databricks-sql-connector"
+      "fastavro"
       "mergedeep"
       "pandas"
       "pyarrow"
@@ -345,7 +368,7 @@
       "airflow.providers.databricks"
       "airflow.providers.databricks.get_provider_info"
     ];
-    version = "7.7.2";
+    version = "7.11.0";
   };
 
   datadog = {
@@ -354,19 +377,20 @@
       "airflow.providers.datadog"
       "airflow.providers.datadog.get_provider_info"
     ];
-    version = "3.9.2";
+    version = "3.10.2";
   };
 
   dbt_cloud = {
     deps = [
       "aiohttp"
       "asgiref"
+      "tenacity"
     ];
     imports = [
       "airflow.providers.dbt.cloud"
       "airflow.providers.dbt.cloud.get_provider_info"
     ];
-    version = "4.4.3";
+    version = "4.7.0";
   };
 
   dingding = {
@@ -375,7 +399,7 @@
       "airflow.providers.dingding"
       "airflow.providers.dingding.get_provider_info"
     ];
-    version = "3.8.2";
+    version = "3.9.2";
   };
 
   discord = {
@@ -384,7 +408,7 @@
       "airflow.providers.discord"
       "airflow.providers.discord.get_provider_info"
     ];
-    version = "3.10.2";
+    version = "3.12.0";
   };
 
   docker = {
@@ -396,11 +420,13 @@
       "airflow.providers.docker"
       "airflow.providers.docker.get_provider_info"
     ];
-    version = "4.4.2";
+    version = "4.5.3";
   };
 
   edge3 = {
     deps = [
+      "aiofiles"
+      "aiohttp"
       "pydantic"
       "retryhttp"
     ];
@@ -408,7 +434,7 @@
       "airflow.providers.edge3"
       "airflow.providers.edge3.get_provider_info"
     ];
-    version = "1.2.0";
+    version = "3.2.0";
   };
 
   elasticsearch = {
@@ -417,30 +443,36 @@
       "airflow.providers.elasticsearch"
       "airflow.providers.elasticsearch.get_provider_info"
     ];
-    version = "6.3.2";
+    version = "6.5.0";
   };
 
   exasol = {
-    deps = [ "pandas" ];
+    deps = [
+      "pandas"
+      "sqlalchemy"
+    ];
     imports = [
       "airflow.providers.exasol"
       "airflow.providers.exasol.get_provider_info"
     ];
-    version = "4.8.2";
+    version = "4.10.0";
   };
 
   fab = {
     deps = [
       "blinker"
-      "connexion"
+      "cachetools"
       "flask"
       "flask-appbuilder"
       "flask-limiter"
       "flask-login"
       "flask-session"
+      "flask-sqlalchemy"
       "flask-wtf"
       "jmespath"
       "kerberos"
+      "marshmallow"
+      "msgpack"
       "werkzeug"
       "wtforms"
     ];
@@ -448,7 +480,7 @@
       "airflow.providers.fab"
       "airflow.providers.fab.get_provider_info"
     ];
-    version = "2.4.2";
+    version = "3.5.0";
   };
 
   facebook = {
@@ -457,7 +489,7 @@
       "airflow.providers.facebook"
       "airflow.providers.facebook.get_provider_info"
     ];
-    version = "3.8.2";
+    version = "3.9.2";
   };
 
   ftp = {
@@ -466,7 +498,7 @@
       "airflow.providers.ftp"
       "airflow.providers.ftp.get_provider_info"
     ];
-    version = "3.13.2";
+    version = "3.14.1";
   };
 
   git = {
@@ -475,7 +507,7 @@
       "airflow.providers.git"
       "airflow.providers.git.get_provider_info"
     ];
-    version = "0.0.7";
+    version = "0.2.4";
   };
 
   github = {
@@ -484,12 +516,11 @@
       "airflow.providers.github"
       "airflow.providers.github.get_provider_info"
     ];
-    version = "2.9.2";
+    version = "2.11.0";
   };
 
   google = {
     deps = [
-      "apache-beam"
       "asgiref"
       "dill"
       "gcsfs"
@@ -531,7 +562,6 @@
       "plyvel"
       "proto-plus"
       "pyarrow"
-      "pyopenssl"
       "python-slugify"
       "ray"
       "tenacity"
@@ -541,7 +571,7 @@
       "airflow.providers.google"
       "airflow.providers.google.get_provider_info"
     ];
-    version = "17.2.0";
+    version = "21.0.0";
   };
 
   grpc = {
@@ -554,7 +584,7 @@
       "airflow.providers.grpc"
       "airflow.providers.grpc.get_provider_info"
     ];
-    version = "3.8.2";
+    version = "3.9.2";
   };
 
   hashicorp = {
@@ -566,7 +596,7 @@
       "airflow.providers.hashicorp"
       "airflow.providers.hashicorp.get_provider_info"
     ];
-    version = "4.3.2";
+    version = "4.5.0";
   };
 
   http = {
@@ -580,7 +610,7 @@
       "airflow.providers.http"
       "airflow.providers.http.get_provider_info"
     ];
-    version = "5.3.4";
+    version = "6.0.0";
   };
 
   imap = {
@@ -589,7 +619,7 @@
       "airflow.providers.imap"
       "airflow.providers.imap.get_provider_info"
     ];
-    version = "3.9.2";
+    version = "3.11.0";
   };
 
   influxdb = {
@@ -601,7 +631,16 @@
       "airflow.providers.influxdb"
       "airflow.providers.influxdb.get_provider_info"
     ];
-    version = "2.9.3";
+    version = "2.10.2";
+  };
+
+  informatica = {
+    deps = [ ];
+    imports = [
+      "airflow.providers.informatica"
+      "airflow.providers.informatica.get_provider_info"
+    ];
+    version = "0.1.1";
   };
 
   jdbc = {
@@ -610,7 +649,7 @@
       "airflow.providers.jdbc"
       "airflow.providers.jdbc.get_provider_info"
     ];
-    version = "5.2.3";
+    version = "5.4.1";
   };
 
   jenkins = {
@@ -619,7 +658,7 @@
       "airflow.providers.jenkins"
       "airflow.providers.jenkins.get_provider_info"
     ];
-    version = "4.1.2";
+    version = "4.2.3";
   };
 
   keycloak = {
@@ -628,12 +667,11 @@
       "airflow.providers.keycloak"
       "airflow.providers.keycloak.get_provider_info"
     ];
-    version = "0.1.0";
+    version = "0.6.0";
   };
 
   microsoft_azure = {
     deps = [
-      "adal"
       "adlfs"
       "azure-batch"
       "azure-cosmos"
@@ -641,6 +679,7 @@
       "azure-identity"
       "azure-keyvault-secrets"
       "azure-kusto-data"
+      "azure-mgmt-compute"
       "azure-mgmt-containerinstance"
       "azure-mgmt-containerregistry"
       "azure-mgmt-cosmosdb"
@@ -666,7 +705,7 @@
       "airflow.providers.microsoft.azure"
       "airflow.providers.microsoft.azure.get_provider_info"
     ];
-    version = "12.7.0";
+    version = "13.0.1";
   };
 
   microsoft_mssql = {
@@ -678,7 +717,7 @@
       "airflow.providers.microsoft.mssql"
       "airflow.providers.microsoft.mssql.get_provider_info"
     ];
-    version = "4.3.2";
+    version = "4.5.0";
   };
 
   microsoft_psrp = {
@@ -687,7 +726,7 @@
       "airflow.providers.microsoft.psrp"
       "airflow.providers.microsoft.psrp.get_provider_info"
     ];
-    version = "3.1.2";
+    version = "3.2.3";
   };
 
   microsoft_winrm = {
@@ -696,7 +735,7 @@
       "airflow.providers.microsoft.winrm"
       "airflow.providers.microsoft.winrm.get_provider_info"
     ];
-    version = "3.11.0";
+    version = "3.14.0";
   };
 
   mongo = {
@@ -708,7 +747,7 @@
       "airflow.providers.mongo"
       "airflow.providers.mongo.get_provider_info"
     ];
-    version = "5.2.2";
+    version = "5.3.3";
   };
 
   mysql = {
@@ -720,7 +759,7 @@
       "airflow.providers.mysql"
       "airflow.providers.mysql.get_provider_info"
     ];
-    version = "6.3.4";
+    version = "6.5.0";
   };
 
   neo4j = {
@@ -729,7 +768,7 @@
       "airflow.providers.neo4j"
       "airflow.providers.neo4j.get_provider_info"
     ];
-    version = "3.10.1";
+    version = "3.11.3";
   };
 
   odbc = {
@@ -738,7 +777,7 @@
       "airflow.providers.odbc"
       "airflow.providers.odbc.get_provider_info"
     ];
-    version = "4.10.2";
+    version = "4.12.0";
   };
 
   openai = {
@@ -747,7 +786,7 @@
       "airflow.providers.openai"
       "airflow.providers.openai.get_provider_info"
     ];
-    version = "1.6.2";
+    version = "1.7.2";
   };
 
   openfaas = {
@@ -756,16 +795,19 @@
       "airflow.providers.openfaas"
       "airflow.providers.openfaas.get_provider_info"
     ];
-    version = "3.8.2";
+    version = "3.9.2";
   };
 
   openlineage = {
-    deps = [ "attrs" ];
+    deps = [
+      "attrs"
+      "sqlalchemy"
+    ];
     imports = [
       "airflow.providers.openlineage"
       "airflow.providers.openlineage.get_provider_info"
     ];
-    version = "2.7.0";
+    version = "2.12.0";
   };
 
   opensearch = {
@@ -774,7 +816,7 @@
       "airflow.providers.opensearch"
       "airflow.providers.opensearch.get_provider_info"
     ];
-    version = "1.7.2";
+    version = "1.8.4";
   };
 
   opsgenie = {
@@ -783,7 +825,7 @@
       "airflow.providers.opsgenie"
       "airflow.providers.opsgenie.get_provider_info"
     ];
-    version = "5.9.2";
+    version = "5.10.1";
   };
 
   oracle = {
@@ -795,7 +837,7 @@
       "airflow.providers.oracle"
       "airflow.providers.oracle.get_provider_info"
     ];
-    version = "4.2.0";
+    version = "4.5.1";
   };
 
   pagerduty = {
@@ -804,7 +846,7 @@
       "airflow.providers.pagerduty"
       "airflow.providers.pagerduty.get_provider_info"
     ];
-    version = "5.0.2";
+    version = "5.2.3";
   };
 
   papermill = {
@@ -818,7 +860,7 @@
       "airflow.providers.papermill"
       "airflow.providers.papermill.get_provider_info"
     ];
-    version = "3.11.2";
+    version = "3.12.1";
   };
 
   pgvector = {
@@ -827,7 +869,7 @@
       "airflow.providers.pgvector"
       "airflow.providers.pgvector.get_provider_info"
     ];
-    version = "1.5.2";
+    version = "1.7.0";
   };
 
   pinecone = {
@@ -836,7 +878,7 @@
       "airflow.providers.pinecone"
       "airflow.providers.pinecone.get_provider_info"
     ];
-    version = "2.3.4";
+    version = "2.4.2";
   };
 
   postgres = {
@@ -846,24 +888,27 @@
       "polars"
       "psycopg"
       "psycopg2-binary"
+      "sqlalchemy"
     ];
     imports = [
       "airflow.providers.postgres"
       "airflow.providers.postgres.get_provider_info"
     ];
-    version = "6.3.0";
+    version = "6.6.1";
   };
 
   presto = {
     deps = [
       "pandas"
       "presto-python-client"
+      "psycopg2-binary"
+      "sqlalchemy"
     ];
     imports = [
       "airflow.providers.presto"
       "airflow.providers.presto.get_provider_info"
     ];
-    version = "5.9.2";
+    version = "5.11.0";
   };
 
   qdrant = {
@@ -872,7 +917,7 @@
       "airflow.providers.qdrant"
       "airflow.providers.qdrant.get_provider_info"
     ];
-    version = "1.4.3";
+    version = "1.5.3";
   };
 
   redis = {
@@ -881,7 +926,7 @@
       "airflow.providers.redis"
       "airflow.providers.redis.get_provider_info"
     ];
-    version = "4.3.0";
+    version = "4.4.2";
   };
 
   salesforce = {
@@ -893,7 +938,7 @@
       "airflow.providers.salesforce"
       "airflow.providers.salesforce.get_provider_info"
     ];
-    version = "5.11.3";
+    version = "5.12.3";
   };
 
   samba = {
@@ -902,7 +947,7 @@
       "airflow.providers.samba"
       "airflow.providers.samba.get_provider_info"
     ];
-    version = "4.11.0";
+    version = "4.12.3";
   };
 
   segment = {
@@ -911,7 +956,7 @@
       "airflow.providers.segment"
       "airflow.providers.segment.get_provider_info"
     ];
-    version = "3.8.2";
+    version = "3.9.2";
   };
 
   sendgrid = {
@@ -923,7 +968,7 @@
       "airflow.providers.sendgrid"
       "airflow.providers.sendgrid.get_provider_info"
     ];
-    version = "4.1.3";
+    version = "4.2.1";
   };
 
   sftp = {
@@ -931,12 +976,13 @@
       "asyncssh"
       "paramiko"
       "pysftp"
+      "sshfs"
     ];
     imports = [
       "airflow.providers.sftp"
       "airflow.providers.sftp.get_provider_info"
     ];
-    version = "5.4.0";
+    version = "5.7.1";
   };
 
   singularity = {
@@ -945,31 +991,35 @@
       "airflow.providers.singularity"
       "airflow.providers.singularity.get_provider_info"
     ];
-    version = "3.8.2";
+    version = "3.9.2";
   };
 
   slack = {
-    deps = [ "slack-sdk" ];
+    deps = [
+      "asgiref"
+      "slack-sdk"
+    ];
     imports = [
       "airflow.providers.slack"
       "airflow.providers.slack.get_provider_info"
     ];
-    version = "9.2.0";
+    version = "9.8.0";
   };
 
   smtp = {
-    deps = [ ];
+    deps = [ "aiosmtplib" ];
     imports = [
       "airflow.providers.smtp"
       "airflow.providers.smtp.get_provider_info"
     ];
-    version = "2.3.1";
+    version = "2.4.3";
   };
 
   snowflake = {
     deps = [
       "pandas"
       "pyarrow"
+      "setuptools"
       "snowflake-connector-python"
       "snowflake-sqlalchemy"
     ];
@@ -977,7 +1027,7 @@
       "airflow.providers.snowflake"
       "airflow.providers.snowflake.get_provider_info"
     ];
-    version = "6.5.3";
+    version = "6.11.0";
   };
 
   sqlite = {
@@ -986,11 +1036,12 @@
       "airflow.providers.sqlite"
       "airflow.providers.sqlite.get_provider_info"
     ];
-    version = "4.1.2";
+    version = "4.3.0";
   };
 
   ssh = {
     deps = [
+      "asyncssh"
       "paramiko"
       "sshtunnel"
     ];
@@ -998,7 +1049,7 @@
       "airflow.providers.ssh"
       "airflow.providers.ssh.get_provider_info"
     ];
-    version = "4.1.3";
+    version = "4.3.2";
   };
 
   standard = {
@@ -1007,7 +1058,7 @@
       "airflow.providers.standard"
       "airflow.providers.standard.get_provider_info"
     ];
-    version = "1.9.0";
+    version = "1.12.1";
   };
 
   tableau = {
@@ -1016,7 +1067,7 @@
       "airflow.providers.tableau"
       "airflow.providers.tableau.get_provider_info"
     ];
-    version = "5.2.0";
+    version = "5.3.3";
   };
 
   telegram = {
@@ -1025,16 +1076,16 @@
       "airflow.providers.telegram"
       "airflow.providers.telegram.get_provider_info"
     ];
-    version = "4.8.2";
+    version = "4.9.2";
   };
 
   teradata = {
-    deps = [ ];
+    deps = [ "sqlalchemy" ];
     imports = [
       "airflow.providers.teradata"
       "airflow.providers.teradata.get_provider_info"
     ];
-    version = "3.2.1";
+    version = "3.5.0";
   };
 
   trino = {
@@ -1043,16 +1094,19 @@
       "airflow.providers.trino"
       "airflow.providers.trino.get_provider_info"
     ];
-    version = "6.3.3";
+    version = "6.5.0";
   };
 
   vertica = {
-    deps = [ "vertica-python" ];
+    deps = [
+      "sqlalchemy"
+      "vertica-python"
+    ];
     imports = [
       "airflow.providers.vertica"
       "airflow.providers.vertica.get_provider_info"
     ];
-    version = "4.1.2";
+    version = "4.3.0";
   };
 
   weaviate = {
@@ -1065,16 +1119,16 @@
       "airflow.providers.weaviate"
       "airflow.providers.weaviate.get_provider_info"
     ];
-    version = "3.2.3";
+    version = "3.3.1";
   };
 
   yandex = {
-    deps = [ ];
+    deps = [ "grpcio" ];
     imports = [
       "airflow.providers.yandex"
       "airflow.providers.yandex.get_provider_info"
     ];
-    version = "4.2.0";
+    version = "4.4.0";
   };
 
   ydb = {
@@ -1083,7 +1137,7 @@
       "airflow.providers.ydb"
       "airflow.providers.ydb.get_provider_info"
     ];
-    version = "2.2.2";
+    version = "2.5.0";
   };
 
   zendesk = {
@@ -1092,7 +1146,7 @@
       "airflow.providers.zendesk"
       "airflow.providers.zendesk.get_provider_info"
     ];
-    version = "4.10.2";
+    version = "4.11.1";
   };
 
 }
diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix
index e7b0674f5b57..91e1168a9c95 100644
--- a/pkgs/by-name/ap/apache-airflow/python-package.nix
+++ b/pkgs/by-name/ap/apache-airflow/python-package.nix
@@ -88,13 +88,13 @@
   enabledProviders,
 }:
 let
-  version = "3.1.7";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "airflow";
     tag = version;
-    hash = "sha256-qFgI65wAttERPCHn7ezSdNGB0sclEV7zYIBqaC0Gs4A=";
+    hash = "sha256-jwWxH9fTTCFdLAaAN18/FUAbN0cTCPkkk9+0ZMYNXek=";
   };
 
   airflowUi = stdenv.mkDerivation rec {
@@ -112,7 +112,7 @@ let
       pname = "airflow-ui";
       inherit sourceRoot src version;
       fetcherVersion = 3;
-      hash = "sha256-zPIql9rP4EkE0Y3ihP4MkWTTYCIDr8d1LpE6vePiNdU=";
+      hash = "sha256-OkSDQoWsHQ6w1vIoX5W9zXHghV0obvL6Wji0HYN6CSs=";
     };
 
     buildPhase = ''
@@ -141,7 +141,7 @@ let
       pname = "simple-auth-manager-ui";
       inherit sourceRoot src version;
       fetcherVersion = 3;
-      hash = "sha256-ccLGYaAYJWSgegO+IfVZv1WdZ5YjhYYTZivqtDjdoOk=";
+      hash = "sha256-uQIVHzX0BcJuxgbPp6wqKhALbsfACSJjiMOdmrpuzOk=";
     };
 
     buildPhase = ''
@@ -199,10 +199,12 @@ let
       # remove cyclic dependency
       sed -i -E 's/"apache-airflow-task-sdk[^"]+",//' pyproject.toml
 
-      substituteInPlace pyproject.toml \
-        --replace-fail "GitPython==3.1.45" "GitPython" \
-        --replace-fail "hatchling==1.27.0" "hatchling" \
-        --replace-fail "trove-classifiers==2025.9.11.17" "trove-classifiers"
+      # relax dependencies
+      sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
+      sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
+      sed -i -E 's/"GitPython==[^"]+"/"GitPython"/' pyproject.toml
+      sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
+      sed -i -E 's/"smmap==[^"]+"/"smmap"/' pyproject.toml
 
       # Copy built UI assets
       cp -r ${airflowUi}/share/airflow/ui/dist src/airflow/ui/
@@ -282,13 +284,6 @@ let
       uvicorn
     ]
     ++ (map buildProvider requiredProviders);
-
-    pythonRelaxDeps = [
-      # Temporary to fix CI only:
-      # https://github.com/apache/airflow/commit/c474be9ff06cf16bf96f93de9a09e30ffc476bee
-      "fastapi"
-      "universal-pathlib"
-    ];
   };
 
   taskSdk = buildPythonPackage {
@@ -301,6 +296,15 @@ let
     postPatch = ''
       # resolve cyclic dependency
       sed -i -E 's/"apache-airflow-core[^"]+",//' pyproject.toml
+
+      # relax dependencies
+      sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
+      sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
+      sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
+
+      # task-sdk needs config.yml from core subpackage
+      mkdir -p src/airflow/config_templates
+      cp ../airflow-core/src/airflow/config_templates/* src/airflow/config_templates/
     '';
 
     build-system = [
@@ -316,6 +320,7 @@ let
       greenback
       httpx
       jinja2
+      jsonschema
       methodtools
       msgspec
       pendulum
@@ -338,10 +343,10 @@ buildPythonPackage rec {
   pyproject = true;
 
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "GitPython==3.1.45" "GitPython" \
-      --replace-fail "hatchling==1.27.0" "hatchling" \
-      --replace-fail "trove-classifiers==2025.9.11.17" "trove-classifiers"
+    # relax dependencies
+    sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml
+    sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml
+    sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml
   '';
 
   nativeBuildInputs = [ writableTmpDirAsHomeHook ];
diff --git a/pkgs/by-name/ap/apache-airflow/update-providers.py b/pkgs/by-name/ap/apache-airflow/update-providers.py
index 01ee2bd49fe0..53293d9e60fa 100755
--- a/pkgs/by-name/ap/apache-airflow/update-providers.py
+++ b/pkgs/by-name/ap/apache-airflow/update-providers.py
@@ -27,6 +27,7 @@ PKG_PREFERENCES = {
     "protobuf": "protobuf",
     "pydantic": "pydantic",
     "requests_toolbelt": "requests-toolbelt",
+    "sqlalchemy": "sqlalchemy",
 }
 
 # Requirements missing from the airflow provider metadata
diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
index b58641c2602a..3002a9226cc5 100644
--- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json
+++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
@@ -17,10 +17,10 @@
   },
   "26": {
     "urls": [
-      "https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg",
-      "https://web.archive.org/web/20250915230423/https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg"
+      "https://swcdn.apple.com/content/downloads/32/53/047-96692-A_OAHIHT53YB/ybtshxmrcju8m2qvw3w5elr4rajtg1x3y3/CLTools_macOSNMOS_SDK.pkg",
+      "https://web.archive.org/web/20260406133131/https://swcdn.apple.com/content/downloads/32/53/047-96692-A_OAHIHT53YB/ybtshxmrcju8m2qvw3w5elr4rajtg1x3y3/CLTools_macOSNMOS_SDK.pkg"
     ],
-    "version": "26.0",
-    "hash": "sha256-54UtisDXHCxs7vO4fZSWOYwxLbdouLxWwGisez+tlAc="
+    "version": "26.4",
+    "hash": "sha256-7nrbCv1pNlpzEqwZWVfUPCvDfXEJJNOl7ApkeFpIOC0="
   }
 }
diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix
index 9d352c0b3fe9..dd5e8f9e4ce1 100644
--- a/pkgs/by-name/at/at-spi2-core/package.nix
+++ b/pkgs/by-name/at/at-spi2-core/package.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "at-spi2-core";
-  version = "2.58.3";
+  version = "2.60.1";
 
   outputs = [
     "out"
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor finalAttrs.version}/at-spi2-core-${finalAttrs.version}.tar.xz";
-    hash = "sha256-sPq+psl0LtqMnGdfm4wdG6u6HagtoD6hEDcQIzcXwbA=";
+    hash = "sha256-+ZuH48FnT1+8QXzJwdniYcDymqsFUK1jaYBQMdEvaFI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/at/atf/package.nix b/pkgs/by-name/at/atf/package.nix
index 326419c5f72a..4a9a0e178292 100644
--- a/pkgs/by-name/at/atf/package.nix
+++ b/pkgs/by-name/at/atf/package.nix
@@ -45,6 +45,18 @@ stdenv'.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  configureFlags =
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      "ATF_SHELL=${darwin.bootstrapStdenv.shell}"
+    ]
+    # When cross-compiling, autoconf cannot run test programs on the build host.
+    # Pre-set cache variables so configure skips those AC_RUN_IFELSE checks.
+    ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+      "kyua_cv_getopt_plus=yes"
+      "kyua_cv_attribute_noreturn=yes"
+      "kyua_cv_getcwd_works=yes"
+    ];
+
   enableParallelBuilding = true;
 
   makeFlags = [
diff --git a/pkgs/by-name/av/avahi/package.nix b/pkgs/by-name/av/avahi/package.nix
index 09b9a602af55..56098a9ea628 100644
--- a/pkgs/by-name/av/avahi/package.nix
+++ b/pkgs/by-name/av/avahi/package.nix
@@ -222,6 +222,8 @@ stdenv.mkDerivation rec {
       ln -s avahi-compat-libdns_sd/dns_sd.h "$dev/include/dns_sd.h"
     '';
 
+  enableParallelBuilding = true;
+
   passthru.tests = {
     smoke-test = nixosTests.avahi;
     smoke-test-resolved = nixosTests.avahi-with-resolved;
diff --git a/pkgs/by-name/aw/aws-c-event-stream/package.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix
index 56e7f41d4529..ff256663b18b 100644
--- a/pkgs/by-name/aw/aws-c-event-stream/package.nix
+++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix
@@ -15,13 +15,13 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "aws-c-event-stream";
   # nixpkgs-update: no auto update
-  version = "0.5.7";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-c-event-stream";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-JvjUrIj1bh5WZEzkauLSLIolxrT8CKIMjO7p1c35XZI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jMtLJjKC7TuNZ0c0Nc3+KRh226RBl0omkiKNXXBltoc=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix
index 683551b45e0c..775e5260484f 100644
--- a/pkgs/by-name/ba/baobab/package.nix
+++ b/pkgs/by-name/ba/baobab/package.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "baobab";
-  version = "49.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/baobab/${lib.versions.major finalAttrs.version}/baobab-${finalAttrs.version}.tar.xz";
-    hash = "sha256-YkPJIAK+fpH13s0klhL6zipKEtN0Kv2IsIapS4dd/+A=";
+    hash = "sha256-VzyE8V9fljpEBQD29DQSySisIzX2tp3LWPGh/lIBAks=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bl/blueprint-compiler/package.nix b/pkgs/by-name/bl/blueprint-compiler/package.nix
index efb9de334831..8482a5a965f4 100644
--- a/pkgs/by-name/bl/blueprint-compiler/package.nix
+++ b/pkgs/by-name/bl/blueprint-compiler/package.nix
@@ -12,6 +12,7 @@
   testers,
   wrapGAppsNoGuiHook,
   xvfb-run,
+  gnome,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "blueprint-compiler";
@@ -67,17 +68,22 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postCheck
   '';
 
-  passthru.tests = {
-    version = testers.testVersion {
-      package = finalAttrs.finalPackage;
+  passthru = {
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+      };
+      # regression test that `blueprint-compiler` can be used in a standalone
+      # context outside of nix builds, and doesn't rely on the setup hooks of
+      # its propagated inputs for basic functionality.
+      # see https://github.com/NixOS/nixpkgs/pull/400415
+      standalone = runCommand "blueprint-compiler-test-standalone" { } ''
+        ${lib.getExe finalAttrs.finalPackage} --help && touch $out
+      '';
+    };
+    updateScript = gnome.updateScript {
+      packageName = "blueprint-compiler";
     };
-    # regression test that `blueprint-compiler` can be used in a standalone
-    # context outside of nix builds, and doesn't rely on the setup hooks of
-    # its propagated inputs for basic functionality.
-    # see https://github.com/NixOS/nixpkgs/pull/400415
-    standalone = runCommand "blueprint-compiler-test-standalone" { } ''
-      ${lib.getExe finalAttrs.finalPackage} --help && touch $out
-    '';
   };
 
   meta = {
@@ -89,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
       benediktbroich
       ranfdev
     ];
+    teams = [ lib.teams.gnome ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/bl/bluez/lreadline.patch b/pkgs/by-name/bl/bluez/lreadline.patch
new file mode 100644
index 000000000000..3e3b6a1818bc
--- /dev/null
+++ b/pkgs/by-name/bl/bluez/lreadline.patch
@@ -0,0 +1,91 @@
+# Adjusted version of https://lore.kernel.org/linux-bluetooth/20250703182908.2370130-1-hi@alyssa.is/raw
+diff --git a/Makefile.tools b/Makefile.tools
+index 2080f0978..885371de9 100644
+--- a/Makefile.tools
++++ b/Makefile.tools
+@@ -19,7 +19,7 @@ client_bluetoothctl_SOURCES = client/main.c \
+ 					client/telephony.h client/telephony.c
+ client_bluetoothctl_LDADD = lib/libbluetooth-internal.la \
+ 			gdbus/libgdbus-internal.la src/libshared-glib.la \
+-			$(GLIB_LIBS) $(DBUS_LIBS) -lreadline
++			$(GLIB_LIBS) $(DBUS_LIBS) $(READLINE_LIBS)
+ endif
+ 
+ if ZSH_COMPLETIONS
+@@ -385,7 +385,7 @@ tools_meshctl_SOURCES = tools/meshctl.c \
+ 				tools/mesh-gatt/onoff-model.c
+ tools_meshctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
+ 				lib/libbluetooth-internal.la \
+-				$(GLIB_LIBS) $(DBUS_LIBS) -ljson-c -lreadline
++				$(GLIB_LIBS) $(DBUS_LIBS) -ljson-c $(READLINE_LIBS)
+ 
+ EXTRA_DIST += tools/mesh-gatt/local_node.json tools/mesh-gatt/prov_db.json
+ endif
+@@ -404,7 +404,7 @@ tools_mesh_cfgclient_SOURCES = tools/mesh-cfgclient.c \
+ 				mesh/crypto.h mesh/crypto.c
+ 
+ tools_mesh_cfgclient_LDADD = lib/libbluetooth-internal.la src/libshared-ell.la \
+-						$(ell_ldadd) -ljson-c -lreadline
++						$(ell_ldadd) -ljson-c $(READLINE_LIBS)
+ 
+ bin_PROGRAMS +=  tools/mesh-cfgtest
+ 
+@@ -512,7 +512,7 @@ noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \
+ tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \
+ 						tools/obex-client-tool.c
+ tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \
+-			       src/libshared-glib.la $(GLIB_LIBS) -lreadline
++			       src/libshared-glib.la $(GLIB_LIBS) $(READLINE_LIBS)
+ 
+ tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
+ 						tools/obex-server-tool.c
+@@ -523,16 +523,16 @@ tools_bluetooth_player_SOURCES = tools/bluetooth-player.c client/print.c \
+ 				client/player.c
+ tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \
+ 				src/libshared-glib.la \
+-				$(GLIB_LIBS) $(DBUS_LIBS) -lreadline
++				$(GLIB_LIBS) $(DBUS_LIBS) $(READLINE_LIBS)
+ 
+ tools_obexctl_SOURCES = tools/obexctl.c
+ tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
+-			$(GLIB_LIBS) $(DBUS_LIBS) -lreadline
++			$(GLIB_LIBS) $(DBUS_LIBS) $(READLINE_LIBS)
+ 
+ tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c \
+ 			client/mgmt.c
+ tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-glib.la \
+-				$(GLIB_LIBS) -lreadline
++				$(GLIB_LIBS) $(READLINE_LIBS)
+ if DEPRECATED
+ noinst_PROGRAMS += attrib/gatttool
+ 
+@@ -542,7 +542,7 @@ attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
+ 				attrib/utils.c src/log.c client/display.c \
+ 				client/display.h
+ attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
+-			src/libshared-glib.la $(GLIB_LIBS) -lreadline
++			src/libshared-glib.la $(GLIB_LIBS) $(READLINE_LIBS)
+ 
+ endif
+ endif
+@@ -592,5 +592,5 @@ tools/btpclient.$(OBJEXT): src/libshared-ell.la ell/internal
+ 
+ tools_btpclientctl_SOURCES = tools/btpclientctl.c client/display.c
+ tools_btpclientctl_LDADD = src/libshared-mainloop.la src/libshared-glib.la \
+-				lib/libbluetooth-internal.la -lreadline
++				lib/libbluetooth-internal.la $(READLINE_LIBS)
+ endif
+diff --git a/configure.ac b/configure.ac
+index 52de7d665..f110ab103 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -338,8 +338,7 @@ AC_ARG_ENABLE(client, AS_HELP_STRING([--disable-client],
+ AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
+ 
+ if (test "${enable_client}" != "no" || test "${enable_mesh}" = "yes"); then
+-        AC_CHECK_HEADERS(readline/readline.h, enable_readline=yes,
+-                AC_MSG_ERROR(readline header files are required))
++        PKG_CHECK_MODULES([READLINE], [readline], enable_readline=yes)
+ fi
+ AM_CONDITIONAL(READLINE, test "${enable_readline}" = "yes")
+ 
diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index 931888bae65d..20a9bcce09da 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -8,7 +8,7 @@
   docutils,
   ell,
   enableExperimental ? false,
-  fetchurl,
+  fetchpatch2,
   glib,
   json_c,
   libical,
@@ -32,11 +32,19 @@ stdenv.mkDerivation (finalAttrs: {
   inherit (bluez-headers) version src;
 
   patches = [
-    (fetchurl {
-      name = "static.patch";
-      url = "https://lore.kernel.org/linux-bluetooth/20250703182908.2370130-1-hi@alyssa.is/raw";
-      hash = "sha256-4Yz3ljsn2emJf+uTcJO4hG/YXvjERtitce71TZx5Hak=";
+    # https://github.com/bluez/bluez/issues/1896
+    # Remove the following 2 in the next release
+    (fetchpatch2 {
+      name = "fix-btctl-noninteractive-regression";
+      url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=b33e923b55e4d0e9d78a83cfcb541fd1f687ef54";
+      hash = "sha256-q7eN4ktw7DtdwMHHi7GU7fbvHAdMttKF1kDSWzZqa6A=";
     })
+    (fetchpatch2 {
+      name = "fix-btctl-noninteractive-regression-2";
+      url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=21e13976f2e375d701b8b7032ba5c1b2e56c305f";
+      hash = "sha256-JrdmYiC+U0KeMP8oVg12Z8CvkMEKWBVgiiUACx0E7dY=";
+    })
+    ./lreadline.patch
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/bu/bubblewrap/package.nix b/pkgs/by-name/bu/bubblewrap/package.nix
index 925037321863..9bef0440e177 100644
--- a/pkgs/by-name/bu/bubblewrap/package.nix
+++ b/pkgs/by-name/bu/bubblewrap/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bubblewrap";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "bubblewrap";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-sp5XYkTuoL778p5xQRDtFbX0ocdJuRbVxJCkKbEUgZs=";
+    hash = "sha256-MUjJMhJ8Q9sYQyGqA7zfMutYjMSZNmEHXs2H3WN4mbE=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix
index ea2f21939844..8dd727f6ded3 100644
--- a/pkgs/by-name/ca/cacert/package.nix
+++ b/pkgs/by-name/ca/cacert/package.nix
@@ -20,7 +20,7 @@ let
     lib.concatStringsSep "\n\n" extraCertificateStrings
   );
 
-  version = "3.121";
+  version = "3.123";
   meta = {
     homepage = "https://firefox-source-docs.mozilla.org/security/nss/runbooks/rootstore.html#root-store-consumers";
     description = "Bundle of X.509 certificates of public Certificate Authorities (CA)";
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
         "https://hg-edge.mozilla.org/projects/nss/raw-file/${tag}/${file}"
         "https://raw.githubusercontent.com/nss-dev/nss/refs/tags/${tag}/${file}"
       ];
-    hash = "sha256-O5jU4/9XoybZWHwzYzA5yMOpzwtV98pYHXWY/zKesfM=";
+    hash = "sha256-dxMO+RITdyhEVh+9OqMdQTslwqx/V2/qO8O7/375NIk=";
   };
 
   unpackPhase = ''
diff --git a/pkgs/by-name/ca/cambalache/package.nix b/pkgs/by-name/ca/cambalache/package.nix
index 8c998b3a3430..fff74a33add8 100644
--- a/pkgs/by-name/ca/cambalache/package.nix
+++ b/pkgs/by-name/ca/cambalache/package.nix
@@ -24,7 +24,7 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "cambalache";
-  version = "0.99.3";
+  version = "1.0";
   pyproject = false;
 
   # Did not fetch submodule since it is only for tests we don't run.
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     owner = "jpu";
     repo = "cambalache";
     tag = finalAttrs.version;
-    hash = "sha256-1X7fXYSIXoj8qhQLIfz2gMrCnNBZ7OJCeMykBSpnYD4=";
+    hash = "sha256-V1xiw6oGOlmLR1JOy82REIdoOTGfzXYMBJAAtjDJtfM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix
index 70e5fd0e8b8a..1f4a27adb643 100644
--- a/pkgs/by-name/ch/chromaprint/package.nix
+++ b/pkgs/by-name/ch/chromaprint/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [ "trivialautovarinit" ];
 
   cmakeFlags = [
-    (lib.cmakeBool "BUILD_EXAMPLES" withExamples)
     (lib.cmakeBool "BUILD_TOOLS" withTools)
   ]
   ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
@@ -64,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
   };
 
-  doCheck = true;
+  # From some reason it dies at the end...
+  doCheck = !stdenv.hostPlatform.isDarwin;
   checkPhase =
     let
       exampleAudio = fetchurl {
diff --git a/pkgs/by-name/cu/cups/package.nix b/pkgs/by-name/cu/cups/package.nix
index 665ef7fab10f..dd12a5dcef57 100644
--- a/pkgs/by-name/cu/cups/package.nix
+++ b/pkgs/by-name/cu/cups/package.nix
@@ -23,15 +23,18 @@
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cups";
-  version = "2.4.16";
+  version = "2.4.19";
 
   src = fetchurl {
-    url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
-    hash = "sha256-AzlYcgS0+UKN0FkuswHewL+epuqNzl2WkNVr5YWrqS0=";
+    url = "https://github.com/OpenPrinting/cups/releases/download/v${finalAttrs.version}/cups-${finalAttrs.version}-source.tar.gz";
+    hash = "sha256-ggmEsSpn+YcFeFquLdE0f+CsCXgoAB1Fg/9kV0rtY4k=";
   };
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   outputs = [
     "out"
     "lib"
@@ -183,4 +186,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index b3bd7cd1d94f..3bc05f122f6e 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -84,7 +84,7 @@ assert
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "curl";
-  version = "8.19.0";
+  version = "8.20.0";
 
   src = fetchurl {
     urls = [
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
         builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
       }/curl-${finalAttrs.version}.tar.xz"
     ];
-    hash = "sha256-TrQUiXkNGeGQ16x+GOgoV83Wivj05mspLO1WLTM/Ed8=";
+    hash = "sha256-Y/4twUi6DOromSLvg49+XJRicsLni3xZ+rS3nTziuJY=";
   };
 
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
@@ -188,8 +188,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2))
     (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl))
     (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2))
-    # TODO: Clean up on `staging`.
-    "--without-wolfssl"
   ]
   ++ lib.optional gssSupport "--with-gssapi=${lib.getDev libkrb5}"
   # For the 'urandom', maybe it should be a cross-system option
diff --git a/pkgs/by-name/d-/d-spy/package.nix b/pkgs/by-name/d-/d-spy/package.nix
index c1b6f1130fff..71f73a4b61a6 100644
--- a/pkgs/by-name/d-/d-spy/package.nix
+++ b/pkgs/by-name/d-/d-spy/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "d-spy";
-  version = "49.2";
+  version = "50.0";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-spy/${lib.versions.major finalAttrs.version}/d-spy-${finalAttrs.version}.tar.xz";
-    hash = "sha256-uBT/J9goqrzacvLGLxtB1iA190PQb9mn48XJhsSHmmk=";
+    hash = "sha256-G93IbYos9ntPZS3EYczYNTES8Ih1NCADfHX1RU3qrRA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/da/dash/package.nix b/pkgs/by-name/da/dash/package.nix
index 6235e5193f8a..eb5da071f472 100644
--- a/pkgs/by-name/da/dash/package.nix
+++ b/pkgs/by-name/da/dash/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dash";
-  version = "0.5.13.2";
+  version = "0.5.13.3";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz";
-    hash = "sha256-5xNoJrHu1s4xk+iv+i9wsbK5Fo3ZH/p9209G6eYgVP4=";
+    hash = "sha256-qDcnwSmaxMPZ1Dl5OTs6TrACddVjauAlJueXnVHW+9E=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/db/dbus_cplusplus/package.nix b/pkgs/by-name/db/dbus_cplusplus/package.nix
index 49ccea6c2347..fdeccefdebbd 100644
--- a/pkgs/by-name/db/dbus_cplusplus/package.nix
+++ b/pkgs/by-name/db/dbus_cplusplus/package.nix
@@ -74,6 +74,8 @@ stdenv.mkDerivation rec {
     "--disable-examples"
   ];
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = "https://dbus-cplusplus.sourceforge.net";
     description = "C++ API for D-BUS";
diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix
index 2f629f9d17ff..a0d7d71818a5 100644
--- a/pkgs/by-name/de/decibels/package.nix
+++ b/pkgs/by-name/de/decibels/package.nix
@@ -17,11 +17,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "decibels";
-  version = "49.0";
+  version = "49.6.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/decibels/${lib.versions.major finalAttrs.version}/decibels-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KbebouKWfmkUHjnwrSxnfjj+P/ufug+lx1MflNP2c8o=";
+    hash = "sha256-mme6FN8jUXyEn8/ep2THOiQeWQVSmbEl6YrqsqeAGtU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix
index ba9dd9f99663..8a7d9041abde 100644
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@@ -9,7 +9,7 @@
   qt6,
   wrapGAppsHook3,
   # darwin-only
-  xcbuild,
+  re-plistbuddy,
 
   # buildInputs
   bzip2,
@@ -72,6 +72,11 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
+  postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+    substituteInPlace CMake/DolphinInjectVersionInfo.cmake \
+      --replace-fail "/usr/libexec/PlistBuddy" "PlistBuddy"
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -81,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    xcbuild # for plutil
+    re-plistbuddy # for plutil as well
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix
index eed14f08bc98..ab6e33a388fd 100644
--- a/pkgs/by-name/eo/eog/package.nix
+++ b/pkgs/by-name/eo/eog/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   meson,
   ninja,
   gettext,
@@ -34,7 +33,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eog";
-  version = "49.1";
+  version = "50.1";
 
   outputs = [
     "out"
@@ -44,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/eog/${lib.versions.major finalAttrs.version}/eog-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+t0S4UupzSvmmJ37zvQAAWRbY0QM7tjgSGewdYewZtw=";
+    hash = "sha256-b17m11ZUi4jiWph+DQbavDxsMlmPt99J+wiUXB/pSlU=";
   };
 
   patches = [
@@ -52,12 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
     # We patch gobject-introspection to hardcode absolute paths but
     # our Meson patch will only pass the info when install_dir is absolute as well.
     ./fix-gir-lib-path.patch
-
-    # Switch to girepository-2.0
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/eog/raw/939eee56e5b72b02a8c0f4f867431cf6426adb9e/f/libpeas1_pygobject352.patch";
-      hash = "sha256-5QIkxxUvGKzb0cMCIcfuu7FX9XuY+RrKNunSvRDEDRc=";
-    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix
index 75feb5f66ed5..5c44547f0e83 100644
--- a/pkgs/by-name/ep/epiphany/package.nix
+++ b/pkgs/by-name/ep/epiphany/package.nix
@@ -39,11 +39,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "epiphany";
-  version = "49.2";
+  version = "50.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz";
-    hash = "sha256-s7o9aCE+h/gfFzPoVQDDe4K1k4+QCeT+iZlJY9X7K44=";
+    hash = "sha256-Hib5kB8PCL/pQ6pwFjyVMzTH7D1K78jTVOipwUCzNKc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/et/ethtool/package.nix b/pkgs/by-name/et/ethtool/package.nix
index ccaed2c7e885..cc7c0f94bcef 100644
--- a/pkgs/by-name/et/ethtool/package.nix
+++ b/pkgs/by-name/et/ethtool/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ethtool";
-  version = "6.19";
+  version = "7.0";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/ethtool-${finalAttrs.version}.tar.xz";
-    hash = "sha256-HCEUq24MDSqmfWmZYOsR3080HiQDE5zfKK6dqFimAl8=";
+    hash = "sha256-Zgv5clp4cTQ6DSMgaKdjT7z7abbC+O/0VYJ/rvsM0WI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix
index 595537e2b7c2..3b3bfc32294f 100644
--- a/pkgs/by-name/ev/evince/package.nix
+++ b/pkgs/by-name/ev/evince/package.nix
@@ -138,6 +138,8 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "evince";
+      # 49.alpha bumps API and breaks sushi.
+      freeze = true;
     };
   };
 
diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
index 1b804fc8348a..9a45269b21f9 100644
--- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
+++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
@@ -1,8 +1,8 @@
 diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
-index c31f3ef..9ebb5f2 100644
+index 12fc59c..3fc80a5 100644
 --- a/src/addressbook/libebook/e-book-client.c
 +++ b/src/addressbook/libebook/e-book-client.c
-@@ -1926,7 +1926,18 @@ e_book_client_get_self (ESourceRegistry *registry,
+@@ -1944,7 +1944,18 @@ e_book_client_get_self (ESourceRegistry *registry,
  
  	*out_client = book_client;
  
@@ -22,7 +22,7 @@ index c31f3ef..9ebb5f2 100644
  	uid = g_settings_get_string (settings, SELF_UID_KEY);
  	g_object_unref (settings);
  
-@@ -1994,7 +2005,18 @@ e_book_client_set_self (EBookClient *client,
+@@ -2012,7 +2023,18 @@ e_book_client_set_self (EBookClient *client,
  	g_return_val_if_fail (
  		e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE);
  
@@ -42,7 +42,7 @@ index c31f3ef..9ebb5f2 100644
  	g_settings_set_string (
  		settings, SELF_UID_KEY,
  		e_contact_get_const (contact, E_CONTACT_UID));
-@@ -2030,8 +2052,20 @@ e_book_client_is_self (EContact *contact)
+@@ -2048,8 +2070,20 @@ e_book_client_is_self (EContact *contact)
  	 * unfortunately the API doesn't allow that.
  	 */
  	g_mutex_lock (&mutex);
@@ -130,7 +130,7 @@ index 9d986d2..d63902a 100644
  	g_object_unref (settings);
  
 diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c
-index 2a95a75..950f430 100644
+index 60ff97f..8535dec 100644
 --- a/src/addressbook/libedata-book/e-book-meta-backend.c
 +++ b/src/addressbook/libedata-book/e-book-meta-backend.c
 @@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void)
@@ -154,10 +154,10 @@ index 2a95a75..950f430 100644
  	if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) {
  		GPowerProfileMonitor *power_monitor;
 diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c
-index 9f8646a..079aba9 100644
+index b16756f..f3d2d6b 100644
 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
 +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
-@@ -1338,7 +1338,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
+@@ -1433,7 +1433,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
  		(GDestroyNotify) g_free,
  		(GDestroyNotify) contact_record_free);
  
@@ -178,7 +178,7 @@ index 9f8646a..079aba9 100644
  	cbc->priv->update_alarms_id = 0;
  	cbc->priv->alarm_enabled = FALSE;
 diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
-index 6318854..6b7a88c 100644
+index 2e2dd0b..b5f99ab 100644
 --- a/src/calendar/backends/file/e-cal-backend-file.c
 +++ b/src/calendar/backends/file/e-cal-backend-file.c
 @@ -3701,7 +3701,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
@@ -244,7 +244,7 @@ index 92d68e2..d1e1fa4 100644
  		g_signal_connect_object (
  			watcher->priv->desktop_settings,
 diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c
-index 371f9bb..b0a661e 100644
+index 866afd1..e57d877 100644
 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c
 +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
 @@ -160,7 +160,18 @@ ecmb_is_power_saver_enabled (void)
@@ -267,7 +267,7 @@ index 371f9bb..b0a661e 100644
  
  	if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) {
  		GPowerProfileMonitor *power_monitor;
-@@ -2652,7 +2663,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
+@@ -2617,7 +2628,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
  			if (is_declined) {
  				GSettings *settings;
  
@@ -290,10 +290,10 @@ index 371f9bb..b0a661e 100644
  				g_clear_object (&settings);
  			}
 diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c
-index 03b5129..3f4256a 100644
+index a830f89..b9abaa2 100644
 --- a/src/camel/camel-cipher-context.c
 +++ b/src/camel/camel-cipher-context.c
-@@ -1637,7 +1637,18 @@ camel_cipher_can_load_photos (void)
+@@ -1638,7 +1638,18 @@ camel_cipher_can_load_photos (void)
  	GSettings *settings;
  	gboolean load_photos;
  
@@ -314,7 +314,7 @@ index 03b5129..3f4256a 100644
  	g_clear_object (&settings);
  
 diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c
-index c5ac40f..fb8ae19 100644
+index 94f0769..8de758b 100644
 --- a/src/camel/camel-gpg-context.c
 +++ b/src/camel/camel-gpg-context.c
 @@ -748,7 +748,18 @@ gpg_ctx_get_executable_name (void)
@@ -363,10 +363,10 @@ index 2c0b6ef..b354332 100644
  		G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);
  	G_UNLOCK (mi_user_headers);
 diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
-index c3c2d7d..e1370db 100644
+index e605049..9961fea 100644
 --- a/src/camel/providers/imapx/camel-imapx-server.c
 +++ b/src/camel/providers/imapx/camel-imapx-server.c
-@@ -5671,7 +5671,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
+@@ -5666,7 +5666,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
  	if (do_old_flags_update) {
  		GSettings *eds_settings;
  
@@ -507,7 +507,7 @@ index 3738359..f9ce2d9 100644
  		g_object_unref (settings);
  
 diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c
-index db775f9..fb524db 100644
+index c999d4d..e9cf7c5 100644
 --- a/src/libedataserver/e-oauth2-service.c
 +++ b/src/libedataserver/e-oauth2-service.c
 @@ -93,7 +93,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
@@ -531,10 +531,10 @@ index db775f9..fb524db 100644
  	g_object_unref (settings);
  
 diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
-index bd9822d..3e021dd 100644
+index bcc2df7..42489da 100644
 --- a/src/libedataserver/e-source-registry.c
 +++ b/src/libedataserver/e-source-registry.c
-@@ -1781,7 +1781,19 @@ e_source_registry_init (ESourceRegistry *registry)
+@@ -1751,7 +1751,19 @@ e_source_registry_init (ESourceRegistry *registry)
  
  	g_mutex_init (&registry->priv->sources_lock);
  
@@ -556,10 +556,10 @@ index bd9822d..3e021dd 100644
  	g_signal_connect (
  		registry->priv->settings, "changed",
 diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c
-index 980ceb1..02d9551 100644
+index 302aacf..ed4a7fa 100644
 --- a/src/libedataserverui/e-reminders-widget.c
 +++ b/src/libedataserverui/e-reminders-widget.c
-@@ -2132,7 +2132,19 @@ static void
+@@ -2133,7 +2133,19 @@ static void
  e_reminders_widget_init (ERemindersWidget *reminders)
  {
  	reminders->priv = e_reminders_widget_get_instance_private (reminders);
@@ -628,27 +628,3 @@ index d531cb9..c96f1d5 100644
  
  	switch (g_settings_get_int (settings, "proxy-type")) {
  		case 1:
-diff --git a/src/services/evolution-source-registry/evolution-source-registry.c b/src/services/evolution-source-registry/evolution-source-registry.c
-index 1c0a113..6b41423 100644
---- a/src/services/evolution-source-registry/evolution-source-registry.c
-+++ b/src/services/evolution-source-registry/evolution-source-registry.c
-@@ -181,7 +181,18 @@ main (gint argc,
- 
- reload:
- 
--	settings = g_settings_new ("org.gnome.evolution-data-server");
-+	{
-+		g_autoptr(GSettingsSchemaSource) schema_source;
-+		g_autoptr(GSettingsSchema) schema;
-+		schema_source = g_settings_schema_source_new_from_directory("@EDS@",
-+									    g_settings_schema_source_get_default(),
-+									    TRUE,
-+									    NULL);
-+		schema = g_settings_schema_source_lookup(schema_source,
-+							 "org.gnome.evolution-data-server",
-+							 FALSE);
-+		settings = g_settings_new_full(schema, NULL, NULL);
-+	}
- 
- 	if (!opt_disable_migration && !g_settings_get_boolean (settings, "migrated")) {
- 		g_settings_set_boolean (settings, "migrated", TRUE);
diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index 7fa55c62c465..4a686d1d2775 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "evolution-data-server";
-  version = "3.58.3";
+  version = "3.60.1";
 
   outputs = [
     "out"
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz";
-    hash = "sha256-2hNtEZDZ6LCUmUUvYFjiTu5rd/RBqMdp90pSRRvzefE=";
+    hash = "sha256-M/ktO4gi66BMMTeWwHeMu2Who4Ry6FftxfmIVMyps0w=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch
index f968cf05558b..2cd005612c20 100644
--- a/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch
+++ b/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch
@@ -1,5 +1,5 @@
 diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c
-index 9dcc5b1..9588be3 100644
+index a976b2e..c15e6f3 100644
 --- a/src/EWS/camel/camel-ews-utils.c
 +++ b/src/EWS/camel/camel-ews-utils.c
 @@ -1562,7 +1562,7 @@ ews_utils_save_category_changes (GHashTable *old_categories, /* gchar *guid ~> C
@@ -32,7 +32,7 @@ index 9dcc5b1..9588be3 100644
  
  	for (ii = 0; strv && strv[ii]; ii++) {
 diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c
-index a4997c7..94be919 100644
+index 6c1ebd6..4b7de44 100644
 --- a/src/Microsoft365/camel/camel-m365-store.c
 +++ b/src/Microsoft365/camel/camel-m365-store.c
 @@ -311,7 +311,7 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca
@@ -93,10 +93,10 @@ index cec5417..38f1a87 100644
  		if (g_settings_get_boolean (settings, "use-system-timezone"))
  			location = e_cal_util_get_system_timezone_location ();
 diff --git a/src/common/e-ews-common-utils.c b/src/common/e-ews-common-utils.c
-index f388e3b..ed57213 100644
+index 1cc5a58..05b3610 100644
 --- a/src/common/e-ews-common-utils.c
 +++ b/src/common/e-ews-common-utils.c
-@@ -208,10 +208,21 @@ e_ews_common_utils_get_configured_icaltimezone (void)
+@@ -167,10 +167,21 @@ e_ews_common_utils_get_configured_icaltimezone (void)
  	ICalTimezone *zone = NULL;
  	gchar *location = NULL;
  
diff --git a/pkgs/by-name/ev/evolution-ews/package.nix b/pkgs/by-name/ev/evolution-ews/package.nix
index 139ca856ccf4..be943e069f4c 100644
--- a/pkgs/by-name/ev/evolution-ews/package.nix
+++ b/pkgs/by-name/ev/evolution-ews/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "evolution-ews";
-  version = "3.58.3";
+  version = "3.60.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-ews/${lib.versions.majorMinor finalAttrs.version}/evolution-ews-${finalAttrs.version}.tar.xz";
-    hash = "sha256-P274u2OJAT6EPiWM4dwxeokaNPh9eXgMmu8E0nQavJI=";
+    hash = "sha256-CiL4ZevrcOJnlSD9LZSqmXPEA8vk4DqojPjyPzWOi20=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix
index a8c982f87805..cf55e71a2037 100644
--- a/pkgs/by-name/ex/expat/package.nix
+++ b/pkgs/by-name/ex/expat/package.nix
@@ -18,7 +18,7 @@
 # files.
 
 let
-  version = "2.7.5";
+  version = "2.8.0";
   tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     url =
       with finalAttrs;
       "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
-    hash = "sha256-EDLf70/xf3BGSCfaooNpsg9lhNEIvDbxerFnbh7dL5E=";
+    hash = "sha256-o3v64KqXdb2FIevYXcRW1Ibw/zETj2yR/ZAupzJiRUI=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/fo/folks/fix-docs-build-with-eds-3.59.patch b/pkgs/by-name/fo/folks/fix-docs-build-with-eds-3.59.patch
new file mode 100644
index 000000000000..30abd12e520d
--- /dev/null
+++ b/pkgs/by-name/fo/folks/fix-docs-build-with-eds-3.59.patch
@@ -0,0 +1,15 @@
+diff --git a/docs/meson.build b/docs/meson.build
+index 67c664513033dd8f892870836efaebcab3960af3..83a011f3852b240539fe0d41356ef74fe07a7887 100644
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -39,6 +39,10 @@ if eds_backend_enabled
+     docs_common_valadoc_flags += ['-D', 'HAS_EDS_3_41']
+   endif
+ 
++  if eds_dep.version().version_compare('>=3.59.1')
++    docs_common_valadoc_flags += ['-D', 'HAS_EDS_3_60']
++  endif
++
+   valadoc_targets += {
+     'name': 'folks-eds',
+     'source_files': eds_backendlib_sources,
diff --git a/pkgs/by-name/fo/folks/package.nix b/pkgs/by-name/fo/folks/package.nix
index 25e649f26753..61d3db04472f 100644
--- a/pkgs/by-name/fo/folks/package.nix
+++ b/pkgs/by-name/fo/folks/package.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-IfROK9q7Huf45Bu5ltEKx9rzXHjEmBd9sMAPWAogqRQ=";
   };
 
+  patches = [
+    # https://gitlab.gnome.org/GNOME/folks/-/merge_requests/81
+    ./fix-docs-build-with-eds-3.59.patch
+  ];
+
   nativeBuildInputs = [
     gettext
     gobject-introspection
diff --git a/pkgs/by-name/fo/font-util/package.nix b/pkgs/by-name/fo/font-util/package.nix
index f21ee7bc2091..7c83cf5cdca1 100644
--- a/pkgs/by-name/fo/font-util/package.nix
+++ b/pkgs/by-name/fo/font-util/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "font-util";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "font";
     repo = "util";
     tag = "font-util-${finalAttrs.version}";
-    hash = "sha256-cv6Whex1s4+J7Ue4IOHdO9WtrarTgSpLEghWpbUl+0o=";
+    hash = "sha256-tB6A5ezfHwzhL3HsWPZjX3/d53Zkm4hBFbxOnTUgNZc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gd/gdb/package.nix b/pkgs/by-name/gd/gdb/package.nix
index 361ad20350b4..fdc6c275d733 100644
--- a/pkgs/by-name/gd/gdb/package.nix
+++ b/pkgs/by-name/gd/gdb/package.nix
@@ -13,6 +13,7 @@
   buildPackages,
 
   # Run time
+  bashNonInteractive,
   readline,
   expat,
   libipt,
@@ -47,6 +48,7 @@
     (lib.getLib targetPackages.stdenv.cc.cc)
   ],
   writeScript,
+  versionCheckHook,
 }:
 
 let
@@ -109,9 +111,11 @@ stdenv.mkDerivation (finalAttrs: {
     texinfo
     perl
     setupDebugInfoDirs
-  ];
+  ]
+  ++ optional pythonSupport python3;
 
   buildInputs = [
+    bashNonInteractive # for shebangs of gcore, gdb-add-index, gstack
     ncurses
     readline
     expat
@@ -126,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optional withTui ncurses
   ++ optional withMpfr mpfr
   ++ optional withGmp gmp
-  ++ optional pythonSupport python3
   ++ optional withGuile guile
   ++ optional enableDebuginfod (elfutils.override { enableDebuginfod = true; })
   ++ optional stdenv.hostPlatform.isDarwin libiconv;
@@ -135,6 +138,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
+  strictDeps = true;
+
   enableParallelBuilding = true;
 
   # darwin build fails with format hardening since v7.12
@@ -182,9 +187,9 @@ stdenv.mkDerivation (finalAttrs: {
     (withFeature true "system-readline")
     (withFeature true "system-zlib")
     (withFeature true "expat")
-    (withFeatureAs true "libexpat-prefix" "${expat.dev}")
-    (withFeatureAs withGmp "gmp" "${gmp.dev}")
-    (withFeatureAs withMpfr "mpfr" "${mpfr.dev}")
+    (withFeatureAs true "libexpat-prefix" expat.dev)
+    (withFeatureAs withGmp "gmp" gmp.dev)
+    (withFeatureAs withMpfr "mpfr" mpfr.dev)
     (withFeature pythonSupport "python")
     (withFeature withGuile "guile")
     (enableFeature enableSim "sim")
@@ -207,6 +212,9 @@ stdenv.mkDerivation (finalAttrs: {
     rm -v $out/share/info/bfd.info
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   passthru = {
     updateScript = writeScript "update-gdb" ''
       #!/usr/bin/env nix-shell
diff --git a/pkgs/by-name/gd/gdk-pixbuf/package.nix b/pkgs/by-name/gd/gdk-pixbuf/package.nix
index 8b782a384304..0a1e32428806 100644
--- a/pkgs/by-name/gd/gdk-pixbuf/package.nix
+++ b/pkgs/by-name/gd/gdk-pixbuf/package.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchurl,
+  fetchpatch,
   nixosTests,
   fixDarwinDylibNames,
   meson,
@@ -28,7 +29,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdk-pixbuf";
-  version = "2.44.5";
+  version = "2.44.6";
 
   outputs = [
     "out"
@@ -40,12 +41,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${lib.versions.majorMinor finalAttrs.version}/gdk-pixbuf-${finalAttrs.version}.tar.xz";
-    hash = "sha256-abk+CRObgMDuZhUD1g3rWlh0oxdytRhLnNVGKkEAq2g=";
+    hash = "sha256-FAwtC4mfz4U+6SsmNzydwijbzeCCCkJGaT9DKKJ0Zvo=";
   };
 
   patches = [
     # Move installed tests to a separate output
     ./installed-tests-path.patch
+
+    # Fix loading of xpm module if built-in
+    # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/267
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/62b8f9fd0bb3b862823cd34afce4b389fbd27569.patch";
+      hash = "sha256-ECEIt8lq/jBtDdBetErKpap2PWGav10vqCXKCpIQSyA=";
+    })
   ];
 
   # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work
@@ -83,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   mesonFlags = [
+    # https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/work_items/13
+    "-Dlegacy_xpm=enabled"
     "-Dgio_sniffing=false"
     "-Dandroid=disabled"
     "-Dglycin=disabled"
diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch
index 2de3f651a327..b9ca234e77e3 100644
--- a/pkgs/by-name/gd/gdm/fix-paths.patch
+++ b/pkgs/by-name/gd/gdm/fix-paths.patch
@@ -1,16 +1,18 @@
-diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
-index ad2e65cf7..61fb78db8 100644
---- a/daemon/gdm-local-display-factory.c
-+++ b/daemon/gdm-local-display-factory.c
-@@ -272,7 +272,7 @@ struct GdmDisplayServerConfiguration {
-         { "wayland", GDM_KEY_WAYLAND_ENABLE, NULL, "wayland" },
- #endif
- #ifdef ENABLE_X11_SUPPORT
--        { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
-+        { "xorg", GDM_KEY_XORG_ENABLE, "@xorgserver@/bin/Xorg", "x11" },
- #endif
-         { NULL, NULL, NULL },
- };
+diff --git a/common/gdm-common.c b/common/gdm-common.c
+index edf702ec5..3a75af430 100644
+--- a/common/gdm-common.c
++++ b/common/gdm-common.c
+@@ -994,8 +994,8 @@ const char * const
+ gdm_find_x_server (void)
+ {
+         const char * const x_servers[] = {
+-                "/usr/bin/Xorg",
+-                "/usr/bin/X",
++                "@xorgserver@/bin/Xorg",
++                "@xorgserver@/bin/X",
+         };
+         const char *override = NULL;
+ 
 diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
 index 457dcf88d..a71b89ba8 100644
 --- a/daemon/gdm-manager.c
diff --git a/pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch b/pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch
index 58481f0730fa..bb76aa19aa1a 100644
--- a/pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch
+++ b/pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch
@@ -1,40 +1,33 @@
 diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
-index 88fe96f..b1b140a 100644
+index ed01fbe52..de3a6e647 100644
 --- a/daemon/gdm-x-session.c
 +++ b/daemon/gdm-x-session.c
-@@ -664,18 +664,34 @@ spawn_session (State        *state,
-                                                           state->session_command,
-                                                           NULL);
-         } else {
-+                char const *session_wrapper;
-+                char *eff_session_command;
-                 int ret;
-                 char **argv;
+@@ -670,12 +670,27 @@ spawn_session (State        *state,
+                 g_subprocess_launcher_setenv (launcher, "WINDOWPATH", vt, TRUE);
+         }
  
--                ret = g_shell_parse_argv (state->session_command,
-+                session_wrapper = g_getenv("GDM_X_SESSION_WRAPPER");
-+                if (session_wrapper != NULL) {
-+                        char *quoted_wrapper = g_shell_quote(session_wrapper);
-+                        eff_session_command = g_strjoin(" ", quoted_wrapper, state->session_command, NULL);
-+                        g_free(quoted_wrapper);
-+                } else {
-+                        eff_session_command = state->session_command;
-+                }
++        char const *session_wrapper;
++        char *eff_session_command;
++        session_wrapper = g_getenv ("GDM_X_SESSION_WRAPPER");
++        if (session_wrapper != NULL) {
++                char *quoted_wrapper = g_shell_quote (session_wrapper);
++                eff_session_command = g_strjoin (" ", quoted_wrapper, state->session_command, NULL);
++                g_free (quoted_wrapper);
++        } else {
++                eff_session_command = state->session_command;
++        }
 +
-+                ret = g_shell_parse_argv (eff_session_command,
-                                           NULL,
-                                           &argv,
-                                           &error);
+         subprocess = g_subprocess_launcher_spawn (launcher,
+                                                   &error,
+                                                   GDMCONFDIR "/Xsession",
+-                                                  state->session_command,
++                                                  eff_session_command,
+                                                   NULL);
  
-+                if (session_wrapper != NULL) {
-+                        g_free(eff_session_command);
-+                }
++        if (session_wrapper != NULL) {
++                g_free (eff_session_command);
++        }
 +
-                 if (!ret) {
-                         g_debug ("could not parse session arguments: %s", error->message);
-                         goto out;
-                 }
-+
-                 subprocess = g_subprocess_launcher_spawnv (launcher,
-                                                            (const char * const *) argv,
-                                                            &error);
+         if (subprocess == NULL) {
+                 g_debug ("could not start session: %s", error->message);
+                 goto out;
diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index 72a3fe6d97e4..a84f733c3345 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -25,6 +25,7 @@
   audit,
   gobject-introspection,
   plymouth,
+  polkit,
   coreutils,
   xorg-server,
   dbus,
@@ -43,7 +44,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdm";
-  version = "49.2";
+  version = "50.0";
 
   outputs = [
     "out"
@@ -52,14 +53,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
-    hash = "sha256-mBNjH59fD4YOoUpDeGbmDvx77TAjt8O3Zcxd4d5ZegY=";
+    hash = "sha256-ZG9T1o8tLRRxRv+uuFBH3ti4E9yxwQTY8Ow2ymCetb8=";
   };
 
   mesonFlags = [
     "-Dgdm-xsession=true"
     # TODO: Setup a default-path? https://gitlab.gnome.org/GNOME/gdm/-/blob/6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770/meson_options.txt#L6
     "-Dinitial-vt=1"
-    "-Dudev-dir=${placeholder "out"}/lib/udev/rules.d"
     "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
     "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
     "--sysconfdir=/etc"
@@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
     libselinux
     pam
     plymouth
+    polkit
     systemd
   ];
 
@@ -133,11 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    # Upstream checks some common paths to find an `X` binary. We already know it.
-    echo #!/bin/sh > build-aux/find-x-server.sh
-    echo "echo ${lib.getBin xorg-server}/bin/X" >> build-aux/find-x-server.sh
-    patchShebangs build-aux/find-x-server.sh
-
     # Reverts https://gitlab.gnome.org/GNOME/gdm/-/commit/b0f802e36ff948a415bfd2bccaa268b6990515b7
     # The gdm-auth-config tool is probably not too useful for NixOS, but we still want the dconf profile
     # installed (mostly just because .passthru.tests can make use of it).
diff --git a/pkgs/by-name/gd/gdm/reset-environment.patch b/pkgs/by-name/gd/gdm/reset-environment.patch
index 61defd9c4bc2..33a1f8125b5d 100644
--- a/pkgs/by-name/gd/gdm/reset-environment.patch
+++ b/pkgs/by-name/gd/gdm/reset-environment.patch
@@ -1,20 +1,24 @@
+diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c
+index 3ca2d1496..cb9e96101 100644
 --- a/daemon/gdm-wayland-session.c
 +++ b/daemon/gdm-wayland-session.c
-@@ -285,6 +285,7 @@ spawn_session (State        *state,
+@@ -287,6 +287,7 @@ spawn_session (State        *state,
+                                                     "XAUTHORITY",
                                                      "WAYLAND_DISPLAY",
                                                      "WAYLAND_SOCKET",
-                                                     "GNOME_SHELL_SESSION_MODE",
 +                                                    "__NIXOS_SET_ENVIRONMENT_DONE",
                                                      NULL };
- 
-         g_debug ("Running wayland session");
+         /* The environment variables listed below are those we have set (or
+          * received from our own execution environment) only as a fallback to
+diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
+index ed01fbe52..06efac2df 100644
 --- a/daemon/gdm-x-session.c
 +++ b/daemon/gdm-x-session.c
-@@ -610,6 +610,7 @@ spawn_session (State        *state,
+@@ -603,6 +603,7 @@ spawn_session (State        *state,
+                                                      "XAUTHORITY",
                                                       "WAYLAND_DISPLAY",
                                                       "WAYLAND_SOCKET",
-                                                      "GNOME_SHELL_SESSION_MODE",
 +                                                     "__NIXOS_SET_ENVIRONMENT_DONE",
                                                       NULL };
- 
-         g_debug ("Running X session");
+         /* The environment variables listed below are those we have set (or
+          * received from our own execution environment) only as a fallback to
diff --git a/pkgs/by-name/ge/geoclue2/package.nix b/pkgs/by-name/ge/geoclue2/package.nix
index 95fb94098f4c..354321b2a9d2 100644
--- a/pkgs/by-name/ge/geoclue2/package.nix
+++ b/pkgs/by-name/ge/geoclue2/package.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
     ./add-option-for-installation-sysconfdir.patch
   ];
 
+  separateDebugInfo = true;
+
   nativeBuildInputs = [
     pkg-config
     intltool
diff --git a/pkgs/by-name/ge/gexiv2/package.nix b/pkgs/by-name/ge/gexiv2/package.nix
index f7b602a3351b..2e7334fc42c6 100644
--- a/pkgs/by-name/ge/gexiv2/package.nix
+++ b/pkgs/by-name/ge/gexiv2/package.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
     updateScript = gnome.updateScript {
       packageName = pname;
       versionPolicy = "odd-unstable";
+      freeze = true;
     };
   };
 
diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix
index 2dcfbe771e77..9a1e8de811c5 100644
--- a/pkgs/by-name/gh/ghex/package.nix
+++ b/pkgs/by-name/gh/ghex/package.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghex";
-  version = "48.3";
+  version = "50.0";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz";
-    hash = "sha256-y8hEJ7Kt6pQDUCoSXzZrnyiIE/cugb9rGRVGBvFZ3Tk=";
+    hash = "sha256-gyXKSx+nU3XPiVHmL4Z/pqhCgiwt1aRqmHc2CBizAhI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix
index 3ebd9e61ab79..12ea703533fa 100644
--- a/pkgs/by-name/gh/ghostscript/package.nix
+++ b/pkgs/by-name/gh/ghostscript/package.nix
@@ -67,13 +67,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghostscript${lib.optionalString x11Support "-with-X"}";
-  version = "10.06.0";
+  version = "10.07.0";
 
   src = fetchurl {
     url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${
       lib.replaceStrings [ "." ] [ "" ] finalAttrs.version
     }/ghostscript-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ZDUmSMLAgcip+xoS3Bll4B6tfFf1i3LRtU9u8c7zxWE=";
+    hash = "sha256-3azk4XIflnpVA5uv9WSEAiXguqHU9UMiR8oczRRzt8E=";
   };
 
   patches = [
@@ -165,10 +165,10 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   configureFlags = [
+    "CFLAGS=-std=gnu17"
     "--with-system-libtiff"
     "--without-tesseract"
   ]
-  ++ lib.optional stdenv.cc.isClang "CFLAGS=-std=gnu17" # FIXME: make it unconditional
   ++ lib.optionals dynamicDrivers [
     "--enable-dynamic"
     "--disable-hidden-visibility"
diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix
index 06d755e4a403..b211e2455376 100644
--- a/pkgs/by-name/gi/git/package.nix
+++ b/pkgs/by-name/gi/git/package.nix
@@ -61,7 +61,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.53.0";
+  version = "2.54.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [
     CGI
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
         }.tar.xz"
       else
         "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    hash = "sha256-WBi9fYCwYbu9/sikM9YJ3IgYoFmR9zH/xKVh4soYxlM=";
+    hash = "sha256-9okWI2TBDeee+Jqo2/SHMesFfjTtu9IKylEM4BVGgaM=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -123,6 +123,14 @@ stdenv.mkDerivation (finalAttrs: {
     ./git-sh-i18n.patch
     # Do not search for sendmail in /usr, only in $PATH
     ./git-send-email-honor-PATH.patch
+    # The 'total N' header from ls -l is unstable on ZFS and similar
+    # filesystems, causing spurious failures.
+    # https://github.com/NixOS/nixpkgs/issues/498789
+    (fetchurl {
+      name = "t7703-ignore-ls-total.patch";
+      url = "https://lore.kernel.org/git/20260504101429.340123-1-joerg@thalheim.io/raw";
+      hash = "sha256-44EPfEJ39LjPWjqjFb52EKNaJGzYxZzJaJOis8QnazU=";
+    })
     # Address test failure (new in 2.52.0) caused by `git-gui--askyesno` being
     # installed by `make install`.
     (fetchurl {
@@ -130,13 +138,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/raw";
       hash = "sha256-vvhbvg74OIMzfksHiErSnjOZ+W0M/T9J8GOQ4E4wKbU=";
     })
-    # Fix build failure on Darwin when building Keychain integration
-    # See https://github.com/git/git/pull/2188 and https://github.com/Homebrew/homebrew-core/pull/266961
-    (fetchurl {
-      name = "osxkeychain-define-build-targets-in-toplevel-Makefile.patch";
-      url = "https://lore.kernel.org/git/pull.2046.v2.git.1770775169908.gitgitgadget@gmail.com/raw";
-      hash = "sha256-7jTiMM5XFRDj/srtVf8olW62T/mesqLcyRp3NZJcid8=";
-    })
   ]
   ++ lib.optionals rustSupport [
     # The above patch doesn’t work with Rust support enabled.
@@ -168,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
   + lib.optionalString (rustSupport && (stdenv.buildPlatform != stdenv.hostPlatform)) ''
     substituteInPlace Makefile \
       --replace-fail "RUST_TARGET_DIR = target/" \
-                     "RUST_TARGET_DIR = target/${stdenv.hostPlatform.rust.rustcTargetSpec}/"
+                     "RUST_TARGET_DIR = target/${stdenv.hostPlatform.rust.cargoShortTarget}/"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gixy/package.nix b/pkgs/by-name/gi/gixy/package.nix
index aa5daa25a642..0eacc0d501d9 100644
--- a/pkgs/by-name/gi/gixy/package.nix
+++ b/pkgs/by-name/gi/gixy/package.nix
@@ -40,8 +40,9 @@ python.pkgs.buildPythonApplication rec {
     # Migrate tests to pytest
     # https://github.com/yandex/gixy/pull/146
     (fetchpatch2 {
-      url = "https://github.com/yandex/gixy/compare/6f68624a7540ee51316651bda656894dc14c9a3e...b1c6899b3733b619c244368f0121a01be028e8c2.patch";
-      hash = "sha256-6VUF2eQ2Haat/yk8I5qIXhHdG9zLQgEXJMLfe25OKEo=";
+      name = "migrate-tests-to-pytest.patch";
+      url = "https://github.com/yandex/gixy/compare/6f68624a7540ee51316651bda656894dc14c9a3e...b1c6899b3733b619c244368f0121a01be028e8c2.diff?full_index=1";
+      hash = "sha256-qIKKTC65ewZqiKiNLcaglKEdFh0SBZMJgIvY41/7WUc=";
     })
     ./python3.13-compat.patch
   ];
diff --git a/pkgs/by-name/gj/gjs/disable-introspection-test.patch b/pkgs/by-name/gj/gjs/disable-introspection-test.patch
index d597f99b02d8..9b5a2e088aec 100644
--- a/pkgs/by-name/gj/gjs/disable-introspection-test.patch
+++ b/pkgs/by-name/gj/gjs/disable-introspection-test.patch
@@ -1,12 +1,10 @@
-diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
-index 07759690..43c87c59 100644
 --- a/installed-tests/js/meson.build
 +++ b/installed-tests/js/meson.build
-@@ -34,7 +34,6 @@ jasmine_tests = [
+@@ -37,7 +37,6 @@ jasmine_tests = [
+     'GObjectInterface',
+     'GObjectValue',
      'GTypeClass',
-     'Importer',
-     'Importer2',
 -    'Introspection',
-     'Lang',
-     'LegacyByteArray',
-     'LegacyClass',
+     'Namespace',
+     'ParamSpec',
+     'Print',
diff --git a/pkgs/by-name/gj/gjs/disable-umlaut-test.patch b/pkgs/by-name/gj/gjs/disable-umlaut-test.patch
index b4f4be0f16aa..7b0f3c7dfab0 100644
--- a/pkgs/by-name/gj/gjs/disable-umlaut-test.patch
+++ b/pkgs/by-name/gj/gjs/disable-umlaut-test.patch
@@ -1,10 +1,8 @@
-diff --git a/installed-tests/js/testGIMarshalling.js b/installed-tests/js/testGIMarshalling.js
-index b94aa7c8..8f79fe71 100644
 --- a/installed-tests/js/testGIMarshalling.js
 +++ b/installed-tests/js/testGIMarshalling.js
-@@ -2931,7 +2931,7 @@ describe('Filename tests', function () {
+@@ -3013,7 +3013,7 @@ describe('Filename tests', function () {
      });
- 
+
      it('various types of path existing', function () {
 -        const paths = ['foo-2', 'öäü-3'];
 +        const paths = ['foo-2'];
diff --git a/pkgs/by-name/gj/gjs/fix-paths.patch b/pkgs/by-name/gj/gjs/fix-paths.patch
index 99e82c9be3dc..0d17eb44f684 100644
--- a/pkgs/by-name/gj/gjs/fix-paths.patch
+++ b/pkgs/by-name/gj/gjs/fix-paths.patch
@@ -1,12 +1,10 @@
-diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh
-index 0d118490..54c5507e 100755
 --- a/installed-tests/debugger-test.sh
 +++ b/installed-tests/debugger-test.sh
 @@ -6,7 +6,7 @@
  if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then
      gjs="$TOP_BUILDDIR/gjs-console"
  else
--    gjs=gjs-console
+-    gjs="gjs-console"
 +    gjs=@gjsConsole@
  fi
  
diff --git a/pkgs/by-name/gj/gjs/installed-tests-path.patch b/pkgs/by-name/gj/gjs/installed-tests-path.patch
index 403a9c372d4e..99dcbcfde95b 100644
--- a/pkgs/by-name/gj/gjs/installed-tests-path.patch
+++ b/pkgs/by-name/gj/gjs/installed-tests-path.patch
@@ -1,5 +1,3 @@
-diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
-index 98475f7d..942d9eca 100644
 --- a/installed-tests/js/meson.build
 +++ b/installed-tests/js/meson.build
 @@ -10,7 +10,7 @@ jsunit_resources_files = gnome.compile_resources('jsunit-resources',
@@ -20,7 +18,7 @@ index 98475f7d..942d9eca 100644
      }
      configure_file(configuration: test_description_subst,
          input: '../minijasmine.test.in',
-@@ -122,7 +122,7 @@ foreach test : dbus_tests
+@@ -122,7 +122,7 @@ endif
  
  dbus_test_description_subst = {
      'name': 'testGDBus.js',
@@ -29,7 +27,7 @@ index 98475f7d..942d9eca 100644
  }
  configure_file(
      configuration: dbus_test_description_subst,
-@@ -159,7 +159,7 @@ foreach test : modules_tests
+@@ -166,7 +166,7 @@ foreach test : modules_tests
  
      esm_test_description_subst = {
          'name': 'test@0@.js'.format(test),
@@ -37,9 +35,7 @@ index 98475f7d..942d9eca 100644
 +        'installed_tests_execdir': installed_tests_execdir,
      }
      configure_file(configuration: esm_test_description_subst,
-         input: '../minijasmine-module.test.in',
-diff --git a/installed-tests/meson.build b/installed-tests/meson.build
-index 7a7c48ab..52508c2c 100644
+         input: '../minijasmine-legacy-importer.test.in',
 --- a/installed-tests/meson.build
 +++ b/installed-tests/meson.build
 @@ -34,7 +34,7 @@ foreach test : simple_tests
@@ -51,7 +47,7 @@ index 7a7c48ab..52508c2c 100644
      }
      configure_file(configuration: test_description_subst,
          input: 'script.test.in', output: 'test@0@.sh.test'.format(test),
-@@ -123,7 +123,7 @@ foreach test : debugger_tests
+@@ -88,7 +88,7 @@ foreach test : debugger_tests
  
      test_description_subst = {
          'name': '@0@.debugger'.format(test),
@@ -60,19 +56,15 @@ index 7a7c48ab..52508c2c 100644
      }
      configure_file(configuration: test_description_subst,
          input: 'debugger.test.in',
-diff --git a/installed-tests/script.test.in b/installed-tests/script.test.in
-index debefc4c..96a91b88 100644
---- a/installed-tests/script.test.in
-+++ b/installed-tests/script.test.in
-@@ -3,5 +3,5 @@
+@@ -122,7 +122,7 @@ foreach test : module_debugger_tests
  
- [Test]
- Type=session
--Exec=sh @prefix@/@installed_tests_execdir@/scripts/@name@
-+Exec=sh @installed_tests_execdir@/scripts/@name@
- Output=TAP
-diff --git a/meson.build b/meson.build
-index bbfe8bc8..e6f87dc3 100644
+     test_description_subst = {
+         'name': '@0@.debugger'.format(filename),
+-        'installed_tests_execdir': prefix / installed_tests_execdir,
++        'installed_tests_execdir': installed_tests_execdir,
+     }
+     configure_file(configuration: test_description_subst,
+         input: 'debugger.test.in',
 --- a/meson.build
 +++ b/meson.build
 @@ -25,8 +25,8 @@ datadir = get_option('datadir')
@@ -86,7 +78,7 @@ index bbfe8bc8..e6f87dc3 100644
  
  ### Check for conflicting build options ########################################
  
-@@ -577,9 +577,9 @@ install_data('installed-tests/extra/gjs.supp', install_dir: gjsjsdir / 'valgrind
+@@ -605,9 +605,9 @@ install_data('installed-tests/extra/gjs.supp', install_dir: gjsjsdir / 'valgrind
  install_data('installed-tests/extra/lsan.supp', install_dir: gjsjsdir / 'lsan')
  
  if get_option('installed_tests')
@@ -98,8 +90,6 @@ index bbfe8bc8..e6f87dc3 100644
  endif
  
  ### Generate pkg-config file ###################################################
-diff --git a/meson_options.txt b/meson_options.txt
-index fe425efd..29325756 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -24,3 +24,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,
diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix
index a4e0581a7a9f..30b62ac129a9 100644
--- a/pkgs/by-name/gj/gjs/package.nix
+++ b/pkgs/by-name/gj/gjs/package.nix
@@ -8,7 +8,6 @@
   pkg-config,
   gnome,
   gtk3,
-  gtk4,
   atk,
   gobject-introspection,
   spidermonkey_140,
@@ -31,7 +30,8 @@
 let
   testDeps = [
     gtk3
-    gtk4
+    # FIXME: Gtk4Warnings fails
+    # gtk4
     atk
     pango.out
     gdk-pixbuf
@@ -41,7 +41,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gjs";
-  version = "1.86.0";
+  version = "1.88.0";
 
   outputs = [
     "out"
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Y0SPeleATUwqjQx/XpDiJNBNTrLVYBQsB2xlqO2gB5k=";
+    hash = "sha256-MKC58zF+jmCxiW2ykDxw6LDNM9+VPDKHVYA6dRkdxFM=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix
index 44b9c0f87d1b..cf554d53e403 100644
--- a/pkgs/by-name/gl/glib/package.nix
+++ b/pkgs/by-name/gl/glib/package.nix
@@ -82,7 +82,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glib";
-  version = "2.86.3";
+  version = "2.88.1";
 
   outputs = [
     "bin"
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-syEdjTS5313KBXh+8K1dfKdd7JmLlw4aqwAB0imXfGU=";
+    hash = "sha256-UauATFb26rPlBFx3TRKQrF5Mkj1Pmj2OMxI77kXBhA4=";
   };
 
   patches =
diff --git a/pkgs/by-name/gl/glibmm_2_68/package.nix b/pkgs/by-name/gl/glibmm_2_68/package.nix
index 69744a348c83..0500dca513a4 100644
--- a/pkgs/by-name/gl/glibmm_2_68/package.nix
+++ b/pkgs/by-name/gl/glibmm_2_68/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glibmm";
-  version = "2.86.0";
+  version = "2.88.0";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glibmm/${lib.versions.majorMinor finalAttrs.version}/glibmm-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OcDp9toEbWeTkHdO/bmtVkQ2I2c23C94JeYUstQIeCY=";
+    hash = "sha256-plSdo6bEPeg7hxfa5UE8V6YNkvbsxiRhXGEtC7CtD+I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index a750ecb148b2..66f02fcc542a 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -11,11 +11,11 @@
   version ?
     # This is a workaround for update-source-version to be able to update this
     let
-      _version = "0-unstable-2026-02-05";
+      _version = "0-unstable-2026-03-05";
     in
     _version,
-  rev ? "304bbef6c7e9a86630c12986b99c8654eb7fe648",
-  hash ? "sha256-wFCuu4GR0N7QZCwT8UAhqH5moicYQjZ4ZLI58AM4pJ0=",
+  rev ? "d8c2f07d653520568da7cace755a87dad241b72d",
+  hash ? "sha256-3AfExm7NL5GJXyC5JCPbGC70D59doRfIZIgpt6MLy9Y=",
 }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix
index da9072f1b8b7..d8154407e6d9 100644
--- a/pkgs/by-name/gn/gnome-backgrounds/package.nix
+++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-backgrounds";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major finalAttrs.version}/gnome-backgrounds-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Af4mDeWLoA5Eq6WJqZjjPovHrsxwHfC+5kz0z7pE9LU=";
+    hash = "sha256-Gs26estPNMcyH+vGJzRENE/VX9WTYR1EbecIYBg7Urg=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-bluetooth/package.nix b/pkgs/by-name/gn/gnome-bluetooth/package.nix
index bf1fc774fe50..7a7594931921 100644
--- a/pkgs/by-name/gn/gnome-bluetooth/package.nix
+++ b/pkgs/by-name/gn/gnome-bluetooth/package.nix
@@ -28,7 +28,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-bluetooth";
-  version = "47.1";
+  version = "47.2";
 
   # TODO: split out "lib"
   outputs = [
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz";
-    hash = "sha256-A+PnQDoVEI/8FJYhCh2lwpYbKDSlwH7Mx6P0kxldq6M=";
+    hash = "sha256-QfIObWF2tyWQr2NVKyMtg/L//dd+z6perzLFpKhvrWQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-boxes/package.nix b/pkgs/by-name/gn/gnome-boxes/package.nix
index 81b07fc583e0..48df56993ca5 100644
--- a/pkgs/by-name/gn/gnome-boxes/package.nix
+++ b/pkgs/by-name/gn/gnome-boxes/package.nix
@@ -50,11 +50,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-boxes";
-  version = "49.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major finalAttrs.version}/gnome-boxes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-VUeIAd3Qg4IL0yMZKoN04E879CoOcSYy0F5olVMORMo=";
+    hash = "sha256-/Wpd4Y0QkJRsqZ8fWjSqPhXcgYP2pyIm6NFQShNnLWc=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix
index ac949d15e660..e0d73bc14464 100644
--- a/pkgs/by-name/gn/gnome-builder/package.nix
+++ b/pkgs/by-name/gn/gnome-builder/package.nix
@@ -43,7 +43,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-builder";
-  version = "49.1";
+  version = "50.0";
 
   outputs = [
     "out"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz";
-    hash = "sha256-O55HmDiPlZ4QMsas5KX7e05Yi2M5/OTCLsJqvoafiis=";
+    hash = "sha256-RtVP0T9PS9tu7X0AS0mdC22adqb6/GitFsOJlT/ZL0Y=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix
index 16bfbe636829..523d23f66fc2 100644
--- a/pkgs/by-name/gn/gnome-calculator/package.nix
+++ b/pkgs/by-name/gn/gnome-calculator/package.nix
@@ -28,11 +28,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-calculator";
-  version = "49.2";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major finalAttrs.version}/gnome-calculator-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3fTNLt2hNcQcivaPnAzc2dmpFjy59/jijKLI6B/Ydlc=";
+    hash = "sha256-gFPWiRVl6IKHS2XB21HFvzEABet4i4usNUY5B0M1CpA=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix
index c3f2f04b7c1a..9f76e9a89df2 100644
--- a/pkgs/by-name/gn/gnome-calendar/package.nix
+++ b/pkgs/by-name/gn/gnome-calendar/package.nix
@@ -12,6 +12,7 @@
   gettext,
   libxml2,
   gnome,
+  fribidi,
   gtk4,
   evolution-data-server-gtk4,
   libical,
@@ -24,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-calendar";
-  version = "49.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major finalAttrs.version}/gnome-calendar-${finalAttrs.version}.tar.xz";
-    hash = "sha256-DBEVqylNUyxMGfVs4Neu5T+OoysUMCCd0dntpHqD0sI=";
+    hash = "sha256-S3XfBxpS2Y+zXmR9AYAwEp0k2QB3kNAkV3RsmGF66rA=";
   };
 
   nativeBuildInputs = [
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    fribidi
     gtk4
     evolution-data-server-gtk4
     libical
diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix
index f6d444760b69..bd5822f9767c 100644
--- a/pkgs/by-name/gn/gnome-characters/package.nix
+++ b/pkgs/by-name/gn/gnome-characters/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-characters";
-  version = "49.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-characters/${lib.versions.major finalAttrs.version}/gnome-characters-${finalAttrs.version}.tar.xz";
-    hash = "sha256-eVwP5DTmAtx4M5H7WDDbx9jh6gXKdyEPsUDi9vQKFFw=";
+    hash = "sha256-QHBzTdY5swlL5Ge7BVpUYbL8MBzfyf7dy0po9HbtWq0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-chess/package.nix b/pkgs/by-name/gn/gnome-chess/package.nix
index c05c18d87fdc..303e17806ce0 100644
--- a/pkgs/by-name/gn/gnome-chess/package.nix
+++ b/pkgs/by-name/gn/gnome-chess/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-chess";
-  version = "49.2";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-chess/${lib.versions.major finalAttrs.version}/gnome-chess-${finalAttrs.version}.tar.xz";
-    hash = "sha256-xAoABKRz/nSawvpPrZjbZBGNGPn9msAu7Po2TwPb6bA=";
+    hash = "sha256-otvnxhO0ZykUF0fii7DLhhTlfeFW07ndpqzosBRqW/w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-clocks/package.nix b/pkgs/by-name/gn/gnome-clocks/package.nix
index ed0b223c66dd..bb49f1bc8bd1 100644
--- a/pkgs/by-name/gn/gnome-clocks/package.nix
+++ b/pkgs/by-name/gn/gnome-clocks/package.nix
@@ -20,21 +20,24 @@
   gdk-pixbuf,
   geoclue2,
   gst_all_1,
+  icu,
   libgweather,
   libadwaita,
+  vorbis-tools,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-clocks";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz";
-    hash = "sha256-v3aRXypJLooFkv5As1NGWTqjnk5ogdYXbg79h3HU5vo=";
+    hash = "sha256-vxZ/f0T08vtCTUcWZSybofKeFuSQceJqG7gz+NznlMY=";
   };
 
   nativeBuildInputs = [
     vala
+    vorbis-tools
     meson
     ninja
     pkg-config
@@ -53,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-desktop
     geocode-glib_2
     geoclue2
+    icu
     libgweather
     libadwaita
   ]
diff --git a/pkgs/by-name/gn/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch b/pkgs/by-name/gn/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch
deleted file mode 100644
index 96688c8d8086..000000000000
--- a/pkgs/by-name/gn/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0417f60c7e760e1ebc6acd3dc23818b38c3929e7 Mon Sep 17 00:00:00 2001
-From: Weijia Wang <contact@weijia.wang>
-Date: Mon, 7 Aug 2023 21:51:30 +0200
-Subject: [PATCH] Fix build with Exiv2 0.28
-
----
- src/gcm-helper-exiv.cpp | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp
-index 7ec69948..23c8b320 100644
---- a/src/gcm-helper-exiv.cpp
-+++ b/src/gcm-helper-exiv.cpp
-@@ -22,6 +22,10 @@
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
- 
-+#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 28)
-+#define HAVE_EXIV2_0_28
-+#endif
-+
- #if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 27)
- #define HAVE_EXIV2_ERROR_CODE
- #include <exiv2/error.hpp>
-@@ -33,7 +37,11 @@
- int
- main (int argc, char* const argv[])
- {
-+#ifdef HAVE_EXIV2_0_28
-+	Exiv2::Image::UniquePtr image;
-+#else
- 	Exiv2::Image::AutoPtr image;
-+#endif
- 	Exiv2::ExifData exifData;
- 	std::string filename;
- 	std::string make;
-@@ -57,7 +65,9 @@ main (int argc, char* const argv[])
- 		if (argc == 2)
- 			filename = argv[1];
- 		if (filename.empty())
--#ifdef HAVE_EXIV2_ERROR_CODE
-+#ifdef HAVE_EXIV2_0_28
-+			throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "No filename specified");
-+#elif defined(HAVE_EXIV2_ERROR_CODE)
- 			throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified");
- #else
- 			throw Exiv2::Error(1, "No filename specified");
-@@ -70,7 +80,9 @@ main (int argc, char* const argv[])
- 		if (exifData.empty()) {
- 			std::string error(argv[1]);
- 			error += ": No Exif data found in the file";
--#ifdef HAVE_EXIV2_ERROR_CODE
-+#ifdef HAVE_EXIV2_0_28
-+			throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, error);
-+#elif defined(HAVE_EXIV2_ERROR_CODE)
- 			throw Exiv2::Error(Exiv2::kerErrorMessage, error);
- #else
- 			throw Exiv2::Error(1, error);
-@@ -89,7 +101,11 @@ main (int argc, char* const argv[])
- 		std::cout << model << "\n";
- 		std::cout << make << "\n";
- 		std::cout << serial << "\n";
-+#ifdef HAVE_EXIV2_0_28
-+	} catch (Exiv2::Error& e) {
-+#else
- 	} catch (Exiv2::AnyError& e) {
-+#endif
- 		std::cout << "Failed to load: " << e << "\n";
- 		retval = -1;
- 	}
--- 
-2.39.2 (Apple Git-143)
-
diff --git a/pkgs/by-name/gn/gnome-color-manager/package.nix b/pkgs/by-name/gn/gnome-color-manager/package.nix
index e47c1758c426..dba4765edd71 100644
--- a/pkgs/by-name/gn/gnome-color-manager/package.nix
+++ b/pkgs/by-name/gn/gnome-color-manager/package.nix
@@ -11,27 +11,19 @@
   gnome,
   glib,
   gtk3,
-  libexif,
-  libtiff,
   colord,
-  colord-gtk,
-  libcanberra-gtk3,
   lcms2,
-  vte,
-  exiv2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-color-manager";
-  version = "3.32.0";
+  version = "3.36.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-color-manager/${lib.versions.majorMinor finalAttrs.version}/gnome-color-manager-${finalAttrs.version}.tar.xz";
-    hash = "sha256-fDwXj6rPy/EdVt4izSZZRqfViqEOPNlowpOOL79Q/e4=";
+    hash = "sha256-OQTUKrtOpWbfC4gOgr8Ln4Y4bGkvFbMYRppMe+M6iH8=";
   };
 
-  patches = [ ./0001-Fix-build-with-Exiv2-0.28.patch ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -45,14 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk3
-    libexif
-    libtiff
     colord
-    colord-gtk
-    libcanberra-gtk3
     lcms2
-    vte
-    exiv2
   ];
 
   strictDeps = true;
@@ -60,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-color-manager";
-      freeze = true;
+      versionPolicy = "odd-unstable";
     };
   };
 
diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix
index 5f9586ae53a5..998e93f592fe 100644
--- a/pkgs/by-name/gn/gnome-connections/package.nix
+++ b/pkgs/by-name/gn/gnome-connections/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-connections";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-connections/${lib.versions.major finalAttrs.version}/gnome-connections-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Oh+UZrpUkUdHI1+uIexuoybJf2+NAJDLmc+worJMc54=";
+    hash = "sha256-Vnv2NcbTA66Ex083yE35+4/Pal6d/0UuFBTGcXRNldA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix
index 5f6825b5bef3..695bac3a631c 100644
--- a/pkgs/by-name/gn/gnome-console/package.nix
+++ b/pkgs/by-name/gn/gnome-console/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-console";
-  version = "49.2";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-console/${lib.versions.major finalAttrs.version}/gnome-console-${finalAttrs.version}.tar.xz";
-    hash = "sha256-J7As6OiQ/49TyoXbeGsa41kD8LYyeBLwIk3AtUsQiNs=";
+    hash = "sha256-5JUCB/BUfmpsDxjuv89uGhBGHqsPL64KrlErEETHrG4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-contacts/package.nix b/pkgs/by-name/gn/gnome-contacts/package.nix
index ab06d7c8de20..774afd839e5d 100644
--- a/pkgs/by-name/gn/gnome-contacts/package.nix
+++ b/pkgs/by-name/gn/gnome-contacts/package.nix
@@ -23,6 +23,8 @@
   meson,
   ninja,
   libadwaita,
+  libglycin,
+  libglycin-gtk4,
   gsettings-desktop-schemas,
   gst_all_1,
   pipewire,
@@ -30,11 +32,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-contacts";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major finalAttrs.version}/gnome-contacts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-JfIcZ7wp133vLZzT4i0oRg0StH/ySKIBdzG1TbSF5K8=";
+    hash = "sha256-KjvqNDFxviRPErfCGkDKOOmpLeqYkDk69eisE5vA2rM=";
   };
 
   nativeBuildInputs = [
@@ -63,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
     gsettings-desktop-schemas
     folks
     libadwaita
+    libglycin
+    libglycin-gtk4
     libxml2
     gnome-online-accounts
     qrencode
diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
index 95ba382789e3..6fdf165b7ec8 100644
--- a/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -68,6 +68,7 @@
   upower,
   wayland-scanner,
   libepoxy,
+  gmobile,
   gnome-user-share,
   gnome-remote-desktop,
   wrapGAppsHook4,
@@ -76,11 +77,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-control-center";
-  version = "49.5";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
-    hash = "sha256-wlPcn2awFets6E+PFXWkZ97tCs2fV1AecFIMpJSqxDA=";
+    hash = "sha256-64MkkdCI5PdCbopZKxBCikWlc2wL/+IQXFHExow6Ud0=";
   };
 
   patches = [
@@ -116,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     glib-networking
     gcr_4
+    gmobile
     gnome-bluetooth
     gnome-desktop
     gnome-online-accounts
diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix
index 33429df08969..979cee9c9aee 100644
--- a/pkgs/by-name/gn/gnome-font-viewer/package.nix
+++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix
@@ -14,15 +14,16 @@
   wrapGAppsHook4,
   gnome,
   harfbuzz,
+  desktop-file-utils,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-font-viewer";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major finalAttrs.version}/gnome-font-viewer-${finalAttrs.version}.tar.xz";
-    hash = "sha256-fAGJJcKFdxtV19Gm8VcRwMGT10UO2YceINRPJUhWJAQ=";
+    hash = "sha256-lWSwiMWxUMVOKjp7xwFN7sbuVRJh6YSI+JGx8bjca4A=";
   };
 
   doCheck = true;
@@ -35,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
     libxml2
     glib
+    desktop-file-utils
   ];
 
   buildInputs = [
@@ -45,13 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     fribidi
   ];
 
-  # Do not run meson-postinstall.sh
-  preConfigure = "sed -i '2,$ d'  meson-postinstall.sh";
-
-  env = lib.optionalAttrs stdenv.cc.isGNU {
-    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-  };
-
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-font-viewer";
diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix
index 35979bc9c015..7a982e044d49 100644
--- a/pkgs/by-name/gn/gnome-initial-setup/package.nix
+++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix
@@ -37,11 +37,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-initial-setup";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KiixpAugiYaRiTBY9hggfemykj17pXpUeQ5aztztzPg=";
+    hash = "sha256-LalrdqNDRGilV/5IG4z+YGJi81N7AKTCDUqiOaROluE=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix
index 223cfa31ad28..7d7a4f727aff 100644
--- a/pkgs/by-name/gn/gnome-keyring/package.nix
+++ b/pkgs/by-name/gn/gnome-keyring/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-keyring";
-  version = "48.0";
+  version = "50.0";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major finalAttrs.version}/gnome-keyring-${finalAttrs.version}.tar.xz";
-    hash = "sha256-8gUYySDp6j+cm4tEvoxQ2Nf+7NDdViSWD3e9LKT7650=";
+    hash = "sha256-y9cgYsU8lwK8LEczmRrV8FHKaCiCswkFooKbzxqOzHw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-logs/package.nix b/pkgs/by-name/gn/gnome-logs/package.nix
index 3dce3e45e6d8..a98e96fc6e92 100644
--- a/pkgs/by-name/gn/gnome-logs/package.nix
+++ b/pkgs/by-name/gn/gnome-logs/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-logs";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-logs/${lib.versions.major finalAttrs.version}/gnome-logs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+PV56wu22ajWrl7hQj+UR6+RIAeFF4tQu63UrC0lXUU=";
+    hash = "sha256-tGbGZgFVUhuoE1M5xt8ICg4HGkb5kRuZFysh+eLf2Ag=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-manuals/package.nix b/pkgs/by-name/gn/gnome-manuals/package.nix
index a325c0c8a503..52a8f74c2ca1 100644
--- a/pkgs/by-name/gn/gnome-manuals/package.nix
+++ b/pkgs/by-name/gn/gnome-manuals/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-manuals";
-  version = "49.0";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/manuals/${lib.versions.major finalAttrs.version}/manuals-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7WRGxMLSnCuQYrKoynJxzbrPx4z9tP3NDzvEjYyefwg=";
+    hash = "sha256-foRBdV0N5xdCjIAORa4GyF7JZK9GrFO53GW0G8OjLHQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix
index 2dec463685f3..c44e9313cb15 100644
--- a/pkgs/by-name/gn/gnome-maps/package.nix
+++ b/pkgs/by-name/gn/gnome-maps/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  blueprint-compiler,
   meson,
   ninja,
   gettext,
@@ -30,16 +31,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-maps";
-  version = "49.4";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
-    hash = "sha256-hvqvWNQNauDy9fN8nA3TEsPuKqTlElsfSjHv5Kn4BLA=";
+    hash = "sha256-Qs3wNn+UXOPbEgOmvP0dX1822crDYcgcGFZ7kxMN6es=";
   };
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
   nativeBuildInputs = [
+    blueprint-compiler
     gettext
     meson
     ninja
diff --git a/pkgs/by-name/gn/gnome-mines/package.nix b/pkgs/by-name/gn/gnome-mines/package.nix
index 09a1a6925067..12117b860d92 100644
--- a/pkgs/by-name/gn/gnome-mines/package.nix
+++ b/pkgs/by-name/gn/gnome-mines/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-mines";
-  version = "49.0.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mines/${lib.versions.major finalAttrs.version}/gnome-mines-${finalAttrs.version}.tar.xz";
-    hash = "sha256-iwygXAM7PCWZyZL4jr2UyysMjjiOoMAq5x2yb0P1bIQ=";
+    hash = "sha256-nTpEEi0Er3h8ZKhp75DdVOp1AOW0i+RXxtZNmydz+58=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix
index c46d0ea2178a..8938be27fcf2 100644
--- a/pkgs/by-name/gn/gnome-nibbles/package.nix
+++ b/pkgs/by-name/gn/gnome-nibbles/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-nibbles";
-  version = "4.4.2";
+  version = "4.5.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz";
-    hash = "sha256-FuBgKHBkamZTh2y8Ye4j92NAwmsSyeicfDASCEUEQVU=";
+    hash = "sha256-hLrSgl05uL9wHvZEqrFrLcfnK7Q+P4cC0j7slhPSljc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix
index d0565a2e6477..5057c8686831 100644
--- a/pkgs/by-name/gn/gnome-online-accounts/package.nix
+++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix
@@ -32,7 +32,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-online-accounts";
-  version = "3.56.4";
+  version = "3.58.1";
 
   outputs = [
     "out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KoMeratF44quM+ginDyUTfoVId6cMUDTYCqSd8qhYbM=";
+    hash = "sha256-nsGQDMUUCcIGfAfIKMEL4G/jv2jSmZu3LX1e0yXtm7w=";
   };
 
   mesonFlags = [
diff --git a/pkgs/by-name/gn/gnome-power-manager/package.nix b/pkgs/by-name/gn/gnome-power-manager/package.nix
index c3d4b5d66d6e..c5936900dd00 100644
--- a/pkgs/by-name/gn/gnome-power-manager/package.nix
+++ b/pkgs/by-name/gn/gnome-power-manager/package.nix
@@ -4,31 +4,31 @@
   gettext,
   fetchurl,
   pkg-config,
-  gtk3,
+  gtk4,
   glib,
   meson,
   ninja,
   upower,
   python3,
   desktop-file-utils,
-  wrapGAppsHook3,
+  wrapGAppsHook4,
   gnome,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-power-manager";
-  version = "43.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-power-manager/${lib.versions.major finalAttrs.version}/gnome-power-manager-${finalAttrs.version}.tar.xz";
-    hash = "sha256-faq0i73bMOnfKrplDLYNBeZnyfiFrOagoeeVDgy90y8=";
+    hash = "sha256-vyQ9Y4n4v6cclYU07SZpspllxH9Vw8vkmDspbQ+Z5dc=";
   };
 
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
-    wrapGAppsHook3
+    wrapGAppsHook4
     gettext
 
     # needed by meson_post_install.sh
@@ -38,11 +38,16 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    gtk3
+    gtk4
     glib
     upower
   ];
 
+  postPatch = ''
+    substituteInPlace meson_post_install.sh \
+      --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache"
+  '';
+
   passthru = {
     updateScript = gnome.updateScript { packageName = "gnome-power-manager"; };
   };
diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
index 2e8de6eac7b9..c59dcfaf7316 100644
--- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix
+++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
@@ -13,6 +13,7 @@
   libei,
   libepoxy,
   libdrm,
+  libkrb5,
   libva,
   vulkan-loader,
   shaderc,
@@ -34,11 +35,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-remote-desktop";
-  version = "49.2";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major finalAttrs.version}/gnome-remote-desktop-${finalAttrs.version}.tar.xz";
-    hash = "sha256-c9ROHnR04WIVgP9WEs3+HZxIr8+rRUjOkh1cpuLZFq0=";
+    hash = "sha256-CJBJEZ4fJEL+l3PwKFNlztwgf0y8fOmvOI4VNmjisXE=";
   };
 
   nativeBuildInputs = [
@@ -62,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     libei
     libepoxy
     libdrm
+    libkrb5
     libva
     vulkan-loader
     nv-codec-headers-11
diff --git a/pkgs/by-name/gn/gnome-robots/package.nix b/pkgs/by-name/gn/gnome-robots/package.nix
index 6afb449c1f7c..6e66718a9791 100644
--- a/pkgs/by-name/gn/gnome-robots/package.nix
+++ b/pkgs/by-name/gn/gnome-robots/package.nix
@@ -9,8 +9,8 @@
   gtk4,
   itstool,
   libadwaita,
-  librsvg,
-  libxml2,
+  libglycin,
+  libglycin-gtk4,
   gst_all_1,
   meson,
   ninja,
@@ -24,17 +24,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-robots";
-  version = "41.2";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-robots/${lib.versions.major finalAttrs.version}/gnome-robots-${finalAttrs.version}.tar.xz";
-    hash = "sha256-kSHC+DaBIEP+7yumYc1dD9SOPWMZxDlBuf3RWLmw65E=";
+    hash = "sha256-YX5XTBX5Bhi4JJPJk51xdZatLOH/HeCq1cnDl2Yz03k=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "gnome-robots-${finalAttrs.version}";
-    hash = "sha256-1h9+XPmkapzdYsI6qtPPHtlwEEmyIzaAogLiYvIHJak=";
+    hash = "sha256-T3o4zlRLQzrLexSDI9A98bubehYFwJY1zBVUUNmrc9o=";
   };
 
   nativeBuildInputs = [
@@ -54,8 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk4
     libadwaita
-    librsvg
-    libxml2
+    libglycin
+    libglycin-gtk4
     # Sound playback, not checked at build time.
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix
index 4a8c6410c0bb..35f35b3e72d3 100644
--- a/pkgs/by-name/gn/gnome-session/ctl.nix
+++ b/pkgs/by-name/gn/gnome-session/ctl.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-session-ctl";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "gnome-session-ctl";
-    rev = finalAttrs.version;
-    hash = "sha256-rudb7ioTE5iaou0tzU5i2gWFW06NyWF5W5tjx2b5/0Y=";
+    tag = finalAttrs.version;
+    hash = "sha256-XKOWn6Yuyf5QXuvDfFEWL/ElfcL0s9mHsyuBwdIenLM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix
index bcb2f7e15e56..f1f41e7ea312 100644
--- a/pkgs/by-name/gn/gnome-session/package.nix
+++ b/pkgs/by-name/gn/gnome-session/package.nix
@@ -8,33 +8,26 @@
   pkg-config,
   gnome,
   gobject-introspection,
-  adwaita-icon-theme,
   glib,
-  gtk4,
   gsettings-desktop-schemas,
   gnome-desktop,
   gnome-settings-daemon,
   gnome-shell,
   dbus,
-  json-glib,
-  libice,
   xmlto,
   docbook_xsl,
   docbook_xml_dtd_45,
-  python3,
   libxslt,
   gettext,
   systemd,
-  xtrans,
-  libepoxy,
   gnome-session-ctl,
-  wrapGAppsHook4,
+  wrapGAppsNoGuiHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-session";
   # Also bump ./ctl.nix when bumping major version.
-  version = "49.2";
+  version = "50.0";
 
   outputs = [
     "out"
@@ -43,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz";
-    hash = "sha256-/NtPRdamDYTp7K4eN0C6tuVbqwy0ng+zgoDps486hIU=";
+    hash = "sha256-vncIzZ0mDhrBg4FTE9u2ILGHbq1bo5zn6i5tx629ckY=";
   };
 
   patches = [
@@ -61,29 +54,19 @@ stdenv.mkDerivation (finalAttrs: {
     libxslt
     docbook_xsl
     docbook_xml_dtd_45
-    python3
     dbus # for DTD
-    wrapGAppsHook4
+    wrapGAppsNoGuiHook
   ];
 
   buildInputs = [
     glib
-    gtk4
-    libice
     gnome-desktop
-    json-glib
-    xtrans
-    adwaita-icon-theme
     gnome-settings-daemon
     gsettings-desktop-schemas
     systemd
-    libepoxy
   ];
 
   postPatch = ''
-    chmod +x meson_post_install.py # patchShebangs requires executable file
-    patchShebangs meson_post_install.py
-
     # Use our provided `gnome-session-ctl`
     original="@libexecdir@/gnome-session-ctl"
     replacement="${gnome-session-ctl}/libexec/gnome-session-ctl"
@@ -99,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     mkdir $sessions
     moveToOutput share/wayland-sessions "$sessions"
-    moveToOutput share/xsessions "$sessions"
 
     # Our provided one is being used
     rm -rf $out/libexec/gnome-session-ctl
diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
index d7930ca5a4c0..3357dd14924f 100644
--- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix
+++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-settings-daemon";
-  version = "49.1";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KplX/E+Rw7kSe0lIQXm+9IUSDZwcII5E1E5qdG5swcE=";
+    hash = "sha256-3SyXMJFPDs7KAindiowpQKV93rCAJDRVjUsWTXnP4Fw=";
   };
 
   patches = [
@@ -57,15 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
     (replaceVars ./fix-paths.patch {
       inherit tzdata;
     })
-
-    # Fix crash when switching to hands-free mode on a bluetooth headset
-    (fetchpatch {
-      name = "fix-bluetooth-handsfree-crash.patch";
-      url = "https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/merge_requests/31.patch";
-      hash = "sha256-jFbItlXT05nnp825R/HvsWDFxAMzL4z36CsxhQ2sEIY=";
-      stripLen = 1;
-      extraPrefix = "subprojects/gvc/";
-    })
   ];
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix
index 5116646b7102..b29313b056f0 100644
--- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix
+++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell-extensions";
-  version = "49.0";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
-    hash = "sha256-FXDgZHhstDiXWeBIPzob29W5s48GJG600dUJKSqcamI=";
+    hash = "sha256-RqXkpebEWNOftCNabYgzy9+8a+YLCeDw14Dxvm1aEmE=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index 751fae4d6336..bebe33c6c4d1 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -74,7 +74,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell";
-  version = "49.4";
+  version = "50.1";
 
   outputs = [
     "out"
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
-    hash = "sha256-nW8MovAUDBFPEU9nB0E2EfYU+x6mwxeo0fzEDDxZWwg=";
+    hash = "sha256-G0d2AXLBTz9O3Rya/zZfTeRVg1F78PgN9NOsvU5MspQ=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
index b3a55bcc291e..6efdff420d04 100644
--- a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
+++ b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
@@ -1,9 +1,9 @@
 --- a/subprojects/libshew/src/meson.build
 +++ b/subprojects/libshew/src/meson.build
-@@ -13,7 +13,7 @@ shew_sources = [
+@@ -15,7 +15,7 @@ shew_sources = [
  libshew = library(full_name,
    sources: shew_sources,
-   dependencies: [gtk_dep, x11_dep],
+   dependencies: [gtk_dep],
 -  install_dir: pkglibdir,
 +  install_dir: get_option('prefix') / pkglibdir,
    install: true,
diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix
index cb7c19d24754..52b81eec1fce 100644
--- a/pkgs/by-name/gn/gnome-software/package.nix
+++ b/pkgs/by-name/gn/gnome-software/package.nix
@@ -48,11 +48,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-software";
-  version = "49.3";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
-    hash = "sha256-9kbbLxK89Ag3K2tJrpEJn85S0OrHYs6iMRqMik3/nQA=";
+    hash = "sha256-aWfu/sadUdNNIAWFye3+JPFRgD5J7ZKEo9dO2w5TQKg=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix
index 3752746aec3b..44a730fa2289 100644
--- a/pkgs/by-name/gn/gnome-sudoku/package.nix
+++ b/pkgs/by-name/gn/gnome-sudoku/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-sudoku";
-  version = "49.4";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major finalAttrs.version}/gnome-sudoku-${finalAttrs.version}.tar.xz";
-    hash = "sha256-nIzQZ6RSOHiq/zBHovvYb4izGYQkPw1CorHk8+ZFH1A=";
+    hash = "sha256-CwbJd37Ns1oPzZLRZJZCVJ3oFmKfSJ9dkzMVo03Me+I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch b/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch
index 967ef5e15542..9f1fb926cced 100644
--- a/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch
+++ b/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch
@@ -1,7 +1,7 @@
-diff --git a/src/gsm_pkexec.cpp b/src/gsm_pkexec.cpp
+diff --git a/src/actions/gsm_pkexec.cpp b/src/actions/gsm_pkexec.cpp
 index 5e1edf2f..717d7bf1 100644
---- a/src/gsm_pkexec.cpp
-+++ b/src/gsm_pkexec.cpp
+--- a/src/actions/gsm_pkexec.cpp
++++ b/src/actions/gsm_pkexec.cpp
 @@ -36,5 +36,6 @@ gsm_pkexec_create_root_password_dialog (const char *command)
  gboolean
  procman_has_pkexec (void)
diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix
index e088992f463b..ee47dd258239 100644
--- a/pkgs/by-name/gn/gnome-system-monitor/package.nix
+++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-system-monitor";
-  version = "49.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-kVtqMhraEuunv1eMIMn+XkH1XVMoR8vRJLvdquwR1w8=";
+    hash = "sha256-pBOKp1S0WExG3pH60daF4nsSvCRX3nYYY7a+AthMSGI=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-tecla/package.nix b/pkgs/by-name/gn/gnome-tecla/package.nix
index 24f5b55a610b..cd095dddf795 100644
--- a/pkgs/by-name/gn/gnome-tecla/package.nix
+++ b/pkgs/by-name/gn/gnome-tecla/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tecla";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LKQk5AK69gzWsTd3cDtwHrsfr489Dy+XEUTYI/ZRJJ8=";
+    hash = "sha256-JUKsskhQCC4Mz2qhevllHbcdIvDiM/2/XtDP/i5FvAY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix
index 34f23c65f39c..5416d13952da 100644
--- a/pkgs/by-name/gn/gnome-terminal/package.nix
+++ b/pkgs/by-name/gn/gnome-terminal/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-terminal";
-  version = "3.58.1";
+  version = "3.60.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz";
-    hash = "sha256-HfuutVpxz8NqIaoe5KDUWcP96Ls9ZbCfvKaVx/3fvro=";
+    hash = "sha256-uNrz8IVFFyxNKIVzP3IDYasDSepmm5kkXu1K0W7T3ig=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix
index 7a25118f6a5d..ffafb849bb03 100644
--- a/pkgs/by-name/gn/gnome-text-editor/package.nix
+++ b/pkgs/by-name/gn/gnome-text-editor/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-text-editor";
-  version = "49.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-8ESPJHu1l5pQxgIixExFEYgK1HTiVJV2Xl7SJG5U27E=";
+    hash = "sha256-ncKZ2k2qCFQjtdSNtZ8AIa1V50FDpcuKsuX/4Xln9Fs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-tour/package.nix b/pkgs/by-name/gn/gnome-tour/package.nix
index 2b31cd8e8375..50e086f14677 100644
--- a/pkgs/by-name/gn/gnome-tour/package.nix
+++ b/pkgs/by-name/gn/gnome-tour/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-tour";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LX2KKgzRF4BjpBTaWAk9JsD7GndgjYrX+9eRGl1iZNM=";
+    hash = "sha256-bOEYcDGjZb8iagzRRvF7R3Pn7UUIg/fNUC9ez0MrUyU=";
   };
 
   cargoVendorDir = "vendor";
diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix
index e9fb9039747e..246b3cd0420c 100644
--- a/pkgs/by-name/gn/gnome-user-docs/package.nix
+++ b/pkgs/by-name/gn/gnome-user-docs/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-user-docs";
-  version = "49.4";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major finalAttrs.version}/gnome-user-docs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-BkRI6t1cHxW8j+tQQYpjRxFO+BXcjRXQCiDcX0iuioA=";
+    hash = "sha256-6OIzJBhMfphcUE8F9tnGNCDJqdH2Tv3l2iqBEjYHL3g=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-weather/package.nix b/pkgs/by-name/gn/gnome-weather/package.nix
index ba30db8e9b91..9c50e95c9577 100644
--- a/pkgs/by-name/gn/gnome-weather/package.nix
+++ b/pkgs/by-name/gn/gnome-weather/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-weather";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-weather/${lib.versions.major finalAttrs.version}/gnome-weather-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7h92uF66nbDI1cAgQanYXs3SKrtexrs/8yIlkpwPzl8=";
+    hash = "sha256-V951eGBfkfmrQAVRznc423UFvIj0KjPHDOenAWf9tRM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/by-name/gn/gnumake/package.nix
similarity index 76%
rename from pkgs/development/tools/build-managers/gnumake/default.nix
rename to pkgs/by-name/gn/gnumake/package.nix
index c6840241c609..79716bd7e852 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/by-name/gn/gnumake/package.nix
@@ -4,19 +4,19 @@
   fetchurl,
   autoreconfHook,
   gettext,
-  guileSupport ? false,
+  gnumake,
   guile,
-  texinfo,
+  guileSupport ? false,
   # avoid guile depend on bootstrap to prevent dependency cycles
   inBootstrap ? false,
   pkg-config,
-  gnumake,
+  texinfo,
+  versionCheckHook,
 }:
 
 let
   guileEnabled = guileSupport && !inBootstrap;
 in
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnumake";
   version = "4.4.1";
@@ -39,18 +39,16 @@ stdenv.mkDerivation (finalAttrs: {
   # directory until derivation realization to avoid unnecessary Nix evaluations.
   patches = lib.filesystem.listFilesRecursive ./patches;
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
   ]
-  ++ lib.optionals (!inBootstrap) [ texinfo ];
+  ++ lib.optionals (!inBootstrap) [ texinfo ]
+  ++ lib.optional stdenv.isCygwin gettext;
 
-  buildInputs =
-    lib.optionals guileEnabled [ guile ]
-    # gettext gets pulled in via autoreconfHook because strictDeps is not set,
-    # and is linked against. Without this, it doesn't end up in HOST_PATH.
-    # TODO: enable strictDeps, and either make this dependency explicit, or remove it
-    ++ lib.optional stdenv.isCygwin gettext;
+  buildInputs = lib.optionals guileEnabled [ guile ];
 
   configureFlags =
     lib.optional guileEnabled "--with-guile"
@@ -69,12 +67,16 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postInstall = lib.optionalString (!inBootstrap) ''
-    mkdir -p $doc/share/doc/$pname-$version
-    cp ./make.html $doc/share/doc/$pname-$version/index.html
+    install -Dm644 make.html \
+      --target-directory="$doc"/share/doc/"$pname"-"$version"
   '';
 
   separateDebugInfo = true;
 
+  doCheck = true;
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   passthru.tests = {
     # make sure that the override doesn't break bootstrapping
     gnumakeWithGuile = gnumake.override { guileSupport = true; };
@@ -84,18 +86,19 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tool to control the generation of non-source files from sources";
     longDescription = ''
       Make is a tool which controls the generation of executables and
-      other non-source files of a program from the program's source files.
+      other non-source files of a program from the program's source
+      files.
 
       Make gets its knowledge of how to build your program from a file
-      called the makefile, which lists each of the non-source files and
-      how to compute it from other files. When you write a program, you
-      should write a makefile for it, so that it is possible to use Make
-      to build and install the program.
+      called the makefile, which lists each of the non-source files
+      and how to compute it from other files.  When you write a
+      program, you should write a makefile for it, so that it is
+      possible to use Make to build and install the program.
     '';
     homepage = "https://www.gnu.org/software/make/";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.mdaniels5757 ];
     mainProgram = "make";
+    maintainers = with lib.maintainers; [ mdaniels5757 ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/development/tools/build-managers/gnumake/patches/0001-No-impure-bin-sh.patch b/pkgs/by-name/gn/gnumake/patches/0001-No-impure-bin-sh.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/patches/0001-No-impure-bin-sh.patch
rename to pkgs/by-name/gn/gnumake/patches/0001-No-impure-bin-sh.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/patches/0002-Remove-impure-dirs.patch b/pkgs/by-name/gn/gnumake/patches/0002-Remove-impure-dirs.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/patches/0002-Remove-impure-dirs.patch
rename to pkgs/by-name/gn/gnumake/patches/0002-Remove-impure-dirs.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/patches/0003-Do-not-search-for-a-C-compiler-and-set-MAKE_CXX.patch b/pkgs/by-name/gn/gnumake/patches/0003-Do-not-search-for-a-C-compiler-and-set-MAKE_CXX.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/patches/0003-Do-not-search-for-a-C-compiler-and-set-MAKE_CXX.patch
rename to pkgs/by-name/gn/gnumake/patches/0003-Do-not-search-for-a-C-compiler-and-set-MAKE_CXX.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/patches/0004-Fix-signatures-for-getenv-getopt.patch b/pkgs/by-name/gn/gnumake/patches/0004-Fix-signatures-for-getenv-getopt.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/patches/0004-Fix-signatures-for-getenv-getopt.patch
rename to pkgs/by-name/gn/gnumake/patches/0004-Fix-signatures-for-getenv-getopt.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/patches/0005-Fix-signatures-for-getenv-getopt.patch b/pkgs/by-name/gn/gnumake/patches/0005-Fix-signatures-for-getenv-getopt.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/patches/0005-Fix-signatures-for-getenv-getopt.patch
rename to pkgs/by-name/gn/gnumake/patches/0005-Fix-signatures-for-getenv-getopt.patch
diff --git a/pkgs/by-name/gn/gnutls/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch b/pkgs/by-name/gn/gnutls/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
deleted file mode 100644
index 1764c4e3bff3..000000000000
--- a/pkgs/by-name/gn/gnutls/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-Applied the following incremental gnulib commits:
-
-- 55a366a06fbd98bf13adc531579e3513cee97a32
-- 65ed9d3b24ad09fd61d326c83e7f1b05f6e9d65f
-- ce8e9de0bf34bc63dffc67ab384334c509175f64
-- 6164b4cb0887b5331a4e64449107decd37d32735
-
-With adjustments specific to the structure & differences in gnutls:
-
-- The gnulib version included in the gnutls 3.8.11 release tarball is older than the one in the 3.8.11 tag on GitLab, necessitating this patching.
-  Maybe an issue with their release making process.
-- gnulib code is duplicated across gl and src/gl, with the tests only existing the latter.
-  Unsure why this is duplicated, but applied to both versions.
-- A Makefile.in is used for the test flags instead of the fancy automake modules
-  in the upstream gnulib project, so we add -lm to the float test there.
-  Surrounding texts in this file are slightly different in every project.
-diff '--color=auto' -ruN a/gl/float.c b/gl/float.c
---- a/gl/float.c	2025-11-20 03:09:15.000000000 +0100
-+++ b/gl/float.c	2026-01-04 14:19:05.770105827 +0100
-@@ -23,7 +23,7 @@
- #if GNULIB_defined_long_double_union
- # if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
- const union gl_long_double_union gl_LDBL_MAX =
--  { { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL } };
-+  { { DBL_MAX, DBL_MAX / 0x1p53 } };
- # elif defined __i386__
- const union gl_long_double_union gl_LDBL_MAX =
-   { { 0xFFFFFFFF, 0xFFFFFFFF, 32766 } };
-diff '--color=auto' -ruN a/gl/float.in.h b/gl/float.in.h
---- a/gl/float.in.h	2025-11-20 03:09:15.000000000 +0100
-+++ b/gl/float.in.h	2026-01-04 14:22:50.690169887 +0100
-@@ -113,44 +113,38 @@
- # define LDBL_MAX_10_EXP 4932
- #endif
- 
--/* On AIX 7.1 with gcc 4.2, the values of LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX are
--   wrong.
--   On Linux/PowerPC with gcc 4.4, the value of LDBL_MAX is wrong.  */
--#if (defined _ARCH_PPC || defined _POWER) && defined _AIX && (LDBL_MANT_DIG == 106) && defined __GNUC__
-+/* On PowerPC with gcc 15 when using __ibm128 long double, the value of
-+   LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX, and LDBL_NORM_MAX are wrong.  */
-+#if ((defined _ARCH_PPC || defined _POWER) && LDBL_MANT_DIG == 106 \
-+     && defined __GNUC__)
- # undef LDBL_MIN_EXP
- # define LDBL_MIN_EXP DBL_MIN_EXP
- # undef LDBL_MIN_10_EXP
- # define LDBL_MIN_10_EXP DBL_MIN_10_EXP
- # undef LDBL_MIN
- # define LDBL_MIN 2.22507385850720138309023271733240406422e-308L /* DBL_MIN = 2^-1022 */
--#endif
--#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
- # undef LDBL_MAX
--/* LDBL_MAX is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xFFFFFFFF }.
--   It is not easy to define:
--     #define LDBL_MAX 1.79769313486231580793728971405302307166e308L
--   is too small, whereas
--     #define LDBL_MAX 1.79769313486231580793728971405302307167e308L
--   is too large.  Apparently a bug in GCC decimal-to-binary conversion.
--   Also, I can't get values larger than
--     #define LDBL63 ((long double) (1ULL << 63))
--     #define LDBL882 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL945 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL1008 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL_MAX (LDBL1008 * 65535.0L + LDBL945 * (long double) 9223372036821221375ULL + LDBL882 * (long double) 4611686018427387904ULL)
--   which is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xF8000000 }.
--   So, define it like this through a reference to an external variable
-+/* LDBL_MAX is 2**1024 - 2**918, represented as: { 0x7FEFFFFF, 0xFFFFFFFF,
-+                                                   0x7C9FFFFF, 0xFFFFFFFF }.
-+
-+   Do not write it as a constant expression, as GCC would likely treat
-+   that as infinity due to the vagaries of this platform's funky arithmetic.
-+   Instead, define it through a reference to an external variable.
-+   Like the following, but using a union to avoid type mismatches:
- 
--     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL };
-+     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / 0x1p53 };
-      extern const long double LDBL_MAX;
- 
--   or through a pointer cast
-+   The following alternative would not work as well when GCC is optimizing:
-+
-+     #define LDBL_MAX (*(long double const *) (double[])
-+                       { DBL_MAX, DBL_MAX / 0x1p53 })
- 
--     #define LDBL_MAX \
--       (*(const long double *) (double[]) { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL })
-+   The following alternative would require GCC 6 or later:
- 
--   Unfortunately, this is not a constant expression, and the latter expression
--   does not work well when GCC is optimizing..  */
-+     #define LDBL_MAX __builtin_pack_longdouble (DBL_MAX, DBL_MAX / 0x1p53)
-+
-+   Unfortunately none of the alternatives are constant expressions.  */
- # if !GNULIB_defined_long_double_union
- union gl_long_double_union
-   {
-@@ -161,6 +155,8 @@
- # endif
- extern const union gl_long_double_union gl_LDBL_MAX;
- # define LDBL_MAX (gl_LDBL_MAX.ld)
-+# undef LDBL_NORM_MAX
-+# define LDBL_NORM_MAX LDBL_MAX
- #endif
- 
- /* On IRIX 6.5, with cc, the value of LDBL_MANT_DIG is wrong.
-@@ -181,6 +177,21 @@
- # endif
- #endif
- 
-+/* On PowerPC platforms, 'long double' has a double-double representation.
-+   Up to ISO C 17, this was outside the scope of ISO C because it can represent
-+   numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits>, such as
-+   1.0L + 4.94065645841246544176568792868221e-324L = 1 + 2^-1074; see
-+   ISO C 17 § 5.2.4.2.2.(3).
-+   In ISO C 23, wording has been included that makes this 'long double'
-+   representation compliant; see ISO C 23 § 5.2.5.3.3.(8)-(9).  In this setting,
-+   numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits> are
-+   called "unnormalized".  And since LDBL_EPSILON must be normalized (per
-+   ISO C 23 § 5.2.5.3.3.(33)), it must be 2^-105.  */
-+#if defined __powerpc__ && LDBL_MANT_DIG == 106
-+# undef LDBL_EPSILON
-+# define LDBL_EPSILON 2.46519032881566189191165176650870696773e-32L /* 2^-105 */
-+#endif
-+
- /* ============================ ISO C11 support ============================ */
- 
- /* 'float' properties */
-@@ -309,7 +320,11 @@
- # endif
- #endif
- #ifndef LDBL_NORM_MAX
--# define LDBL_NORM_MAX LDBL_MAX
-+# ifdef __LDBL_NORM_MAX__
-+#  define LDBL_NORM_MAX __LDBL_NORM_MAX__
-+# else
-+#  define LDBL_NORM_MAX LDBL_MAX
-+# endif
- #endif
- #ifndef LDBL_SNAN
- /* For sh, beware of <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111814>.  */
-diff '--color=auto' -ruN a/src/gl/float.c b/src/gl/float.c
---- a/src/gl/float.c	2025-11-20 03:09:15.000000000 +0100
-+++ b/src/gl/float.c	2026-01-04 14:19:23.234252595 +0100
-@@ -23,7 +23,7 @@
- #if GNULIB_defined_long_double_union
- # if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
- const union gl_long_double_union gl_LDBL_MAX =
--  { { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL } };
-+  { { DBL_MAX, DBL_MAX / 0x1p53 } };
- # elif defined __i386__
- const union gl_long_double_union gl_LDBL_MAX =
-   { { 0xFFFFFFFF, 0xFFFFFFFF, 32766 } };
-diff '--color=auto' -ruN a/src/gl/float.in.h b/src/gl/float.in.h
---- a/src/gl/float.in.h	2025-11-20 03:09:15.000000000 +0100
-+++ b/src/gl/float.in.h	2026-01-04 14:24:52.632412768 +0100
-@@ -113,44 +113,38 @@
- # define LDBL_MAX_10_EXP 4932
- #endif
- 
--/* On AIX 7.1 with gcc 4.2, the values of LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX are
--   wrong.
--   On Linux/PowerPC with gcc 4.4, the value of LDBL_MAX is wrong.  */
--#if (defined _ARCH_PPC || defined _POWER) && defined _AIX && (LDBL_MANT_DIG == 106) && defined __GNUC__
-+/* On PowerPC with gcc 15 when using __ibm128 long double, the value of
-+   LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX, and LDBL_NORM_MAX are wrong.  */
-+#if ((defined _ARCH_PPC || defined _POWER) && LDBL_MANT_DIG == 106 \
-+     && defined __GNUC__)
- # undef LDBL_MIN_EXP
- # define LDBL_MIN_EXP DBL_MIN_EXP
- # undef LDBL_MIN_10_EXP
- # define LDBL_MIN_10_EXP DBL_MIN_10_EXP
- # undef LDBL_MIN
- # define LDBL_MIN 2.22507385850720138309023271733240406422e-308L /* DBL_MIN = 2^-1022 */
--#endif
--#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
- # undef LDBL_MAX
--/* LDBL_MAX is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xFFFFFFFF }.
--   It is not easy to define:
--     #define LDBL_MAX 1.79769313486231580793728971405302307166e308L
--   is too small, whereas
--     #define LDBL_MAX 1.79769313486231580793728971405302307167e308L
--   is too large.  Apparently a bug in GCC decimal-to-binary conversion.
--   Also, I can't get values larger than
--     #define LDBL63 ((long double) (1ULL << 63))
--     #define LDBL882 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL945 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL1008 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL_MAX (LDBL1008 * 65535.0L + LDBL945 * (long double) 9223372036821221375ULL + LDBL882 * (long double) 4611686018427387904ULL)
--   which is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xF8000000 }.
--   So, define it like this through a reference to an external variable
-+/* LDBL_MAX is 2**1024 - 2**918, represented as: { 0x7FEFFFFF, 0xFFFFFFFF,
-+                                                   0x7C9FFFFF, 0xFFFFFFFF }.
-+
-+   Do not write it as a constant expression, as GCC would likely treat
-+   that as infinity due to the vagaries of this platform's funky arithmetic.
-+   Instead, define it through a reference to an external variable.
-+   Like the following, but using a union to avoid type mismatches:
- 
--     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL };
-+     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / 0x1p53 };
-      extern const long double LDBL_MAX;
- 
--   or through a pointer cast
-+   The following alternative would not work as well when GCC is optimizing:
-+
-+     #define LDBL_MAX (*(long double const *) (double[])
-+                       { DBL_MAX, DBL_MAX / 0x1p53 })
- 
--     #define LDBL_MAX \
--       (*(const long double *) (double[]) { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL })
-+   The following alternative would require GCC 6 or later:
- 
--   Unfortunately, this is not a constant expression, and the latter expression
--   does not work well when GCC is optimizing..  */
-+     #define LDBL_MAX __builtin_pack_longdouble (DBL_MAX, DBL_MAX / 0x1p53)
-+
-+   Unfortunately none of the alternatives are constant expressions.  */
- # if !GNULIB_defined_long_double_union
- union gl_long_double_union
-   {
-@@ -161,6 +155,8 @@
- # endif
- extern const union gl_long_double_union gl_LDBL_MAX;
- # define LDBL_MAX (gl_LDBL_MAX.ld)
-+# undef LDBL_NORM_MAX
-+# define LDBL_NORM_MAX LDBL_MAX
- #endif
- 
- /* On IRIX 6.5, with cc, the value of LDBL_MANT_DIG is wrong.
-@@ -181,6 +177,21 @@
- # endif
- #endif
- 
-+/* On PowerPC platforms, 'long double' has a double-double representation.
-+   Up to ISO C 17, this was outside the scope of ISO C because it can represent
-+   numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits>, such as
-+   1.0L + 4.94065645841246544176568792868221e-324L = 1 + 2^-1074; see
-+   ISO C 17 § 5.2.4.2.2.(3).
-+   In ISO C 23, wording has been included that makes this 'long double'
-+   representation compliant; see ISO C 23 § 5.2.5.3.3.(8)-(9).  In this setting,
-+   numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits> are
-+   called "unnormalized".  And since LDBL_EPSILON must be normalized (per
-+   ISO C 23 § 5.2.5.3.3.(33)), it must be 2^-105.  */
-+#if defined __powerpc__ && LDBL_MANT_DIG == 106
-+# undef LDBL_EPSILON
-+# define LDBL_EPSILON 2.46519032881566189191165176650870696773e-32L /* 2^-105 */
-+#endif
-+
- /* ============================ ISO C11 support ============================ */
- 
- /* 'float' properties */
-@@ -309,7 +320,11 @@
- # endif
- #endif
- #ifndef LDBL_NORM_MAX
--# define LDBL_NORM_MAX LDBL_MAX
-+# ifdef __LDBL_NORM_MAX__
-+#  define LDBL_NORM_MAX __LDBL_NORM_MAX__
-+# else
-+#  define LDBL_NORM_MAX LDBL_MAX
-+# endif
- #endif
- #ifndef LDBL_SNAN
- /* For sh, beware of <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111814>.  */
-diff '--color=auto' -ruN a/src/gl/tests/Makefile.in b/src/gl/tests/Makefile.in
---- a/src/gl/tests/Makefile.in	2025-11-20 03:09:50.000000000 +0100
-+++ b/src/gl/tests/Makefile.in	2026-01-04 14:10:49.765136843 +0100
-@@ -821,7 +821,7 @@
- 	$(am__DEPENDENCIES_1)
- test_float_h_SOURCES = test-float-h.c
- test_float_h_OBJECTS = test-float-h.$(OBJEXT)
--test_float_h_LDADD = $(LDADD)
-+test_float_h_LDADD = $(LDADD) -lm
- test_float_h_DEPENDENCIES = libtests.a ../../../src/gl/libgnu_gpl.la \
- 	libtests.a ../../../src/gl/libgnu_gpl.la libtests.a \
- 	$(am__DEPENDENCIES_1)
-diff '--color=auto' -ruN a/src/gl/tests/test-float-h.c b/src/gl/tests/test-float-h.c
---- a/src/gl/tests/test-float-h.c	2025-11-20 03:09:15.000000000 +0100
-+++ b/src/gl/tests/test-float-h.c	2026-01-04 14:26:11.677858229 +0100
-@@ -101,6 +101,8 @@
- 
- /* ------------------------------------------------------------------------- */
- 
-+#include <math.h>
-+
- #include "fpucw.h"
- #include "isnanf-nolibm.h"
- #include "isnand-nolibm.h"
-@@ -396,6 +398,44 @@
- 
- /* -------------------- Check macros for 'long double' -------------------- */
- 
-+static int
-+test_isfinitel (long double volatile x)
-+{
-+  if (x != x)
-+    return 0;
-+  long double volatile zero = x * 0;
-+  return zero == 0;
-+}
-+
-+/* Return X after normalization.  This makes a difference on platforms
-+   where long double can represent unnormalized values.  For example,
-+   suppose x = 1 + 2**-106 on PowerPC with IBM long double where
-+   FLT_RADIX = 2, LDBL_MANT_DIG = 106, and LDBL_EPSILON = 2**-105.
-+   Then 1 < x < 1 + LDBL_EPSILON, and normalize_long_double (x) returns 1.  */
-+static long double
-+normalize_long_double (long double volatile x)
-+{
-+  if (FLT_RADIX == 2 && test_isfinitel (x))
-+    {
-+      int xexp;
-+      long double volatile
-+        frac = frexpl (x, &xexp),
-+        significand = frac * pow2l (LDBL_MANT_DIG),
-+        normalized_significand = truncl (significand),
-+        normalized_x = normalized_significand * pow2l (xexp - LDBL_MANT_DIG);
-+
-+      /* The test_isfinitel defends against PowerPC with IBM long double,
-+         which fritzes out near LDBL_MAX.  */
-+      if (test_isfinitel (normalized_x))
-+        x = normalized_x;
-+    }
-+  else
-+    {
-+      /* Hope that X is already normalized.  */
-+    }
-+  return x;
-+}
-+
- static void
- test_long_double (void)
- {
-@@ -455,7 +495,7 @@
-     for (n = 0; n <= 2 * LDBL_MANT_DIG; n++)
-       {
-         volatile long double half_n = pow2l (- n); /* 2^-n */
--        volatile long double x = me - half_n;
-+        volatile long double x = normalize_long_double (me - half_n);
-         if (x < me)
-           ASSERT (x <= 1.0L);
-       }
-@@ -484,7 +524,7 @@
- #endif
- 
-   /* Check the value of LDBL_NORM_MAX.  */
--  ASSERT (LDBL_NORM_MAX == LDBL_MAX);
-+  ASSERT (LDBL_NORM_MAX == normalize_long_double (LDBL_MAX));
- 
-   /* Check the value of LDBL_SNAN.  */
-   ASSERT (isnanl (LDBL_SNAN));
diff --git a/pkgs/by-name/gn/gnutls/package.nix b/pkgs/by-name/gn/gnutls/package.nix
index 3a7326cc212c..aba0f7388bb2 100644
--- a/pkgs/by-name/gn/gnutls/package.nix
+++ b/pkgs/by-name/gn/gnutls/package.nix
@@ -62,11 +62,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnutls";
-  version = "3.8.12";
+  version = "3.8.13";
 
   src = fetchurl {
     url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
-    hash = "sha256-p7NBQhv9RZrPejdMpK87ngZgjc1715Kyv0cL6gErjlE=";
+    hash = "sha256-/+2Owb8JwkJtTxSq43feR1O1PlN9aF5gTpmosWypyX4=";
   };
 
   outputs = [
@@ -85,11 +85,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./nix-ssl-cert-file.patch
-
-    # Fixes test-float failure on ppc64 with C23
-    # https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00021.html
-    # Multiple upstream commits squashed with adjustments, see header
-    ./gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
   ];
 
   # Skip some tests:
diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix
index 84d8c641770e..13fe4dd98f14 100644
--- a/pkgs/by-name/go/gom/package.nix
+++ b/pkgs/by-name/go/gom/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gom";
-  version = "0.5.5";
+  version = "0.5.6";
 
   outputs = [
     "out"
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gom/${lib.versions.majorMinor finalAttrs.version}/gom-${finalAttrs.version}.tar.xz";
-    sha256 = "rWHwWvIxenqxdx/PqBaYn7ujsYlX0uC13t6e9F8JtTQ=";
+    sha256 = "TXpeJoaYyOfkBgPjbp46K3YTOTHOG2N8ETYwFJG1TMM=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
index 758c2489138c..bcff3cd981a2 100644
--- a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
+++ b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gsettings-desktop-schemas";
-  version = "49.1";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gsettings-desktop-schemas/${lib.versions.major version}/gsettings-desktop-schemas-${version}.tar.xz";
-    hash = "sha256-d3p/g9XlqAdrm/gJyyQQGxsbqcIwI148PejhOWjtDmM=";
+    hash = "sha256-CiqiUIJnJYXRb82rYcew4z8DX7h0dlBceU8pVlr6SFs=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/gt/gtk-frdp/package.nix b/pkgs/by-name/gt/gtk-frdp/package.nix
index 42c2c20f9762..27a79d56f61b 100644
--- a/pkgs/by-name/gt/gtk-frdp/package.nix
+++ b/pkgs/by-name/gt/gtk-frdp/package.nix
@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation {
   pname = "gtk-frdp";
-  version = "0-unstable-2025-08-15";
+  version = "0-unstable-2026-04-24";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "gtk-frdp";
-    rev = "b59dc88624511311576dca607d3cb9317569de34";
-    hash = "sha256-6zCaegBshOLQWeHtUYOaofbUVK797vyn5bdpwHD0Z/s=";
+    rev = "05919e9958b655252a0e5572c215fc9aee0aa863";
+    hash = "sha256-SGSHsuv/XOLfjESRk9B2GV64zvrG8xGoaBoHO6EeAZw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix
index 1c4f88ccb9f5..66c7d53ee41b 100644
--- a/pkgs/by-name/gt/gtk4/package.nix
+++ b/pkgs/by-name/gt/gtk4/package.nix
@@ -36,7 +36,6 @@
   libxkbcommon,
   libpng,
   libtiff,
-  librsvg,
   libjpeg,
   libxml2,
   gnome,
@@ -77,7 +76,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk4";
-  version = "4.20.3";
+  version = "4.22.3";
 
   outputs = [
     "out"
@@ -93,15 +92,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor finalAttrs.version}/gtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KHPykDCIpmxxFz6i7YX/riZqZrlyw6SEK7svbxh+wVM=";
+    hash = "sha256-AUWkokOygzA9kL39LYoMa5EGuIA5C2PBYdlQVnL53zg=";
   };
 
-  # TODO: make it unconditional on rebuild, drop on version >= 4.20.4
-  patches = lib.optional stdenv.hostPlatform.is32bit (fetchpatch {
-    url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3b7ed49f26700c65fa9c6f41cf40d4fd5f921756.diff";
-    hash = "sha256-P6cE7fnR5W+H0EWQWJ3hYSu4MwMygPIfS6e0IiXlQv8=";
-  });
-
   depsBuildBuild = [
     pkg-config
   ];
@@ -118,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     sassc
     gi-docgen
     libxml2 # for xmllint
+    shared-mime-info
   ]
   ++ lib.optionals (compileSchemas && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     mesonEmulatorHook
@@ -134,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     libpng
     libtiff
-    librsvg
     libjpeg
     (libepoxy.override { inherit x11Support; })
     isocodes
diff --git a/pkgs/by-name/gt/gtkmm4/package.nix b/pkgs/by-name/gt/gtkmm4/package.nix
index dde0fe3485ba..ba33d17e7c1c 100644
--- a/pkgs/by-name/gt/gtkmm4/package.nix
+++ b/pkgs/by-name/gt/gtkmm4/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtkmm";
-  version = "4.20.0";
+  version = "4.22.0";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor finalAttrs.version}/gtkmm-${finalAttrs.version}.tar.xz";
-    hash = "sha256-2q2b+bcPkJdfkXgfx6ZWySOpE3QmH1dsiDzTrr1ZyDM=";
+    hash = "sha256-LoohtLByX2IOM6ruDNND7RIbUzJ1tjKJZhmxyJ6W3mc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gt/gts/package.nix b/pkgs/by-name/gt/gts/package.nix
index e51a67eb374a..849bcd18c0b2 100644
--- a/pkgs/by-name/gt/gts/package.nix
+++ b/pkgs/by-name/gt/gts/package.nix
@@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ gettext ];
   propagatedBuildInputs = [ glib ];
 
-  env = lib.optionalAttrs stdenv.isDarwin {
-    # Doesn't build on Darwin with -std=gnu23.
+  env = {
+    # Doesn't build on Darwin with -std=gnu23. Apply uniformly as C standard target is something unlikely to vary across platforms.
     NIX_CFLAGS_COMPILE = "-std=gnu17";
   };
 
diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix
index 26dbc341a0a9..17311a3989b3 100644
--- a/pkgs/by-name/gu/gucharmap/package.nix
+++ b/pkgs/by-name/gu/gucharmap/package.nix
@@ -47,7 +47,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gucharmap";
-  version = "17.0.1";
+  version = "17.0.2";
 
   outputs = [
     "out"
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "gucharmap";
     rev = finalAttrs.version;
-    hash = "sha256-86+D+WYIezo7ZXaKTWybinP9Q10Auy63+3VlescymC0=";
+    hash = "sha256-LjXn8cFLqVZmLub0FRscyjg93u6g1EXsv3w0L4iiyqE=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix
index 071c97ad080e..cc87126e8e35 100644
--- a/pkgs/by-name/gv/gvfs/package.nix
+++ b/pkgs/by-name/gv/gvfs/package.nix
@@ -39,21 +39,18 @@
   libnfs,
   openssh,
   libsecret,
-  libgdata,
   libmsgraph,
   python3,
   gsettings-desktop-schemas,
-  googleSupport ? false, # dependency on vulnerable libsoup versions
 }:
 
-assert googleSupport -> gnomeSupport;
 stdenv.mkDerivation (finalAttrs: {
   pname = "gvfs";
-  version = "1.58.4";
+  version = "1.60.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-5xJL7HJOJlrQ7gC6on2NUVzx3dzxAmOL5nueJZybBA0=";
+    hash = "sha256-ZIJz8GnpLH48ATuSFI6CyQHwgETis7FMbPvVImn2tkY=";
   };
 
   patches = [
@@ -109,9 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-online-accounts
     libsecret
     libmsgraph
-  ]
-  ++ lib.optionals googleSupport [
-    libgdata
   ];
 
   mesonFlags = [
@@ -136,9 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dkeyring=false"
     "-Donedrive=false"
   ]
-  ++ lib.optionals (!googleSupport) [
-    "-Dgoogle=false"
-  ]
   ++ lib.optionals (avahi == null) [
     "-Ddnssd=false"
   ]
diff --git a/pkgs/by-name/gw/gweather-locations/package.nix b/pkgs/by-name/gw/gweather-locations/package.nix
new file mode 100644
index 000000000000..a43748e8c513
--- /dev/null
+++ b/pkgs/by-name/gw/gweather-locations/package.nix
@@ -0,0 +1,62 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchurl,
+  makeWrapper,
+  gettext,
+  meson,
+  ninja,
+  python3,
+  buildPackages,
+  gnome,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "gweather-locations";
+  version = "2026.2";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gweather-locations/${lib.versions.major finalAttrs.version}/gweather-locations-${finalAttrs.version}.tar.xz";
+    hash = "sha256-51cKNmHgp1KgY4eyAyWFz1iPxWdwsfnznxpV0XsoNf4=";
+  };
+
+  strictDeps = true;
+
+  depsBuildBuild = [
+    makeWrapper
+  ];
+
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+    (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ]))
+  ];
+
+  postPatch = ''
+    patchShebangs --build build-aux/gen_locations_variant.py
+    wrapProgram $PWD/build-aux/gen_locations_variant.py \
+      --prefix GI_TYPELIB_PATH : ${lib.getLib buildPackages.glib}/lib/girepository-1.0
+  '';
+
+  __structuredAttrs = true;
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = "gweather-locations";
+    };
+  };
+
+  meta = {
+    description = "GWeather locations database";
+    homepage = "https://gitlab.gnome.org/GNOME/gweather-locations";
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    teams = [ lib.teams.gnome ];
+  };
+})
diff --git a/pkgs/by-name/ha/harfbuzz/disable-check-symbols-test.patch b/pkgs/by-name/ha/harfbuzz/disable-check-symbols-test.patch
new file mode 100644
index 000000000000..34b2daea8fa7
--- /dev/null
+++ b/pkgs/by-name/ha/harfbuzz/disable-check-symbols-test.patch
@@ -0,0 +1,13 @@
+diff --git c/src/meson.build i/src/meson.build
+index a92e46fe2..3514ae85b 100644
+--- c/src/meson.build
++++ i/src/meson.build
+@@ -1238,7 +1238,7 @@ if get_option('tests').enabled()
+   env.set('HBHEADERS', ' '.join(HBHEADERS))
+ 
+   if cpp.get_argument_syntax() != 'msvc' and not meson.is_cross_build() # ensure the local tools are usable
+-    dist_check_script += ['check-static-inits', 'check-symbols']
++    dist_check_script += ['check-static-inits']
+     if get_option('wasm').disabled() and not get_option('with_libstdcxx')
+       dist_check_script += ['check-libstdc++']
+     endif
diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix
index 823f6480f728..881b996970e3 100644
--- a/pkgs/by-name/ha/harfbuzz/package.nix
+++ b/pkgs/by-name/ha/harfbuzz/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   pkg-config,
   glib,
   freetype,
@@ -14,6 +13,9 @@
   withIntrospection ?
     lib.meta.availableOn stdenv.hostPlatform gobject-introspection
     && stdenv.hostPlatform.emulatorAvailable buildPackages,
+  withRaster ? false,
+  withCairo ? false,
+  cairo,
   icu,
   graphite2,
   harfbuzz, # The icu variant uses and propagates the non-icu one.
@@ -35,21 +37,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
-  version = "12.3.0";
+  version = "13.2.1";
 
   src = fetchurl {
     url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz";
-    hash = "sha256-hmDr08J9lAf8hDO10XK6+6XwMXywu0M58o5TcMk9Qrc=";
+    hash = "sha256-ZpXaPrfhvgqjCS/k2BQzoztH9FGSWcdZ1ynjqaVcFCk=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/harfbuzz/harfbuzz/security/advisories/GHSA-xvjr-f2r9-c7ww
-      name = "CVE-2026-22693.patch";
-      url = "https://github.com/harfbuzz/harfbuzz/commit/1265ff8d990284f04d8768f35b0e20ae5f60daae.patch";
-      hash = "sha256-mdgIhp1ndPSfzplBRB7s+BN2T5Z9dEYZ0bAmSDCUPSE=";
-    })
-  ];
+  # This test fails reliably when executed through mesonCheckPhase but passes with
+  # a direct 'meson test' checkPhase, the validated symbols are fine but msan is not happy
+  # skipping this for now as it is not relevant for the packaging
+  patches = [ ./disable-check-symbols-test.patch ];
 
   postPatch = ''
     patchShebangs src/*.py test
@@ -69,10 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [
     # upstream recommends cairo, but it is only used for development purposes
-    # and is not part of the library.
+    # and hb-raster and is not part of the main library.
     # Cairo causes transitive (build) dependencies on various X11 or other
     # GUI-related libraries, so it shouldn't be re-added lightly.
-    (lib.mesonEnable "cairo" false)
+    (lib.mesonEnable "cairo" withCairo)
+    (lib.mesonEnable "raster" withRaster)
     # chafa is only used in a development utility, not in the library
     (lib.mesonEnable "chafa" false)
     (lib.mesonEnable "coretext" withCoreText)
@@ -97,7 +96,8 @@ stdenv.mkDerivation (finalAttrs: {
     docbook-xsl-nons
     docbook_xml_dtd_43
   ]
-  ++ lib.optional withIntrospection gobject-introspection;
+  ++ lib.optional withIntrospection gobject-introspection
+  ++ lib.optional withCairo cairo;
 
   buildInputs = [
     glib
@@ -152,6 +152,10 @@ stdenv.mkDerivation (finalAttrs: {
       "harfbuzz"
       "harfbuzz-gobject"
       "harfbuzz-subset"
-    ];
+      "harfbuzz-vector"
+    ]
+    ++ (lib.optional withIcu "harfbuzz-icu")
+    ++ (lib.optional withRaster "harfbuzz-raster")
+    ++ (lib.optional withCairo "harfbuzz-cairo");
   };
 })
diff --git a/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
index 8859c68f0fd2..0d3d15cc5db8 100644
--- a/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
+++ b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchurl {
     name = "hledger-check-fancyassertion-${version}.hs";
     url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs";
-    hash = "sha256-Zokrrcy9CfVV2tNI1DDsjqC+PcTdlMdit4O4Y1gP1O4=";
+    hash = "sha256-ISA7ED0HgyWOxfaufaFpNb1dHfE+1+Xh4SRCZ64yM6E=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/im/imagemagick/package.nix b/pkgs/by-name/im/imagemagick/package.nix
index 55c01b0cee14..34c62e4fecab 100644
--- a/pkgs/by-name/im/imagemagick/package.nix
+++ b/pkgs/by-name/im/imagemagick/package.nix
@@ -88,13 +88,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.2-19";
+  version = "7.1.2-21";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     tag = finalAttrs.version;
-    hash = "sha256-4uASM+GRTe0ES6FdshUMMkVof4IlLV+CMm2l+v5qZN0=";
+    hash = "sha256-eYrAj3kUGXgAdxohzn46MBuIjLAaQ1HGUEky3SSzh1U=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index 7e3816d0dc82..9417763e3177 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -18,22 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "6.19.0";
+  version = "7.0.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-kzIhPTVIC2RwhqcMMC3oVo3oNFWph3TTXeIWxM4ZEAY=";
+    hash = "sha256-5iiQ97XeY8BaO/Mx3I3rTAFcM2AT80Gk7fRpaXl/L04=";
   };
 
-  patches = [
-    # musl build fix: https://lore.kernel.org/netdev/20260223223435.289652-1-slyich@gmail.com/T/#u
-    (fetchurl {
-      name = "musl.patch";
-      url = "https://lore.kernel.org/netdev/20260223223435.289652-1-slyich@gmail.com/raw";
-      hash = "sha256-H45PUilF1D+1DxgtxSRBCgH4RQ7+APBfIW4QE9v6gUE=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace Makefile \
       --replace "CC := gcc" "CC ?= $CC"
diff --git a/pkgs/by-name/je/jemalloc/package.nix b/pkgs/by-name/je/jemalloc/package.nix
index 0871ff1d4d61..880e776d2dc0 100644
--- a/pkgs/by-name/je/jemalloc/package.nix
+++ b/pkgs/by-name/je/jemalloc/package.nix
@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
-  autogen,
-  autoconf,
-  automake,
+  autoreconfHook,
   # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
   # then stops downstream builds (mariadb in particular) from detecting it. This
   # option should remove the prefix and give us a working jemalloc.
@@ -40,13 +37,13 @@ assert lib.asserts.assertOneOf "pageSizeKiB" (toString pageSizeKiB) (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jemalloc";
-  version = "5.3.0-unstable-2025-09-12";
+  version = "5.3.1";
 
   src = fetchFromGitHub {
-    owner = "facebook";
+    owner = "jemalloc";
     repo = "jemalloc";
-    rev = "c0889acb6c286c837530fdbeb96007b0dee8b776";
-    hash = "sha256-lBNgvUhuiRPgzr8JC4zSSCT2KpDBktBVX72zfvAEHvo=";
+    tag = finalAttrs.version;
+    hash = "sha256-uGQppR2LS/Hhx4eWnavPDW3tzMyI1Df4XYrWEMQwBuw=";
   };
 
   patches = [
@@ -57,17 +54,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    autogen
-    autoconf
-    automake
+    autoreconfHook
   ];
 
-  # TODO: switch to autoreconfHook when updating beyond 5.3.0
-  # https://github.com/jemalloc/jemalloc/issues/2346
-  configureScript = "./autogen.sh";
-
   configureFlags = [
-    "--with-version=${lib.versions.majorMinor finalAttrs.version}.0-0-g${finalAttrs.src.rev}"
+    "--with-version=${finalAttrs.version}-0-g0000000000000000000000000000000000000000"
     "--with-lg-vaddr=${with stdenv.hostPlatform; toString (if isILP32 then 32 else parsed.cpu.bits)}"
   ]
   # see the comment on stripPrefix
@@ -98,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://jemalloc.net/";
+    downloadPage = "https://github.com/jemalloc/jemalloc";
     description = "General purpose malloc(3) implementation";
     longDescription = ''
       malloc(3)-compatible memory allocator that emphasizes fragmentation
diff --git a/pkgs/by-name/jq/jq/CVE-2026-32316.patch b/pkgs/by-name/jq/jq/CVE-2026-32316.patch
new file mode 100644
index 000000000000..29d08c9adcd7
--- /dev/null
+++ b/pkgs/by-name/jq/jq/CVE-2026-32316.patch
@@ -0,0 +1,49 @@
+From e47e56d226519635768e6aab2f38f0ab037c09e5 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Thu, 12 Mar 2026 20:28:43 +0900
+Subject: [PATCH] Fix heap buffer overflow in `jvp_string_append` and
+ `jvp_string_copy_replace_bad`
+
+In `jvp_string_append`, the allocation size `(currlen + len) * 2` could
+overflow `uint32_t` when `currlen + len` exceeds `INT_MAX`, causing a small
+allocation followed by a large `memcpy`.
+
+In `jvp_string_copy_replace_bad`, the output buffer size calculation
+`length * 3 + 1` could overflow `uint32_t`, again resulting in a small
+allocation followed by a large write.
+
+Add overflow checks to both functions to return an error for strings
+that would exceed `INT_MAX` in length. Fixes CVE-2026-32316.
+---
+ src/jv.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/jv.c b/src/jv.c
+index 722a539391..2a62b48419 100644
+--- a/src/jv.c
++++ b/src/jv.c
+@@ -1114,7 +1114,12 @@ static jv jvp_string_copy_replace_bad(const char* data, uint32_t length) {
+   const char* end = data + length;
+   const char* i = data;
+ 
+-  uint32_t maxlength = length * 3 + 1; // worst case: all bad bytes, each becomes a 3-byte U+FFFD
++  // worst case: all bad bytes, each becomes a 3-byte U+FFFD
++  uint64_t maxlength = (uint64_t)length * 3 + 1;
++  if (maxlength >= INT_MAX) {
++    return jv_invalid_with_msg(jv_string("String too long"));
++  }
++
+   jvp_string* s = jvp_string_alloc(maxlength);
+   char* out = s->data;
+   int c = 0;
+@@ -1174,6 +1179,10 @@ static uint32_t jvp_string_remaining_space(jvp_string* s) {
+ static jv jvp_string_append(jv string, const char* data, uint32_t len) {
+   jvp_string* s = jvp_string_ptr(string);
+   uint32_t currlen = jvp_string_length(s);
++  if ((uint64_t)currlen + len >= INT_MAX) {
++    jv_free(string);
++    return jv_invalid_with_msg(jv_string("String too long"));
++  }
+ 
+   if (jvp_refcnt_unshared(string.u.ptr) &&
+       jvp_string_remaining_space(s) >= len) {
diff --git a/pkgs/by-name/jq/jq/CVE-2026-33947.patch b/pkgs/by-name/jq/jq/CVE-2026-33947.patch
new file mode 100644
index 000000000000..9f31fd82b057
--- /dev/null
+++ b/pkgs/by-name/jq/jq/CVE-2026-33947.patch
@@ -0,0 +1,66 @@
+From fb59f1491058d58bdc3e8dd28f1773d1ac690a1f Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 13 Apr 2026 11:23:40 +0900
+Subject: [PATCH] Limit path depth to prevent stack overflow
+
+Deeply nested path arrays can cause unbounded recursion in
+`jv_setpath`, `jv_getpath`, and `jv_delpaths`, leading to
+stack overflow. Add a depth limit of 10000 to match the
+existing `tojson` depth limit. This fixes CVE-2026-33947.
+---
+ src/jv_aux.c  | 21 +++++++++++++++++++++
+ 2 files changed, 46 insertions(+)
+
+diff --git a/src/jv_aux.c b/src/jv_aux.c
+index 018f380b10..fd5ff96684 100644
+--- a/src/jv_aux.c
++++ b/src/jv_aux.c
+@@ -365,6 +365,10 @@ static jv jv_dels(jv t, jv keys) {
+   return t;
+ }
+ 
++#ifndef MAX_PATH_DEPTH
++#define MAX_PATH_DEPTH (10000)
++#endif
++
+ jv jv_setpath(jv root, jv path, jv value) {
+   if (jv_get_kind(path) != JV_KIND_ARRAY) {
+     jv_free(value);
+@@ -372,6 +376,12 @@ jv jv_setpath(jv root, jv path, jv value) {
+     jv_free(path);
+     return jv_invalid_with_msg(jv_string("Path must be specified as an array"));
+   }
++  if (jv_array_length(jv_copy(path)) > MAX_PATH_DEPTH) {
++    jv_free(value);
++    jv_free(root);
++    jv_free(path);
++    return jv_invalid_with_msg(jv_string("Path too deep"));
++  }
+   if (!jv_is_valid(root)){
+     jv_free(value);
+     jv_free(path);
+@@ -424,6 +434,11 @@ jv jv_getpath(jv root, jv path) {
+     jv_free(path);
+     return jv_invalid_with_msg(jv_string("Path must be specified as an array"));
+   }
++  if (jv_array_length(jv_copy(path)) > MAX_PATH_DEPTH) {
++    jv_free(root);
++    jv_free(path);
++    return jv_invalid_with_msg(jv_string("Path too deep"));
++  }
+   if (!jv_is_valid(root)) {
+     jv_free(path);
+     return root;
+@@ -502,6 +517,12 @@ jv jv_delpaths(jv object, jv paths) {
+       jv_free(elem);
+       return err;
+     }
++    if (jv_array_length(jv_copy(elem)) > MAX_PATH_DEPTH) {
++      jv_free(object);
++      jv_free(paths);
++      jv_free(elem);
++      return jv_invalid_with_msg(jv_string("Path too deep"));
++    }
+     jv_free(elem);
+   }
+   if (jv_array_length(jv_copy(paths)) == 0) {
diff --git a/pkgs/by-name/jq/jq/CVE-2026-33948.patch b/pkgs/by-name/jq/jq/CVE-2026-33948.patch
new file mode 100644
index 000000000000..5b6497e1469d
--- /dev/null
+++ b/pkgs/by-name/jq/jq/CVE-2026-33948.patch
@@ -0,0 +1,45 @@
+From 6374ae0bcdfe33a18eb0ae6db28493b1f34a0a5b Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 13 Apr 2026 08:46:11 +0900
+Subject: [PATCH] Fix NUL truncation in the JSON parser
+
+This fixes CVE-2026-33948.
+---
+ src/util.c   | 8 +-------
+ tests/shtest | 6 ++++++
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index fdfdb96d88..80d65fc808 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -312,13 +312,7 @@ static int jq_util_input_read_more(jq_util_input_state *state) {
+       if (p != NULL)
+         state->current_line++;
+ 
+-      if (p == NULL && state->parser != NULL) {
+-        /*
+-         * There should be no NULs in JSON texts (but JSON text
+-         * sequences are another story).
+-         */
+-        state->buf_valid_len = strlen(state->buf);
+-      } else if (p == NULL && feof(state->current_input)) {
++      if (p == NULL && feof(state->current_input)) {
+         size_t i;
+ 
+         /*
+diff --git a/tests/shtest b/tests/shtest
+index cb88745277..370f7b7c69 100755
+--- a/tests/shtest
++++ b/tests/shtest
+@@ -880,4 +880,10 @@ $JQ -nf $d/prog.jq 2> $d/out && {
+ }
+ diff $d/out $d/expected
+ 
++# CVE-2026-33948: No NUL truncation in the JSON parser
++if printf '{}\x00{}' | $JQ >/dev/null 2> /dev/null; then
++  printf 'Error expected but jq exited successfully\n' 1>&2
++  exit 1
++fi
++
+ exit 0
diff --git a/pkgs/by-name/jq/jq/CVE-2026-39979.patch b/pkgs/by-name/jq/jq/CVE-2026-39979.patch
new file mode 100644
index 000000000000..cc0c3d17f77f
--- /dev/null
+++ b/pkgs/by-name/jq/jq/CVE-2026-39979.patch
@@ -0,0 +1,27 @@
+From 2f09060afab23fe9390cce7cb860b10416e1bf5f Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 13 Apr 2026 11:04:52 +0900
+Subject: [PATCH] Fix out-of-bounds read in jv_parse_sized()
+
+This fixes CVE-2026-39979.
+
+Co-authored-by: Mattias Wadman <mattias.wadman@gmail.com>
+---
+ src/jv_parse.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/jv_parse.c b/src/jv_parse.c
+index aa2054cc09..56847b5eaa 100644
+--- a/src/jv_parse.c
++++ b/src/jv_parse.c
+@@ -893,8 +893,9 @@ jv jv_parse_sized_custom_flags(const char* string, int length, int flags) {
+ 
+   if (!jv_is_valid(value) && jv_invalid_has_msg(jv_copy(value))) {
+     jv msg = jv_invalid_get_msg(value);
+-    value = jv_invalid_with_msg(jv_string_fmt("%s (while parsing '%s')",
++    value = jv_invalid_with_msg(jv_string_fmt("%s (while parsing '%.*s')",
+                                               jv_string_value(msg),
++                                              length,
+                                               string));
+     jv_free(msg);
+   }
diff --git a/pkgs/by-name/jq/jq/CVE-2026-40164.patch b/pkgs/by-name/jq/jq/CVE-2026-40164.patch
new file mode 100644
index 000000000000..483316f64b4b
--- /dev/null
+++ b/pkgs/by-name/jq/jq/CVE-2026-40164.patch
@@ -0,0 +1,87 @@
+From 0c7d133c3c7e37c00b6d46b658a02244fdd3c784 Mon Sep 17 00:00:00 2001
+From: itchyny <itchyny@cybozu.co.jp>
+Date: Mon, 13 Apr 2026 08:53:26 +0900
+Subject: [PATCH] Randomize hash seed to mitigate hash collision DoS attacks
+
+The hash function used a fixed seed, allowing attackers to craft colliding keys
+and cause O(n^2) object parsing performance. Initialize the seed from a random
+source at process startup to prevent the attack. This fixes CVE-2026-40164.
+
+Co-authored-by: Asaf Meizner <asafmeizner@gmail.com>
+---
+ configure.ac |  2 ++
+ src/jv.c     | 34 ++++++++++++++++++++++++++++++++--
+ 2 files changed, 34 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5dac42655a..f7067a4341 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,6 +149,8 @@ AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define
+ AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])],
+                 [], [[#include <time.h>]])
+ AC_FIND_FUNC([setlocale], [c], [#include <locale.h>], [0,0])
++AC_FIND_FUNC([arc4random], [c], [#include <stdlib.h>], [])
++AC_FIND_FUNC([getentropy], [c], [#include <unistd.h>], [0, 0])
+ 
+ dnl Figure out if we have the pthread functions we actually need
+ AC_FIND_FUNC_NO_LIBS([pthread_key_create], [], [#include <pthread.h>], [NULL, NULL])
+diff --git a/src/jv.c b/src/jv.c
+index 2a62b48419..607ac174f7 100644
+--- a/src/jv.c
++++ b/src/jv.c
+@@ -40,6 +40,10 @@
+ #include <limits.h>
+ #include <math.h>
+ #include <float.h>
++#include <time.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <pthread.h>
+ 
+ #include "jv_alloc.h"
+ #include "jv.h"
+@@ -1206,7 +1210,33 @@ static jv jvp_string_append(jv string, const char* data, uint32_t len) {
+   }
+ }
+ 
+-static const uint32_t HASH_SEED = 0x432A9843;
++static uint32_t hash_seed;
++static pthread_once_t hash_seed_once = PTHREAD_ONCE_INIT;
++
++static void jvp_hash_seed_init(void) {
++  uint32_t seed;
++#if defined(HAVE_ARC4RANDOM)
++  seed = arc4random();
++#elif defined(HAVE_GETENTROPY)
++  if (getentropy(&seed, sizeof(seed)) != 0)
++    seed = (uint32_t)getpid() ^ (uint32_t)time(NULL);
++#else
++  int fd = open("/dev/urandom", O_RDONLY);
++  if (fd >= 0) {
++    if (read(fd, &seed, sizeof(seed)) != 4)
++      seed = (uint32_t)getpid() ^ (uint32_t)time(NULL);
++    close(fd);
++  } else {
++    seed = (uint32_t)getpid() ^ (uint32_t)time(NULL);
++  }
++#endif
++  hash_seed = seed;
++}
++
++static uint32_t jvp_hash_seed(void) {
++  pthread_once(&hash_seed_once, jvp_hash_seed_init);
++  return hash_seed;
++}
+ 
+ static uint32_t rotl32 (uint32_t x, int8_t r){
+   return (x << r) | (x >> (32 - r));
+@@ -1225,7 +1255,7 @@ static uint32_t jvp_string_hash(jv jstr) {
+   int len = (int)jvp_string_length(str);
+   const int nblocks = len / 4;
+ 
+-  uint32_t h1 = HASH_SEED;
++  uint32_t h1 = jvp_hash_seed();
+ 
+   const uint32_t c1 = 0xcc9e2d51;
+   const uint32_t c2 = 0x1b873593;
diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix
index b2a0941a79fe..31633d27ba03 100644
--- a/pkgs/by-name/jq/jq/package.nix
+++ b/pkgs/by-name/jq/jq/package.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./musl.patch
+    ./CVE-2026-32316.patch
+    ./CVE-2026-33947.patch
+    ./CVE-2026-33948.patch
+    ./CVE-2026-39979.patch
+    ./CVE-2026-40164.patch
   ]
   ++ lib.optionals stdenv.hostPlatform.is32bit [
     # needed because epoch conversion test here is right at the end of 32 bit integer space
diff --git a/pkgs/by-name/js/jsoncpp/package.nix b/pkgs/by-name/js/jsoncpp/package.nix
index 973cffb3a41c..b2961ed1516f 100644
--- a/pkgs/by-name/js/jsoncpp/package.nix
+++ b/pkgs/by-name/js/jsoncpp/package.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "jsoncpp";
   version = "1.9.7";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   outputs = [
     "out"
     "dev"
@@ -35,10 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
     export sourceRoot=${finalAttrs.src.name}
   '';
 
-  postPatch = lib.optionalString secureMemory ''
-    sed -i 's/#define JSONCPP_USING_SECURE_MEMORY 0/#define JSONCPP_USING_SECURE_MEMORY 1/' include/json/version.h
-  '';
-
   nativeBuildInputs = [
     cmake
     python3
@@ -46,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
+    "-DJSONCPP_USE_SECURE_MEMORY=${if secureMemory then "ON" else "OFF"}"
     "-DBUILD_SHARED_LIBS=ON"
     "-DBUILD_OBJECT_LIBS=OFF"
     "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix
index 6ecbc20da105..8699a4132d4a 100644
--- a/pkgs/by-name/ld/ld64/package.nix
+++ b/pkgs/by-name/ld/ld64/package.nix
@@ -19,25 +19,35 @@ let
   # Copy the files from their original sources instead of using patches to reduce the size of the patch set in nixpkgs.
   otherSrcs = {
     # The last version of ld64 to have dyldinfo
-    ld64 = fetchFromGitHub {
+    dyldinfo = fetchFromGitHub {
       owner = "apple-oss-distributions";
       repo = "ld64";
       tag = "ld64-762";
       hash = "sha256-UIq/fwO40vk8yvoTfx+UlLhnuzkI0Ih+Ym6W/BwnP0s=";
     };
 
+    # The last version of ld64 to have machochecker and libpruntrie
+    machochecker = fetchFromGitHub {
+      owner = "apple-oss-distributions";
+      repo = "ld64";
+      tag = "ld64-954.16";
+      hash = "sha256-CVIyL2J9ISZnI4+r+wp4QtOb3+3Tmz2z2Z7/qeRqHS0=";
+    };
+
     # Provides the source files used in the vendored libtapi. The libtapi derivation puts `tapi-src` first.
     libtapi = lib.head libtapi.srcs;
   };
 
-  ld64src = lib.escapeShellArg "${otherSrcs.ld64}";
+  dyldinfoSrc = lib.escapeShellArg "${otherSrcs.dyldinfo}";
+  machocheckerSrc = lib.escapeShellArg "${otherSrcs.machochecker}";
+  libprunetrieSrc = lib.escapeShellArg "${otherSrcs.machochecker}";
   libtapisrc = lib.escapeShellArg "${otherSrcs.libtapi}";
 
   llvmPath = "${lib.getLib llvm}";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ld64";
-  version = "954.16";
+  version = "956.6";
 
   outputs = [
     "out"
@@ -49,16 +59,15 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "apple-oss-distributions";
     repo = "ld64";
     tag = "ld64-${finalAttrs.version}";
-    hash = "sha256-CVIyL2J9ISZnI4+r+wp4QtOb3+3Tmz2z2Z7/qeRqHS0=";
+    hash = "sha256-2VlBjlCZ+ZPKGZ0f5UuG3jJTLZIBXf8IZOiD6snheh4=";
   };
 
   patches = [
-    # These patches are vendored from https://github.com/reckenrode/ld64/tree/ld64-951.9-nixpkgs.
+    # These patches are vendored from https://github.com/reckenrode/ld64/tree/ld64-956.6-nixpkgs.
     # See their comments for more on what they do.
     ./patches/0001-Always-use-write-instead-of-mmap.patch
     ./patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch
     ./patches/0003-Inline-missing-definitions-instead-of-using-private-.patch
-    ./patches/0004-Removed-unused-Blob-clone-method.patch
     ./patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch
     ./patches/0006-Add-Meson-build-system.patch
     ./patches/0007-Add-CrashReporterClient-header.patch
@@ -73,16 +82,22 @@ stdenv.mkDerivation (finalAttrs: {
     ./patches/0016-Add-dyldinfo-to-the-ld64-build.patch
     ./patches/0017-Fix-dyldinfo-build.patch
     ./patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch
-
-    # Fix zippered versions on macOS 26+. Part of upstream ld64-956.6. Remove on next version bump.
-    # https://github.com/apple-oss-distributions/ld64/commit/1a4389663d65d6630e4b3e31ace2a86b6183b452
-    ./patches/0019-Fix-zippered-versions-macos-26.patch
+    ./patches/0019-Deduplicate-RPATH-entries.patch
+    ./patches/0020-Remove-private-analytics-APIs.patch
+    ./patches/0021-Support-text-based-stubs-with-compatible-architectur.patch
   ];
 
   prePatch = ''
     # Copy dyldinfo source files
-    cp ${ld64src}/doc/man/man1/dyldinfo.1 doc/man/man1/dyldinfo.1
-    cp ${ld64src}/src/other/dyldinfo.cpp src/other/dyldinfo.cpp
+    cp ${dyldinfoSrc}/doc/man/man1/dyldinfo.1 doc/man/man1/dyldinfo.1
+    cp ${dyldinfoSrc}/src/other/dyldinfo.cpp src/other/dyldinfo.cpp
+
+    # Copy machochecker source files
+    cp ${machocheckerSrc}/src/other/machochecker.cpp src/other/machochecker.cpp
+
+    # The current version of cctools in Nixpkgs needs libprunetrie
+    cp ${libprunetrieSrc}/src/other/PruneTrie.cpp src/other/PruneTrie.cpp
+    cp ${libprunetrieSrc}/src/other/prune_trie.h src/other/prune_trie.h
 
     # Copy files needed from libtapi by ld64
     mkdir -p subprojects/libtapi/tapi
@@ -104,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
-  xcodeHash = "sha256-qip/1eiGn8PdLThonhPq3oq2veN4E1zOiamDPBfTeNE=";
+  xcodeHash = "sha256-b0KCdHkMWsdOb68LB8B2rbZPAQma8AOnGUGQNvHOnV0=";
   xcodeProject = "ld64.xcodeproj";
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch b/pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch
index 7622f9a8e70f..82333e8948c0 100644
--- a/pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch
+++ b/pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch
@@ -1,7 +1,7 @@
-From ddcefc16f5db7fd36c885cf3bcd3713c8383e93b Mon Sep 17 00:00:00 2001
+From 57222d068a4ba1d64249d19fb4a281d8dd9c0a5e Mon Sep 17 00:00:00 2001
 From: Randy Eckenrode <randy@largeandhighquality.com>
 Date: Wed, 13 Nov 2024 13:53:14 -0500
-Subject: [PATCH 03/18] Inline missing definitions instead of using private
+Subject: [PATCH] Inline missing definitions instead of using private
  mach-o/dyld_private.h header
 
 Based on: https://github.com/llvm/llvm-project/blob/38870fe124eb5e6e24136f9d3e4551a62370faee/libunwind/src/AddressSpace.hpp#L57-L67
@@ -11,7 +11,7 @@ Based on: https://github.com/llvm/llvm-project/blob/38870fe124eb5e6e24136f9d3e45
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/src/ld/Options.cpp b/src/ld/Options.cpp
-index 991387f..cde3fad 100644
+index b52747a..9841689 100644
 --- a/src/ld/Options.cpp
 +++ b/src/ld/Options.cpp
 @@ -35,7 +35,6 @@
@@ -19,9 +19,9 @@ index 991387f..cde3fad 100644
  #include <Availability.h>
  #include <tapi/tapi.h>
 -#include <mach-o/dyld_priv.h>
+ #include <CoreAnalytics/CoreAnalytics.h>
  
  #include <algorithm>
- #include <vector>
 diff --git a/src/ld/parsers/libunwind/AddressSpace.hpp b/src/ld/parsers/libunwind/AddressSpace.hpp
 index eb47390..0788cc2 100644
 --- a/src/ld/parsers/libunwind/AddressSpace.hpp
@@ -52,5 +52,5 @@ index eb47390..0788cc2 100644
  namespace libunwind {
  
 -- 
-2.47.2
+2.51.2
 
diff --git a/pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch b/pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch
deleted file mode 100644
index 05c45d651a1b..000000000000
--- a/pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3c0038576173103e8aaa5286f853046b619c35fe Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode <randy@largeandhighquality.com>
-Date: Wed, 13 Nov 2024 13:53:14 -0500
-Subject: [PATCH 04/18] Removed unused `Blob::clone` method
-
-Fixes a compiler error due to a missing `BlobCore::clone` method.
----
- src/ld/code-sign-blobs/blob.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/ld/code-sign-blobs/blob.h b/src/ld/code-sign-blobs/blob.h
-index 19c63a9..2ac0aa8 100644
---- a/src/ld/code-sign-blobs/blob.h
-+++ b/src/ld/code-sign-blobs/blob.h
-@@ -179,9 +179,6 @@ public:
- 			return p;
- 		return NULL;
- 	}
--	
--	BlobType *clone() const
--	{ assert(validateBlob()); return specific(this->BlobCore::clone());	}
- 
- 	static BlobType *readBlob(int fd)
- 	{ return specific(BlobCore::readBlob(fd, _magic, sizeof(BlobType), 0), true); }
--- 
-2.47.2
-
diff --git a/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch b/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch
index 70756685c2f7..60b998d8d1dd 100644
--- a/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch
+++ b/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch
@@ -35,7 +35,7 @@ index 0000000..cd4e8da
 +    license : 'APSL-2.0',
 +    license_files : 'APPLE_LICENSE',
 +    meson_version : '>=1.6.0',
-+    version : '954.16',
++    version : '956.6',
 +)
 +
 +add_project_arguments(
diff --git a/pkgs/by-name/ld/ld64/patches/0019-Deduplicate-RPATH-entries.patch b/pkgs/by-name/ld/ld64/patches/0019-Deduplicate-RPATH-entries.patch
new file mode 100644
index 000000000000..25bd52279065
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/patches/0019-Deduplicate-RPATH-entries.patch
@@ -0,0 +1,72 @@
+From 19919df4055361b5c24458766754dbe01b67df69 Mon Sep 17 00:00:00 2001
+From: Ben Simms <ben@bensimms.moe>
+Date: Wed, 15 Apr 2026 21:53:24 -0400
+Subject: [PATCH] Deduplicate RPATH entries
+
+This is required for MacOS 15.4 and above, which rejects loading
+libraries with duplicate RPATH entries
+---
+ src/ld/HeaderAndLoadCommands.hpp      |   29 +-
+ src/ld/HeaderAndLoadCommands.hpp.orig | 1828 +++++++++++++++++++++++++
+ 2 files changed, 1855 insertions(+), 2 deletions(-)
+ create mode 100644 src/ld/HeaderAndLoadCommands.hpp.orig
+
+diff --git a/src/ld/HeaderAndLoadCommands.hpp b/src/ld/HeaderAndLoadCommands.hpp
+index 55700768df..4001f47c0e 100644
+--- a/src/ld/HeaderAndLoadCommands.hpp
++++ b/src/ld/HeaderAndLoadCommands.hpp
+@@ -472,7 +472,14 @@
+ 	
+ 	if ( _hasRPathLoadCommands ) {
+ 		const std::vector<const char*>& rpaths = _options.rpaths();
++		std::set<std::string> seen;
++
+ 		for (std::vector<const char*>::const_iterator it = rpaths.begin(); it != rpaths.end(); ++it) {
++			std::string it_(*it);
++			if (seen.find(it_) != std::end(seen))
++				continue;
++			seen.insert(it_);
++
+ 			sz += alignedSize(sizeof(macho_rpath_command<P>) + strlen(*it) + 1);
+ 		}
+ 	}
+@@ -581,8 +588,18 @@
+ 	
+ 	count += _dylibLoadCommmandsCount;
+ 
+-	count += _options.rpaths().size();
+-	
++	{
++		const std::vector<const char*>& rpaths = _options.rpaths();
++		std::set<std::string> seen;
++		for (std::vector<const char*>::const_iterator it = rpaths.begin(); it != rpaths.end(); ++it) {
++			std::string it_(*it);
++			if (seen.find(it_) != std::end(seen))
++				continue;
++			seen.insert(it_);
++			++count;
++		}
++	}
++
+ 	if ( _hasSubFrameworkLoadCommand )
+ 		++count;
+ 	
+@@ -1771,7 +1788,15 @@
+ 
+ 	if ( _hasRPathLoadCommands ) {
+ 		const std::vector<const char*>& rpaths = _options.rpaths();
++		std::set<std::string> seen;
++
+ 		for (std::vector<const char*>::const_iterator it = rpaths.begin(); it != rpaths.end(); ++it) {
++			std::string it_(*it);
++			if (seen.find(it_) != std::end(seen))
++				continue;
++
++			seen.insert(it_);
++
+ 			p = this->copyRPathLoadCommand(p, *it);
+ 		}
+ 	}
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/ld/ld64/patches/0019-Fix-zippered-versions-macos-26.patch b/pkgs/by-name/ld/ld64/patches/0019-Fix-zippered-versions-macos-26.patch
deleted file mode 100644
index 06f5ce310272..000000000000
--- a/pkgs/by-name/ld/ld64/patches/0019-Fix-zippered-versions-macos-26.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/ld/Options.cpp b/src/ld/Options.cpp
---- a/src/ld/Options.cpp
-+++ b/src/ld/Options.cpp
-@@ -4882,7 +4885,8 @@ void Options::reconfigureDefaults()
- 		uint32_t iOSMacOSMajorVersion = (iOSMacVersion >> 16) & 0xFFFF;
- 
- 		// macOS 11 -> iOSMac 14, and so on
--		uint32_t newMajorVersion = macOSMajorVersion + 3;
-+		uint32_t newMajorVersion = macOSMajorVersion < 26 ? macOSMajorVersion + 3 : macOSMajorVersion;
-+		// rdar://154107557 (ld64 fix handling of zippered versions for macOS 26+)
- 		if ( newMajorVersion > iOSMacOSMajorVersion ) {
- 			uint32_t newVersion = newMajorVersion << 16;
- 			std::string oldVersionString = getVersionString32(iOSMacVersion);
diff --git a/pkgs/by-name/ld/ld64/patches/0020-Remove-private-analytics-APIs.patch b/pkgs/by-name/ld/ld64/patches/0020-Remove-private-analytics-APIs.patch
new file mode 100644
index 000000000000..cca29a541707
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/patches/0020-Remove-private-analytics-APIs.patch
@@ -0,0 +1,52 @@
+From 0b587a5f6df1cbab0ff145b96672a95faed301d1 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Tue, 14 Apr 2026 21:35:22 -0400
+Subject: [PATCH] Remove private analytics APIs
+
+---
+ src/ld/Options.cpp | 2 --
+ src/ld/Options.h   | 3 ---
+ 2 files changed, 5 deletions(-)
+
+diff --git a/src/ld/Options.cpp b/src/ld/Options.cpp
+index 9841689..00adba2 100644
+--- a/src/ld/Options.cpp
++++ b/src/ld/Options.cpp
+@@ -35,13 +35,11 @@
+ #include <spawn.h>
+ #include <Availability.h>
+ #include <tapi/tapi.h>
+-#include <CoreAnalytics/CoreAnalytics.h>
+ 
+ #include <algorithm>
+ #include <vector>
+ #include <map>
+ #include <sstream>
+-#include <xpc/xpc.h>
+ 
+ #include "ld.hpp"
+ #include "Options.h"
+diff --git a/src/ld/Options.h b/src/ld/Options.h
+index e1cd720..20ba2ab 100644
+--- a/src/ld/Options.h
++++ b/src/ld/Options.h
+@@ -33,7 +33,6 @@
+ #include <vector>
+ #include <unordered_set>
+ #include <unordered_map>
+-#include <xpc/xpc.h>
+ 
+ #include "ld.hpp"
+ #include "Snapshot.h"
+@@ -664,8 +663,6 @@ private:
+ 	void						cannotBeUsedWithBitcode(const char* arg);
+ 	void						loadImplictZipperFile(const char *path,std::vector<const char*>& paths);
+ 	void 						inferArchAndPlatform();
+-	xpc_object_t 		makeAnalyticsObject() const;
+-	void						sendAnalytics() const;
+ 
+ 
+ //	ObjectFile::ReaderOptions			fReaderOptions;
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/ld/ld64/patches/0021-Support-text-based-stubs-with-compatible-architectur.patch b/pkgs/by-name/ld/ld64/patches/0021-Support-text-based-stubs-with-compatible-architectur.patch
new file mode 100644
index 000000000000..db1d08915b30
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/patches/0021-Support-text-based-stubs-with-compatible-architectur.patch
@@ -0,0 +1,35 @@
+From f18377dd297f669be5b9fbf10c132698f452c318 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Tue, 14 Apr 2026 21:35:22 -0400
+Subject: [PATCH] Support text-based stubs with compatible architectures
+
+This is necessary to support newer (e.g., 26.4) SDKs, which only include
+symbol definitions for arm64e. Fortunately, arm64e dylibs are
+ABI-compatible with arm64 binaries.
+---
+ subprojects/libtapi/LinkerInterfaceFile.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/subprojects/libtapi/LinkerInterfaceFile.cpp b/subprojects/libtapi/LinkerInterfaceFile.cpp
+index 632eac8b0f..dfc5a18a73 100644
+--- a/subprojects/libtapi/LinkerInterfaceFile.cpp
++++ b/subprojects/libtapi/LinkerInterfaceFile.cpp
+@@ -186,6 +186,15 @@
+ 
+   if (enforceCpuSubType)
+     return AK_unknown;
++ 
++  // Check whether any archs has a compatible cpu type and return that if so.
++  for (const auto& targetArch : archs) {
++    auto [targetCpuType, _] = getCPUTypeFromArchitecture(targetArch);
++    if (cpuType == targetCpuType) {
++      return targetArch;
++    }
++  }
++
+   return arch;
+ }
+ 
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix
index 395202911104..0d1ed0da7e85 100644
--- a/pkgs/by-name/li/libadwaita/package.nix
+++ b/pkgs/by-name/li/libadwaita/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libadwaita";
-  version = "1.8.5.1";
+  version = "1.9.0";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "libadwaita";
     tag = finalAttrs.version;
-    hash = "sha256-vR3x+6JCOVaW/d8dbOmPdVJcDZbpwFfuZ98rVY2XUvE=";
+    hash = "sha256-JAKP8CjLCKGZvHoB26ih/J3xAru4wiVf/ObG0L8r4pY=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/li/libao/package.nix b/pkgs/by-name/li/libao/package.nix
index ae7135d649ba..5f719fa6a9d8 100644
--- a/pkgs/by-name/li/libao/package.nix
+++ b/pkgs/by-name/li/libao/package.nix
@@ -58,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
 
+  enableParallelBuilding = true;
+
   meta = {
     longDescription = ''
       Libao is Xiph.org's cross-platform audio library that allows
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index 5c1ae26fcf26..9469def9b188 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -32,13 +32,13 @@
 assert xarSupport -> libxml2 != null;
 stdenv.mkDerivation (finalAttrs: {
   pname = "libarchive";
-  version = "3.8.6";
+  version = "3.8.7";
 
   src = fetchFromGitHub {
     owner = "libarchive";
     repo = "libarchive";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XNFw0h++7B3ODnEi50zd7q/j1bYQzL1IKB2q3p4IzB4=";
+    hash = "sha256-LpD+lE+0PZi/3nYDVPXhBQL9A7mvqelOzRLskVtg9Y0=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libcanberra/package.nix b/pkgs/by-name/li/libcanberra/package.nix
index a708a18d70ee..c9148035ba31 100644
--- a/pkgs/by-name/li/libcanberra/package.nix
+++ b/pkgs/by-name/li/libcanberra/package.nix
@@ -76,6 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
+  enableParallelBuilding = true;
+
   passthru = lib.optionalAttrs (gtkSupport != null) {
     gtkModule = if gtkSupport == "gtk2" then "/lib/gtk-2.0" else "/lib/gtk-3.0/";
   };
diff --git a/pkgs/by-name/li/libcap_ng/package.nix b/pkgs/by-name/li/libcap_ng/package.nix
index eb0a5657ebfb..60fc8e308c1c 100644
--- a/pkgs/by-name/li/libcap_ng/package.nix
+++ b/pkgs/by-name/li/libcap_ng/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcap-ng";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "stevegrubb";
     repo = "libcap-ng";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oQRSjAikfO3RZNa4MHXUVUQ6s4Dzt7iSCYUNB8Gs+sk=";
+    hash = "sha256-anuPOBWp4Hlpo+m6kYlSd2v7H3P7LQ9brZdq1lo7Po4=";
   };
 
   # NEWS needs to exist or else the build fails
diff --git a/pkgs/by-name/li/libdex/package.nix b/pkgs/by-name/li/libdex/package.nix
index aac7ef64c3b6..ad6f4543be9b 100644
--- a/pkgs/by-name/li/libdex/package.nix
+++ b/pkgs/by-name/li/libdex/package.nix
@@ -11,11 +11,12 @@
   glib,
   liburing,
   gnome,
+  python3,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdex";
-  version = "1.0.0";
+  version = "1.1.0";
 
   outputs = [
     "out"
@@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz";
-    hash = "sha256-e49cXbN5bhThLhBCLiNWdmuoMLkoFf7nC7yGe1sgf10=";
+    hash = "sha256-qeBMir7gHJp88RSMW3qma6N37+avbYOAHU/RqlUhmqo=";
   };
 
   nativeBuildInputs = [
@@ -35,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     vala
+    python3
   ];
 
   buildInputs = [
@@ -48,6 +50,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  # test-dbus tries to access /etc/machine-id
+  postPatch = ''
+    substituteInPlace "testsuite/meson.build" --replace-fail \
+      "'test-dbus': {'extra-sources': dbus_foo, 'disable': not have_gdbus_codegen}," \
+      "'test-dbus': {'extra-sources': dbus_foo, 'disable': true},"
+  '';
+
   postFixup = ''
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
     moveToOutput "share/doc" "$devdoc"
diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix
index a1c0497421e8..caa0e573221a 100644
--- a/pkgs/by-name/li/libdrm/package.nix
+++ b/pkgs/by-name/li/libdrm/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdrm";
-  version = "2.4.131";
+  version = "2.4.133";
 
   src = fetchurl {
     url = "https://dri.freedesktop.org/libdrm/libdrm-${finalAttrs.version}.tar.xz";
-    hash = "sha256-RbqZg7UciWQGo9ZU3oHTE7lTt25jkeJ5cHPVQ8X2F9U=";
+    hash = "sha256-/Gj50LoupjyUMqKZ4U/qCfrXqKZugDn814AspZ93tPU=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libexif/package.nix b/pkgs/by-name/li/libexif/package.nix
index 37b3a92f762d..92e3a614bf42 100644
--- a/pkgs/by-name/li/libexif/package.nix
+++ b/pkgs/by-name/li/libexif/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libexif";
-  version = "0.6.25";
+  version = "0.6.26";
 
   src = fetchFromGitHub {
     owner = "libexif";
     repo = "libexif";
     rev = "libexif-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}-release";
-    sha256 = "sha256-H8YzfNO2FCrYAwEA4bkOpRdxISK9RXaHVuK8zz70TlM=";
+    sha256 = "sha256-H51RlMT3swWF8oLWu70eTnuumee5mRMSCWkMFX7mJSk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix
index 354455984786..2bd139469e2c 100644
--- a/pkgs/by-name/li/libfabric/package.nix
+++ b/pkgs/by-name/li/libfabric/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfabric";
-  version = "2.5.0";
+  version = "2.5.1";
 
   enableParallelBuilding = true;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ofiwg";
     repo = "libfabric";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-VgVCsurXmeJdS6cUhSp6ILcL4b31FuycVB6lv7jf0JM=";
+    sha256 = "sha256-d8ZdHMo3ErwBtLtUiLetjR+wu6H9bj3jnGZDYX544Jc=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libfido2/package.nix b/pkgs/by-name/li/libfido2/package.nix
index c58bf2028169..2dfceee0d167 100644
--- a/pkgs/by-name/li/libfido2/package.nix
+++ b/pkgs/by-name/li/libfido2/package.nix
@@ -16,12 +16,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfido2";
-  version = "1.16.0";
+  version = "1.17.0";
 
   # releases on https://developers.yubico.com/libfido2/Releases/ are signed
   src = fetchurl {
     url = "https://developers.yubico.com/libfido2/Releases/libfido2-${finalAttrs.version}.tar.gz";
-    hash = "sha256-jCtvsnm1tC6aySrecYMuSFhSZHtTYHxDuqr7vOzqBOQ=";
+    hash = "sha256-wQEsiHHXG2WHL9X/Gp1rCDilVoOgPoW6l0ec5XEpxzY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libfoundry/package.nix b/pkgs/by-name/li/libfoundry/package.nix
index 2b7f769773b4..81cab3fc6ec7 100644
--- a/pkgs/by-name/li/libfoundry/package.nix
+++ b/pkgs/by-name/li/libfoundry/package.nix
@@ -13,9 +13,12 @@
   gtk4,
   gtksourceview5,
   json-glib,
+  libadwaita,
   libdex,
   libgit2,
+  libpanel,
   libpeas2,
+  libsecret,
   libsoup_3,
   libspelling,
   libssh2,
@@ -25,6 +28,7 @@
   meson,
   ninja,
   pkg-config,
+  readline,
   template-glib,
   vte-gtk4,
   webkitgtk_6_0,
@@ -34,7 +38,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfoundry${lib.optionalString withGtk "-gtk"}";
-  version = "1.0.1";
+  version = "1.1.1";
 
   outputs = [
     "out"
@@ -44,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/foundry/${lib.versions.majorMinor finalAttrs.version}/foundry-${finalAttrs.version}.tar.xz";
-    hash = "sha256-wHaJBv6zTdWBmeKFRHOeohe714g+WPJPEjIphryJkzk=";
+    hash = "sha256-RtsNZENsMTYRyv37TKDVzsK5e+fXpfG+fujQFQ1PJcg=";
   };
 
   patches = [
@@ -64,12 +68,16 @@ stdenv.mkDerivation (finalAttrs: {
     editorconfig-core-c
     flatpak
     gom
+    libadwaita
     libgit2
+    libpanel
+    libsecret
     libsoup_3
     libssh2
     libsysprof-capture
     libxml2
     libyaml
+    readline
     template-glib
   ]
   ++ lib.optionals withGtk [
diff --git a/pkgs/by-name/li/libglycin-gtk4/package.nix b/pkgs/by-name/li/libglycin-gtk4/package.nix
index bc1b85315bd2..a7c2b7901ec1 100644
--- a/pkgs/by-name/li/libglycin-gtk4/package.nix
+++ b/pkgs/by-name/li/libglycin-gtk4/package.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
     teams = [ lib.teams.gnome ];
     platforms = lib.platforms.linux;
     pkgConfigModules = [
-      "glycin-gtk4-1"
+      "glycin-gtk4-2"
     ];
   };
 })
diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix
index 1e95b6ef3ade..b2eeab914a7f 100644
--- a/pkgs/by-name/li/libglycin/package.nix
+++ b/pkgs/by-name/li/libglycin/package.nix
@@ -31,7 +31,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libglycin";
-  version = "2.0.8";
+  version = "2.1.1";
 
   outputs = [
     "out"
@@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
-    hash = "sha256-a5rvT2Jr+Wnf0EtWO4PVIScaMMPW32pqhGP9VUkIkd8=";
+    hash = "sha256-jo6S4xKxTSxfOgR73FMFrcuZMe8BUM90v1JqN0Hm+zI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-k3eHWdEUPjKuWqNaEAYjAQKvYFgCnZ+5laYujqgGrpQ=";
+    hash = "sha256-BaIQs2be/W/dQFbO9KthJUWVE2vCT6H594geYJqzIzc=";
   };
 
   nativeBuildInputs = [
@@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
     teams = [ lib.teams.gnome ];
     platforms = lib.platforms.linux;
     pkgConfigModules = [
-      "glycin-1"
+      "glycin-2"
     ];
   };
 })
diff --git a/pkgs/by-name/li/libgnome-games-support_2_0/package.nix b/pkgs/by-name/li/libgnome-games-support_2_0/package.nix
deleted file mode 100644
index d2d1dc4b509a..000000000000
--- a/pkgs/by-name/li/libgnome-games-support_2_0/package.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  pkg-config,
-  glib,
-  gobject-introspection,
-  gtk4,
-  libgee,
-  gettext,
-  vala,
-  gnome,
-  libintl,
-  meson,
-  ninja,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libgnome-games-support";
-  version = "2.0.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "grvHTwj5i4M6m2REuEeeG9hN7QoHQl0Fe0XzjoeD5b0=";
-  };
-
-  nativeBuildInputs = [
-    gettext
-    gobject-introspection
-    meson
-    ninja
-    pkg-config
-    vala
-  ];
-
-  buildInputs = [
-    libintl
-  ];
-
-  propagatedBuildInputs = [
-    # Required by libgnome-games-support-2.pc
-    glib
-    gtk4
-    libgee
-  ];
-
-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "libgnome-games-support";
-      attrPath = "${pname}_2_0";
-      versionPolicy = "odd-unstable";
-    };
-  };
-
-  meta = {
-    description = "Small library intended for internal use by GNOME Games, but it may be used by others";
-    homepage = "https://gitlab.gnome.org/GNOME/libgnome-games-support";
-    license = lib.licenses.lgpl3Plus;
-    teams = [ lib.teams.gnome ];
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/by-name/li/libgweather/package.nix b/pkgs/by-name/li/libgweather/package.nix
index aba8c805fbe7..09b1c6a92035 100644
--- a/pkgs/by-name/li/libgweather/package.nix
+++ b/pkgs/by-name/li/libgweather/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPackages,
   fetchurl,
-  makeWrapper,
   meson,
   ninja,
   pkg-config,
@@ -11,10 +10,10 @@
   json-glib,
   glib,
   gettext,
+  gweather-locations,
   libsoup_3,
   gi-docgen,
   gobject-introspection,
-  python3,
   tzdata,
   geocode-glib_2,
   vala,
@@ -26,7 +25,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libgweather";
-  version = "4.4.4";
+  version = "4.6.0";
 
   outputs = [
     "out"
@@ -36,7 +35,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libgweather/${lib.versions.majorMinor version}/libgweather-${version}.tar.xz";
-    hash = "sha256-cBdnd1PN99H9w1Xkv82x66g2l5Oo3yTSQUJ6k5y/QoM=";
+    hash = "sha256-f10OjJaF7y/0bC86V8rkjXvzVAstg5IfiJ7yjmqHZ4g=";
   };
 
   patches = [
@@ -47,7 +46,6 @@ stdenv.mkDerivation rec {
   ];
 
   depsBuildBuild = [
-    makeWrapper
     pkg-config
   ];
 
@@ -57,7 +55,6 @@ stdenv.mkDerivation rec {
     pkg-config
     gettext
     glib
-    (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ]))
   ]
   ++ lib.optionals withIntrospection [
     gi-docgen
@@ -67,6 +64,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib
+    gweather-locations
     libsoup_3
     libxml2
     json-glib
@@ -82,10 +80,6 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    patchShebangs --build build-aux/meson/gen_locations_variant.py
-    wrapProgram $PWD/build-aux/meson/gen_locations_variant.py \
-      --prefix GI_TYPELIB_PATH : ${lib.getLib buildPackages.glib}/lib/girepository-1.0 \
-
     # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
     # it should be a build-time dep for build
     # TODO: send upstream
diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix
index f34f7d0f140d..bb80c5dc4b6a 100644
--- a/pkgs/by-name/li/libpanel/package.nix
+++ b/pkgs/by-name/li/libpanel/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpanel";
-  version = "1.10.3";
+  version = "1.10.4";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor finalAttrs.version}/libpanel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-QqAbr4uURA8ZTqg0KyRL1pkt+wJMoxYMlHf/SY7DorY=";
+    hash = "sha256-WTiIp2kfCviqpuGTyeFK+oaoEMDC8nUVxtgT8Yczsc0=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/libqmi/package.nix b/pkgs/by-name/li/libqmi/package.nix
index 9496dfd36be8..d0bd6bb1d99d 100644
--- a/pkgs/by-name/li/libqmi/package.nix
+++ b/pkgs/by-name/li/libqmi/package.nix
@@ -15,6 +15,7 @@
   mesonEmulatorHook,
   libgudev,
   bash-completion,
+  bashNonInteractive,
   libmbim,
   libqrtr-glib,
   buildPackages,
@@ -41,6 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-bJbNfnKVJuhy/6EJgu5b7t6vxNTex/5heTzMzTzVREw=";
   };
 
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
@@ -62,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     bash-completion
+    bashNonInteractive # otherwise $out/bin/qmi-network has impure #!/bin/sh shebang.
     libmbim
   ]
   ++ lib.optionals withIntrospection [
@@ -75,6 +81,8 @@ stdenv.mkDerivation (finalAttrs: {
     libqrtr-glib
   ];
 
+  strictDeps = true;
+
   mesonFlags = [
     "-Dudevdir=${placeholder "out"}/lib/udev"
     (lib.mesonBool "gtk_doc" withIntrospection)
diff --git a/pkgs/by-name/li/libraqm/package.nix b/pkgs/by-name/li/libraqm/package.nix
index 3baaf6aa3f80..3010acb5cde6 100644
--- a/pkgs/by-name/li/libraqm/package.nix
+++ b/pkgs/by-name/li/libraqm/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libraqm";
-  version = "0.10.4";
+  version = "0.10.5";
 
   src = fetchFromGitHub {
     owner = "HOST-Oman";
     repo = "libraqm";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-8tCMxhRhqbrpry4ktHYQc9eAH49W4Wo39TbIVgjVF5g=";
+    sha256 = "sha256-6STgs9//BQRu1TTxf+L6+Jj0Z7rkaBFodXzQVRyybE4=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix
index 7e51b324f817..7923d64d7e00 100644
--- a/pkgs/by-name/li/libraw/package.nix
+++ b/pkgs/by-name/li/libraw/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libraw";
-  version = "0.22.0";
+  version = "0.22.1";
 
   src = fetchFromGitHub {
     owner = "LibRaw";
     repo = "LibRaw";
     tag = finalAttrs.version;
-    hash = "sha256-B2+LcdC6FqKryiu8t0wBifrESTAyz/+wDQhcGj7myhE=";
+    hash = "sha256-1Q2u9v1yOzXchUGvZvbLKk506xATjMb421H2sBZURZs=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix
index 014d6110c64a..333015e1927c 100644
--- a/pkgs/by-name/li/librsvg/package.nix
+++ b/pkgs/by-name/li/librsvg/package.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "librsvg";
-  version = "2.61.4";
+  version = "2.62.1";
 
   outputs = [
     "out"
@@ -62,13 +62,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz";
-    hash = "sha256-/KDqKNHyj5XIQH0lefRwLawIXnx1hkTayotA0eByygw=";
+    hash = "sha256-tByoQgYkL93YJqK/djSNfN9SwQUMv6BguGboGiUhRcM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "librsvg-deps-${finalAttrs.version}";
-    hash = "sha256-ASmibD7l97kV3u+3V9TNex+qa975JdQXRQIHdsJF+Ds=";
+    hash = "sha256-Px7H2Z4ShCCuZNskuKj427lE9dvIc6xRo8R1S4fK+ZQ=";
     dontConfigure = true;
   };
 
diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix
index 42ba6c2c504c..0321a1e27dc2 100644
--- a/pkgs/by-name/li/libshumate/package.nix
+++ b/pkgs/by-name/li/libshumate/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   gi-docgen,
   meson,
   ninja,
@@ -24,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libshumate";
-  version = "1.5.3";
+  version = "1.6.1";
 
   outputs = [
     "out"
@@ -35,19 +34,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NfATslORhW4bXD1ECaXEpkDGzLX1KW/5gux77Tn1bUw=";
+    hash = "sha256-s2qtNFAHkXhfVGaE0PLtZE5IGf9Oha5noiRfFZ7MstQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      # Required for cross-compiled libshumate to get $dev/share/vala/vapi/shumate-1.0.{deps,vapi}
-      # https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/263
-      url = "https://gitlab.gnome.org/GNOME/libshumate/-/commit/8a8a5013ed69f443b84500b4f745079025863a32.patch";
-      name = "meson-use-find_program-instead-of-dependency-for-vapigen";
-      hash = "sha256-nYLUMLcghnWU/hlCWOHMmFIUdDa7UkX4TP7C4ftZVJM=";
-    })
-  ];
-
   depsBuildBuild = [
     # required to find native gi-docgen when cross compiling
     pkg-config
diff --git a/pkgs/by-name/li/libsodium/package.nix b/pkgs/by-name/li/libsodium/package.nix
index ca3294286cfb..7046a0a7d80d 100644
--- a/pkgs/by-name/li/libsodium/package.nix
+++ b/pkgs/by-name/li/libsodium/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsodium";
-  version = "1.0.21-unstable-2026-03-29";
+  version = "1.0.22-unstable-2026-04-09";
 
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = "libsodium";
-    rev = "d1d0bedbac5b415711a92bb4b881cea73f318c93";
-    hash = "sha256-AL41r5N80rUJYu852qdisTwMbaOQ1vAdB/2j82kGqT0=";
+    rev = "77e1ce5d6dee871c49ef211222ba18ef0c486bda";
+    hash = "sha256-k8u7iNqvjLA0PptbneDyE8zCtutJlV2LirrRb41tmBY=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libssh2/CVE-2026-7598.patch b/pkgs/by-name/li/libssh2/CVE-2026-7598.patch
new file mode 100644
index 000000000000..b35b0ed7b56d
--- /dev/null
+++ b/pkgs/by-name/li/libssh2/CVE-2026-7598.patch
@@ -0,0 +1,38 @@
+diff --git a/src/userauth.c b/src/userauth.c
+index f8e02651c4..43d9ab9b9d 100644
+--- a/src/userauth.c
++++ b/src/userauth.c
+@@ -80,6 +80,12 @@ static char *userauth_list(LIBSSH2_SESSION *session, const char *username,
+         memset(&session->userauth_list_packet_requirev_state, 0,
+                sizeof(session->userauth_list_packet_requirev_state));
+ 
++        if(username_len > UINT32_MAX - 27) {
++            _libssh2_error(session, LIBSSH2_ERROR_PROTO,
++                           "username_len out of bounds");
++            return NULL;
++        }
++
+         session->userauth_list_data_len = username_len + 27;
+ 
+         if(session->userauth_list_data) {
+@@ -316,6 +322,11 @@ userauth_password(LIBSSH2_SESSION *session,
+          * 40 = packet_type(1) + username_len(4) + service_len(4) +
+          * service(14)"ssh-connection" + method_len(4) + method(8)"password" +
+          * chgpwdbool(1) + password_len(4) */
++        if(username_len > UINT32_MAX - 40) {
++            return _libssh2_error(session, LIBSSH2_ERROR_PROTO,
++                                  "username_len out of bounds");
++        }
++
+         session->userauth_pswd_data_len = username_len + 40;
+ 
+         session->userauth_pswd_data0 =
+@@ -456,7 +467,7 @@ userauth_password(LIBSSH2_SESSION *session,
+                         }
+ 
+                         /* basic data_len + newpw_len(4) */
+-                        if(username_len + password_len + 44 <= UINT_MAX) {
++                        if(username_len <= UINT32_MAX - password_len - 44) {
+                             session->userauth_pswd_data_len =
+                                 username_len + password_len + 44;
+                             s = session->userauth_pswd_data =
diff --git a/pkgs/by-name/li/libssh2/package.nix b/pkgs/by-name/li/libssh2/package.nix
index ea0b34e491df..71ed533d7a74 100644
--- a/pkgs/by-name/li/libssh2/package.nix
+++ b/pkgs/by-name/li/libssh2/package.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-2ex2y+NNuY7sNTn+LImdJrDIN8s+tGalaw8QnKv2WPc=";
   };
 
+  patches = [
+    # https://github.com/libssh2/libssh2/commit/256d04b60d80bf1190e96b0ad1e91b2174d744b1
+    ./CVE-2026-7598.patch
+  ];
+
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
   # necessary for FreeBSD code path in configure
   postPatch = ''
diff --git a/pkgs/by-name/li/libxpm/package.nix b/pkgs/by-name/li/libxpm/package.nix
index 2fa6270c2155..09336f30f930 100644
--- a/pkgs/by-name/li/libxpm/package.nix
+++ b/pkgs/by-name/li/libxpm/package.nix
@@ -15,7 +15,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxpm";
-  version = "3.5.18";
+  version = "3.5.19";
 
   outputs = [
     "bin"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://xorg/individual/lib/libXpm-${finalAttrs.version}.tar.xz";
-    hash = "sha256-tO15v8cYAA7e6DfVUcNShvC4RXbbDOB7u+vmCkr/oeQ=";
+    hash = "sha256-rTV21okiGjncco8ODcAsp7tqDXJMmnf9G/oemvg76QA=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/lightsoff/package.nix b/pkgs/by-name/li/lightsoff/package.nix
index 077faeca7565..6a78861696b2 100644
--- a/pkgs/by-name/li/lightsoff/package.nix
+++ b/pkgs/by-name/li/lightsoff/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lightsoff";
-  version = "48.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/lightsoff-${version}.tar.xz";
-    hash = "sha256-LsmVAXE9vNE8WlZaLhGMxMwrUCg2s4enc2z7pAqLOYk=";
+    hash = "sha256-uqDBdDHoXu7eXmSfUxYvcLTrHnx6bxak7KowJ7ZTFXg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ll/llhttp/package.nix b/pkgs/by-name/ll/llhttp/package.nix
index eab40942b392..6f9115c07dc4 100644
--- a/pkgs/by-name/ll/llhttp/package.nix
+++ b/pkgs/by-name/ll/llhttp/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "llhttp";
-  version = "9.3.1";
+  version = "9.4.1";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "llhttp";
     tag = "release/v${finalAttrs.version}";
-    hash = "sha256-eHy8sjmfLA+q1WWuo4bkZ0wRI4q9fkNaW8c2OgKv/MM=";
+    hash = "sha256-eQoOsJ3lIIGSIfC4atkbUqCAYzCzs5kzTihYaI4jqz0=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix
index ce66abd31727..51702625ae46 100644
--- a/pkgs/by-name/lo/localsearch/package.nix
+++ b/pkgs/by-name/lo/localsearch/package.nix
@@ -8,7 +8,7 @@
   gettext,
   itstool,
   libxslt,
-  gexiv2,
+  gexiv2_0_16,
   tinysparql,
   meson,
   mesonEmulatorHook,
@@ -27,11 +27,8 @@
   icu,
   json-glib,
   libcue,
-  libexif,
   libgsf,
-  libgudev,
   libgxps,
-  libiptcdata,
   libjpeg,
   libosinfo,
   libpng,
@@ -40,6 +37,7 @@
   libuuid,
   libwebp,
   libxml2,
+  libzip,
   poppler,
   systemd,
   taglib,
@@ -50,11 +48,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "localsearch";
-  version = "3.10.2";
+  version = "3.11.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz";
-    hash = "sha256-tN2JyF12YXEButTsmjNnj2MexQMumIDrQj3OUuh4ooU=";
+    hash = "sha256-ezmmwoqKzysXLxWy+17nx6N2TER8L0oUyqI5t+vmGUI=";
   };
 
   patches = [
@@ -87,17 +85,14 @@ stdenv.mkDerivation (finalAttrs: {
     exempi
     ffmpeg
     giflib
-    gexiv2
+    gexiv2_0_16
     totem-pl-parser
     tinysparql
     icu
     json-glib
     libcue
-    libexif
     libgsf
-    libgudev
     libgxps
-    libiptcdata
     libjpeg
     libosinfo
     libpng
@@ -105,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     libuuid
     libwebp
     libxml2
+    libzip
     poppler
     taglib
   ]
diff --git a/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch b/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch
index a38e37fa222a..38e6b40a7d01 100644
--- a/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch
+++ b/pkgs/by-name/lo/localsearch/tracker-landlock-nix-store-permission.patch
@@ -1,15 +1,15 @@
 diff --git a/src/common/tracker-landlock.c b/src/common/tracker-landlock.c
-index f26791d73..f03e8ddb9 100644
+index a3f390585..3629107e7 100644
 --- a/src/common/tracker-landlock.c
 +++ b/src/common/tracker-landlock.c
-@@ -185,6 +185,10 @@ gboolean
- tracker_landlock_init (const gchar * const *indexed_folders)
- {
- 	TrackerLandlockRule stock_rules[] = {
+@@ -192,6 +192,10 @@ tracker_landlock_init (const gchar         *executable_name,
+ 		  (LANDLOCK_ACCESS_FS_EXECUTE |
+ 		   LANDLOCK_ACCESS_FS_READ_FILE |
+ 		   LANDLOCK_ACCESS_FS_READ_DIR) },
 +		{ "/nix/store",
-+		 (LANDLOCK_ACCESS_FS_EXECUTE |
-+		  LANDLOCK_ACCESS_FS_READ_FILE |
-+		  LANDLOCK_ACCESS_FS_READ_DIR) },
- 		/* Allow access to the executable itself */
- 		{ LIBEXECDIR "/localsearch-extractor-3",
- 		  LANDLOCK_ACCESS_FS_READ_FILE |
++		  (LANDLOCK_ACCESS_FS_EXECUTE |
++		   LANDLOCK_ACCESS_FS_READ_FILE |
++		   LANDLOCK_ACCESS_FS_READ_DIR) },
+ #if INTPTR_MAX == INT64_MAX
+ 		{ "/usr/lib64",
+ 		  (LANDLOCK_ACCESS_FS_EXECUTE |
diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix
index 25042aba5cc5..797d8b872811 100644
--- a/pkgs/by-name/lo/loupe/package.nix
+++ b/pkgs/by-name/lo/loupe/package.nix
@@ -25,17 +25,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "loupe";
-  version = "49.2";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz";
-    hash = "sha256-WFPnXM66f6K+oBvic80vCjBhlB573+OgCLIzFxBnFCw=";
+    hash = "sha256-euT7rl4ZMWqmQMVvgNxaeRRIpi3Y8P8G4ppYutgTqZQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "loupe-deps-${finalAttrs.version}";
-    hash = "sha256-9jEz6hcdFUv5Daeh/0co1hHt49bE9kFAbFvnyiEaGJg=";
+    hash = "sha256-I4z5qjX10AUuwk+JdX/1ZU0uCAVPQj8HkEc+n9aMczE=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index 8c08f6a0643f..4f7ef15b36c3 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "maturin";
-  version = "1.12.6";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NQ94RdQTQlRR5+2dC95cFNhwYliHmkD11JWyGt6BV6g=";
+    hash = "sha256-Y/TsAr0WgdD1f7T1unQcOU83nyU/xugPfBt1Xtq7rsQ=";
   };
 
-  cargoHash = "sha256-9VqS9wvQAsSYNhH7B9WlD6SZjXR4S2sYzYoNy6vbYBM=";
+  cargoHash = "sha256-pUSxvPWys9OyRb6sf4KhefHtcrbZEAKkuO3Lkl71yME=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix
index 016541daa23f..b3359fb64271 100644
--- a/pkgs/by-name/me/mealie/mealie-frontend.nix
+++ b/pkgs/by-name/me/mealie/mealie-frontend.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/frontend/yarn.lock";
-    hash = "sha256-aYgTdHrorLNBYVNwVyYSTfAqtvn1JB0FBAkoem0vNSU=";
+    hash = "sha256-F1dhdBHfT9N1Ejk7WLyz2BbKlTPfqqEDNi7ZTL3phWY=";
   };
 
   nativeBuildInputs = [
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
     runHook preBuild
 
     export NUXT_TELEMETRY_DISABLED=1
-    yarn --offline generate --env production
+    yarn --offline generate
     runHook postBuild
   '';
 
diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index 8200c4b38e1e..765822f5dfa9 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -12,12 +12,12 @@
 }:
 
 let
-  version = "3.12.0";
+  version = "3.16.0";
   src = fetchFromGitHub {
     owner = "mealie-recipes";
     repo = "mealie";
     tag = "v${version}";
-    hash = "sha256-HjXEoLrjmf4ZfBm6/7f5SJzH7nHSKiMOOMRVrYW0vKY=";
+    hash = "sha256-DUwLCe221MQb6AEYNxNDWXoaEdf9q/dNklOXJncnnJ4=";
   };
 
   frontend = callPackage (import ./mealie-frontend.nix src version) { };
@@ -54,6 +54,7 @@ pythonpkgs.buildPythonApplication rec {
       freezegun
       html2text
       httpx
+      httpx-curl-cffi
       ingredient-parser-nlp
       isodate
       itsdangerous
@@ -83,6 +84,7 @@ pythonpkgs.buildPythonApplication rec {
       typing-extensions
       tzdata
       uvicorn
+      yt-dlp
     ]
     ++ uvicorn.optional-dependencies.standard;
 
@@ -90,7 +92,7 @@ pythonpkgs.buildPythonApplication rec {
     rm -rf dev # Do not need dev scripts & code
 
     substituteInPlace pyproject.toml \
-     --replace-fail '"setuptools==82.0.0"' '"setuptools"'
+     --replace-fail '"setuptools==82.0.1"' '"setuptools"'
 
     substituteInPlace mealie/__init__.py \
       --replace-fail '__version__ = ' '__version__ = "v${version}" #'
diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix
index 4e744c42ecad..ed8ba80d66e5 100644
--- a/pkgs/by-name/mi/mimalloc/package.nix
+++ b/pkgs/by-name/mi/mimalloc/package.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mimalloc";
-  version = "3.3.0";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "mimalloc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xy9gPihw3xvhnd6BrCYfMnnRp5dPSodynKRToYwxuzg=";
+    hash = "sha256-GZ37qQVDe9jgMb4Coe5oKvgaLTspZDlSkS5rdy1MfUU=";
   };
 
   doCheck = !stdenv.hostPlatform.isStatic;
diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix
index d9fa43dc2963..b9ef0a724d9b 100644
--- a/pkgs/by-name/mi/misskey/package.nix
+++ b/pkgs/by-name/mi/misskey/package.nix
@@ -14,7 +14,6 @@
   jemalloc,
   ffmpeg-headless,
   writeShellScript,
-  xcbuild,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "misskey";
@@ -48,8 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm_9
     makeWrapper
     python3
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+  ];
 
   # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
   pnpmDeps = fetchPnpmDeps {
diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index 4ed4d51a81d7..f56610f03041 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -71,7 +71,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "49.4";
+  version = "50.1";
 
   outputs = [
     "out"
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    hash = "sha256-wWZuxQVhUwviXLiNk5wrzCrzTwHGO4sWuCuJLuM9eFU=";
+    hash = "sha256-k0RQLORz94h5Xya0X4uP9TwKNrhnRw1wWhGj7gkRAh4=";
   };
 
   mesonFlags = [
@@ -206,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
 
   passthru = {
-    libmutter_api_version = "17"; # bumped each dev cycle
+    libmutter_api_version = "18"; # bumped each dev cycle
     libdir = "${finalAttrs.finalPackage}/lib/mutter-${finalAttrs.passthru.libmutter_api_version}";
 
     tests = {
diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix
index 0a14b1c36fa7..d535f9081431 100644
--- a/pkgs/by-name/na/nautilus/package.nix
+++ b/pkgs/by-name/na/nautilus/package.nix
@@ -8,6 +8,7 @@
   gi-docgen,
   docbook-xsl-nons,
   gettext,
+  blueprint-compiler,
   desktop-file-utils,
   wayland-scanner,
   wrapGAppsHook4,
@@ -22,13 +23,15 @@
   shared-mime-info,
   libnotify,
   libexif,
+  libglycin,
+  libglycin-gtk4,
   libjxl,
   libseccomp,
   librsvg,
   webp-pixbuf-loader,
   tinysparql,
   localsearch,
-  gexiv2,
+  gexiv2_0_16,
   libselinux,
   libcloudproviders,
   gdk-pixbuf,
@@ -41,7 +44,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nautilus";
-  version = "49.4";
+  version = "50.1";
 
   outputs = [
     "out"
@@ -51,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
-    hash = "sha256-FHbZRZpjyF8OvBjyN7MtErAIrXhgAjdkJJGXJfUOdqg=";
+    hash = "sha256-1ieTuWWXcbZqa24FK1Iin4aN2+wTiKC2ae7wvSESEu4=";
   };
 
   patches = [
@@ -60,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    blueprint-compiler
     desktop-file-utils
     gettext
     gobject-introspection
@@ -73,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    gexiv2
+    gexiv2_0_16
     glib-networking
     icu
     gnome-desktop
@@ -94,6 +98,8 @@ stdenv.mkDerivation (finalAttrs: {
     tinysparql
     localsearch
     gnome-autoar
+    libglycin
+    libglycin-gtk4
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 83941c29a9d7..18559067c590 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -247,7 +247,7 @@ stdenv.mkDerivation (
     ''
     + lib.concatStrings (
       lib.mapAttrsToList (language: grammar: ''
-        ln -s \
+        ln -sf \
           ${grammar}/parser \
           $out/lib/nvim/parser/${language}.so
       '') finalAttrs.treesitter-parsers
diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix
index 0199728db924..209717165a3b 100644
--- a/pkgs/by-name/ng/nghttp2/package.nix
+++ b/pkgs/by-name/ng/nghttp2/package.nix
@@ -44,11 +44,11 @@ assert enableJemalloc -> enableApp;
 
 stdenv.mkDerivation rec {
   pname = "nghttp2";
-  version = "1.68.1";
+  version = "1.69.0";
 
   src = fetchurl {
     url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
-    hash = "sha256-t2G1PLZJFmV+qEQ3lz1Qj9Z16Wuy/rlZOh5D0ZWavpU=";
+    hash = "sha256-PxhfWxw+d4heuc8/LE2ksan3OiS/WVe4KRg60Tf4Lcg=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ns/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch b/pkgs/by-name/ns/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
index d7fec73910fb..fc2a83851f8d 100644
--- a/pkgs/by-name/ns/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
+++ b/pkgs/by-name/ns/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
@@ -1,20 +1,8 @@
-From e5cc8f7c387e3238ebb8239e2555c933a41502c0 Mon Sep 17 00:00:00 2001
-From: Graham Christensen <graham@grahamc.com>
-Date: Thu, 7 Mar 2019 08:11:32 -0500
-Subject: [PATCH] Makefile: use SOURCE_DATE_EPOCH for reproducibility
-
----
- nspr/lib/ds/Makefile.in        | 4 ++--
- nspr/lib/libc/src/Makefile.in  | 4 ++--
- nspr/lib/prstreams/Makefile.in | 4 ++--
- nspr/pr/src/Makefile.in        | 6 +++---
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
 diff --git a/nspr/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in
-index e737791..d56b0a7 100644
+index fa8c783..eff1ac3 100644
 --- a/nspr/lib/ds/Makefile.in
 +++ b/nspr/lib/ds/Makefile.in
-@@ -101,8 +101,8 @@ ECHO = echo
+@@ -91,8 +91,8 @@ ECHO = echo
  TINC = $(OBJDIR)/_pl_bld.h
  PROD = $(notdir $(SHARED_LIBRARY))
  NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
@@ -26,10 +14,10 @@ index e737791..d56b0a7 100644
  ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
  	SUF = i64
 diff --git a/nspr/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in
-index e8a6d9f..0485737 100644
+index 9ef2007..2d5db8f 100644
 --- a/nspr/lib/libc/src/Makefile.in
 +++ b/nspr/lib/libc/src/Makefile.in
-@@ -103,8 +103,8 @@ ECHO = echo
+@@ -93,8 +93,8 @@ ECHO = echo
  TINC = $(OBJDIR)/_pl_bld.h
  PROD = $(notdir $(SHARED_LIBRARY))
  NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
@@ -40,36 +28,12 @@ index e8a6d9f..0485737 100644
  
  ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
  	SUF = i64
-diff --git a/nspr/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in
-index aeb2944..83ae423 100644
---- a/nspr/lib/prstreams/Makefile.in
-+++ b/nspr/lib/prstreams/Makefile.in
-@@ -105,8 +105,8 @@ ECHO = echo
- TINC = $(OBJDIR)/_pl_bld.h
- PROD = $(notdir $(SHARED_LIBRARY))
- NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
--SH_DATE = $(shell date "+%Y-%m-%d %T")
--SH_NOW = $(shell $(NOW))
-+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
-+SH_NOW = $(SOURCE_DATE_EPOCH)000000
- 
- ifeq ($(OS_ARCH), WINNT)
- 	SUF = i64
 diff --git a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
-index 19c5a69..989cc8c 100644
+index a9e86f5..854c0a9 100644
 --- a/nspr/pr/src/Makefile.in
 +++ b/nspr/pr/src/Makefile.in
-@@ -46,7 +46,7 @@ MKSHLIB += -M $(MAPFILE)
- endif
- #
- # In Solaris 2.6 or earlier, -lrt is called -lposix4.
--# 
-+#
- LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE)))
- ifeq (5.7, $(LIBRT_TEST))
- LIBRT=-lrt
-@@ -311,8 +311,8 @@ PROD = $(notdir $(SHARED_LIBRARY))
- endif
+@@ -276,8 +276,8 @@ TINC = $(OBJDIR)/_pr_bld.h
+ PROD = $(notdir $(SHARED_LIBRARY))
  
  NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
 -SH_DATE = $(shell date "+%Y-%m-%d %T")
@@ -79,6 +43,3 @@ index 19c5a69..989cc8c 100644
  
  ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
  	SUF = i64
--- 
-2.19.2
-
diff --git a/pkgs/by-name/ns/nspr/package.nix b/pkgs/by-name/ns/nspr/package.nix
index 570e63c71779..372a7b3f067f 100644
--- a/pkgs/by-name/ns/nspr/package.nix
+++ b/pkgs/by-name/ns/nspr/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nspr";
-  version = "4.38.2";
+  version = "4.39";
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${finalAttrs.version}/src/nspr-${finalAttrs.version}.tar.gz";
-    hash = "sha256-5Akvrqt3vcmzLbERPkIVlI7naOJsRmbbO1pgs18skQU=";
+    hash = "sha256-u9Au6HpVZ2Bjpj5byBngIn3iZmtHMHsqATRBTN9CNo4=";
   };
 
   patches = [
diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch
index 8cb8d9406307..1268f032d576 100644
--- a/pkgs/by-name/or/orca/fix-paths.patch
+++ b/pkgs/by-name/or/orca/fix-paths.patch
@@ -1,8 +1,8 @@
 diff --git a/src/orca/ax_utilities_application.py b/src/orca/ax_utilities_application.py
-index dbaca2e48..80f2640d4 100644
+index 218c7bf22..4474f26cd 100644
 --- a/src/orca/ax_utilities_application.py
 +++ b/src/orca/ax_utilities_application.py
-@@ -188,7 +188,7 @@ class AXUtilitiesApplication:
+@@ -180,7 +180,7 @@ class AXUtilitiesApplication:
  
          pid = AXUtilitiesApplication.get_process_id(app)
          try:
@@ -12,10 +12,10 @@ index dbaca2e48..80f2640d4 100644
          except (GLib.GError, IndexError) as error:
              tokens = [f"AXUtilitiesApplication: Exception checking state of pid {pid}: {error}"]
 diff --git a/src/orca/debugging_tools_manager.py b/src/orca/debugging_tools_manager.py
-index b4abce719..cff5a78a6 100644
+index 5c607f3cd..18ddcd920 100644
 --- a/src/orca/debugging_tools_manager.py
 +++ b/src/orca/debugging_tools_manager.py
-@@ -243,7 +243,7 @@ class DebuggingToolsManager:
+@@ -169,7 +169,7 @@ class DebuggingToolsManager:
              else:
                  name = AXObject.get_name(app) or "[DEAD]"
              try:
@@ -25,10 +25,10 @@ index b4abce719..cff5a78a6 100644
                  cmdline = f"EXCEPTION: {error}"
              else:
 diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
-index 3fc845dc3..a82947911 100755
+index 86a1413ca..f272c431d 100755
 --- a/src/orca/orca_bin.py.in
 +++ b/src/orca/orca_bin.py.in
-@@ -238,7 +238,7 @@ def in_graphical_desktop() -> bool:
+@@ -211,7 +211,7 @@ def in_graphical_desktop() -> bool:
  def other_orcas() -> list[int]:
      """Returns the pid of any other instances of Orca owned by this user."""
  
@@ -38,33 +38,33 @@ index 3fc845dc3..a82947911 100755
                            stdout=subprocess.PIPE) as proc:
          pids = proc.stdout.read() if proc.stdout else b""
 diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py
-index 098b0a033..e7b040d82 100644
+index d1d95f5b9..e57993521 100644
 --- a/src/orca/orca_modifier_manager.py
 +++ b/src/orca/orca_modifier_manager.py
-@@ -236,7 +236,7 @@ class OrcaModifierManager:
-             return
+@@ -289,7 +289,7 @@ class OrcaModifierManager:
  
-         self.unset_orca_modifiers(reason)
--        with subprocess.Popen(["xkbcomp", display, "-"],
-+        with subprocess.Popen(["@xkbcomp@", display, "-"],
-                               stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) as p:
-             self._original_xmodmap, _ = p.communicate()
-         self._create_orca_xmodmap()
-@@ -274,7 +274,7 @@ class OrcaModifierManager:
-             return
+         self._restore_original_xkbcomp()
+         with subprocess.Popen(
+-            ["xkbcomp", display, "-"],
++            ["@xkbcomp@", display, "-"],
+             stdout=subprocess.PIPE,
+             stderr=subprocess.DEVNULL,
+         ) as p:
+@@ -338,7 +338,7 @@ class OrcaModifierManager:
  
          self._caps_lock_cleared = False
--        with subprocess.Popen(["xkbcomp", "-w0", "-", display],
-+        with subprocess.Popen(["@xkbcomp@", "-w0", "-", display],
-                               stdin=subprocess.PIPE, stdout=None, stderr=None) as p:
-             p.communicate(self._original_xmodmap)
+         with subprocess.Popen(
+-            ["xkbcomp", "-w0", "-", display],
++            ["@xkbcomp@", "-w0", "-", display],
+             stdin=subprocess.PIPE,
+             stdout=None,
+             stderr=None,
+@@ -449,7 +449,7 @@ class OrcaModifierManager:
+         debug.print_message(debug.LEVEL_INFO, msg, True)
  
-@@ -349,7 +349,7 @@ class OrcaModifierManager:
-             debug.print_message(debug.LEVEL_INFO, msg, True)
- 
- 
--            with subprocess.Popen(["xkbcomp", "-w0", "-", display],
-+            with subprocess.Popen(["@xkbcomp@", "-w0", "-", display],
-                               stdin=subprocess.PIPE, stdout=None, stderr=None) as p:
-                 p.communicate(bytes('\n'.join(lines), 'UTF-8'))
-         else:
+         with subprocess.Popen(
+-            ["xkbcomp", "-w0", "-", display],
++            ["@xkbcomp@", "-w0", "-", display],
+             stdin=subprocess.PIPE,
+             stdout=None,
+             stderr=None,
diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix
index 4ea7b108e4b7..6cb77c9b2ed0 100644
--- a/pkgs/by-name/or/orca/package.nix
+++ b/pkgs/by-name/or/orca/package.nix
@@ -31,13 +31,13 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "orca";
-  version = "49.5";
+  version = "50.1.2";
 
   pyproject = false;
 
   src = fetchurl {
     url = "mirror://gnome/sources/orca/${lib.versions.major finalAttrs.version}/orca-${finalAttrs.version}.tar.xz";
-    hash = "sha256-U99BVYMZ6XwehK1gSYmVegK10P9TFBkZDwWH6mslYDQ=";
+    hash = "sha256-hZK1PfhCOep13aqN7GeSyE0rmft7R6X9kCLGr4ymV6g=";
   };
 
   patches = [
diff --git a/pkgs/by-name/pa/pango/package.nix b/pkgs/by-name/pa/pango/package.nix
index 964396c84070..e05febccd593 100644
--- a/pkgs/by-name/pa/pango/package.nix
+++ b/pkgs/by-name/pa/pango/package.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pango";
-  version = "1.57.0";
+  version = "1.57.1";
 
   outputs = [
     "bin"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${lib.versions.majorMinor finalAttrs.version}/pango-${finalAttrs.version}.tar.xz";
-    hash = "sha256-iQZAyEHa530649j+iVN4S5MPokGxdCPmEgx7/fi4kec=";
+    hash = "sha256-5l1tEXCA3Drut9i0s7UY9zg6oubPziMRfGI81iR2TC8=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix
index 008a1dee3343..c1a16e039543 100644
--- a/pkgs/by-name/pa/papers/package.nix
+++ b/pkgs/by-name/pa/papers/package.nix
@@ -41,7 +41,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "papers";
-  version = "49.4";
+  version = "50.0";
 
   outputs = [
     "out"
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
-    hash = "sha256-XjBTXnNCHc0xQkCrsg4leToFOlzWWG6tCMNQx7jm+HE=";
+    hash = "sha256-MBsg60a8ZNbKcuo3F10o2orqT4YT5HG5TDGF5cTRvAU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
       pname
       version
       ;
-    hash = "sha256-aOVPknBqBV7AWO9LxvWRjiL2H2UQHAcpGpKY5YeoQrc=";
+    hash = "sha256-6Fd6V0Ksl8jqoM1znyYI0Mve2QQU+JBf3yn2C2Bcda8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pc/pciutils/package.nix b/pkgs/by-name/pc/pciutils/package.nix
index 24363a4c5de0..677de775ef95 100644
--- a/pkgs/by-name/pc/pciutils/package.nix
+++ b/pkgs/by-name/pc/pciutils/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pciutils";
-  version = "3.14.0"; # with release-date database
+  version = "3.15.0"; # with release-date database
 
   src = fetchFromGitHub {
     owner = "pciutils";
     repo = "pciutils";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8wSvu8BGzETD1RfwL6/DfSCZcmuj1I+zNH033f48qNQ=";
+    hash = "sha256-fPtOhUz8Hlo0ajCZbNOwT4fiuL8HlFQ7NGk+nQpmKZM=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/pi/pipewire/package.nix b/pkgs/by-name/pi/pipewire/package.nix
index 0bfd934ecb21..5e21e940befc 100644
--- a/pkgs/by-name/pi/pipewire/package.nix
+++ b/pkgs/by-name/pi/pipewire/package.nix
@@ -4,6 +4,7 @@
   testers,
   buildPackages,
   fetchFromGitLab,
+  fetchpatch,
   python3,
   meson,
   ninja,
@@ -89,7 +90,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipewire";
-  version = "1.6.3";
+  version = "1.6.4";
 
   outputs = [
     "out"
@@ -105,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     tag = finalAttrs.version;
-    hash = "sha256-zD0PYtZsiU+tZUpVBKofjGVQyO/68eIZP7DqBQHUGJk=";
+    hash = "sha256-iBOs8f2d/MlDMzqY/a1TvEscO9MDkQ61//PwEQV0XAk=";
   };
 
   patches = [
@@ -113,10 +114,17 @@ stdenv.mkDerivation (finalAttrs: {
     ./0060-libjack-path.patch
     # Move installed tests into their own output.
     ./0070-installed-tests-path.patch
+
+    (fetchpatch {
+      name = "musl.patch";
+      url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/49ce385c44f4c2882ef0aeac0312e6ae9bc85f8a.patch";
+      hash = "sha256-u8DLe6smodalVn3GwhI9RaDZTw4qZs8+Ylg9lxunMF0=";
+    })
   ];
 
   strictDeps = true;
   __structuredAttrs = true;
+  separateDebugInfo = true;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix
index ffd367f6159e..e62928863aac 100644
--- a/pkgs/by-name/ps/psqlodbc/package.nix
+++ b/pkgs/by-name/ps/psqlodbc/package.nix
@@ -18,13 +18,13 @@ assert lib.xor withLibiodbc withUnixODBC;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "psqlodbc";
-  version = "17.00.0008";
+  version = "18.00.0001";
 
   src = fetchFromGitHub {
     owner = "postgresql-interfaces";
     repo = "psqlodbc";
     tag = "REL-${lib.replaceString "." "_" finalAttrs.version}";
-    hash = "sha256-eYt4RwnYfSHz2nGBW94Gkdt3E+j6eS1Ky2KPol3cLkI=";
+    hash = "sha256-gCacZjP0FkCEuZRBfawZ2B3BcjR/sV1fypuT8XD2l+A=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix
index d58330cf8ca7..bdf170628a38 100644
--- a/pkgs/by-name/qu/quadrapassel/package.nix
+++ b/pkgs/by-name/qu/quadrapassel/package.nix
@@ -5,12 +5,10 @@
   pkg-config,
   gtk4,
   libadwaita,
-  libgee,
   pango,
   gnome,
   gdk-pixbuf,
   librsvg,
-  gsound,
   libmanette,
   blueprint-compiler,
   wrapGAppsHook4,
@@ -18,15 +16,17 @@
   ninja,
   vala,
   desktop-file-utils,
+  libsndfile,
+  openal,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quadrapassel";
-  version = "49.2.3";
+  version = "50.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+ecxK/oPg1pOC/U181ax6VNxlIQ+Xe/1YR9z3C3b85k=";
+    hash = "sha256-UeQ9BZ8GuJwQXVPXHe8L2XzpREcO4Tn8fnQ/zkpsOZQ=";
   };
 
   nativeBuildInputs = [
@@ -42,12 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtk4
     libadwaita
-    libgee
     pango
     gdk-pixbuf
     librsvg
     libmanette
-    gsound
+    # for libgnome-games-support + sound feature
+    libsndfile
+    openal
   ];
 
   passthru = {
diff --git a/pkgs/by-name/rh/rhythmbox/package.nix b/pkgs/by-name/rh/rhythmbox/package.nix
index dbae3916a973..f0c4d30bbed3 100644
--- a/pkgs/by-name/rh/rhythmbox/package.nix
+++ b/pkgs/by-name/rh/rhythmbox/package.nix
@@ -46,12 +46,6 @@ stdenv.mkDerivation rec {
     sha256 = "5CKRoY33oh/+azUr9z8F1+KYu04FvOWWf5jujO5ECPE=";
   };
 
-  postPatch = ''
-    # We backported girepository-2.0 support to libpeas 1.36
-    substituteInPlace meson.build \
-      --replace-fail "and libpeas.version() > '1.36'" ""
-  '';
-
   nativeBuildInputs = [
     pkg-config
     meson
diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix
index 4b60b11eecc4..401f1191aeff 100644
--- a/pkgs/by-name/sd/SDL2_image/package.nix
+++ b/pkgs/by-name/sd/SDL2_image/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL2_image";
-  version = "2.8.8";
+  version = "2.8.12";
 
   src = fetchurl {
     url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${finalAttrs.version}.tar.gz";
-    hash = "sha256-IhO1b9r/IiDQ44yOQgy+GoPIc3QZDLqMcK8hVgl84wo=";
+    hash = "sha256-OT9e+1BTbsE8pPSv+2nMmWbTw/lp5sXnAfrd+fl4U4E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index f68091696bc5..6a0d2b700357 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -30,13 +30,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl2-compat";
-  version = "2.32.66";
+  version = "2.32.68";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl2-compat";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-ZK5VXTHGo42ORWsgarNr44kv2c3B/cYuj/BYLTAdWtE=";
+    hash = "sha256-66AHlsl53q9efRqZOzI4JiUbaGByrSMoQFj3K7udTsQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index d9cd79bf5dc9..033f865c4708 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -70,7 +70,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3";
-  version = "3.4.2";
+  version = "3.4.8";
 
   outputs = [
     "lib"
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libsdl-org";
     repo = "SDL";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-ev0QiKyj0O6gtk7cK/V0X5Noft0Zo/fMS+oM6emwynE=";
+    hash = "sha256-uBGyGxrUVx642Ku8qhR2sTy2JagcSioIhh/5RsXVAIM=";
   };
 
   postPatch =
diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix
index 280b2e58a8cc..d44b9a041d0a 100644
--- a/pkgs/by-name/sh/showtime/package.nix
+++ b/pkgs/by-name/sh/showtime/package.nix
@@ -19,12 +19,12 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "showtime";
-  version = "49.1";
+  version = "50.0";
   pyproject = false;
 
   src = fetchurl {
     url = "mirror://gnome/sources/showtime/${lib.versions.major finalAttrs.version}/showtime-${finalAttrs.version}.tar.xz";
-    hash = "sha256-iu+7DiAJx6HNRKuAGwbKN19+loPwKaBS64b7Qzp4U5M=";
+    hash = "sha256-Q5nJ+n9h5ZhCQuJ5rNFRm+7CRrmKZ21EpLKrlOnuywE=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index 32af118891ac..3d3cf9db041e 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -11,20 +11,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "8.1.0";
+  version = "9.0.0";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8a1J30guKz3ztZf5DGOaL7ZGVB0GpT5gtR1ZaAC4ucE=";
+    hash = "sha256-psMMF26+nTwdbtPfFFE3fXkatrh9Bp9qMsrdI/FmrDg=";
   };
 
-  # Fix build on darwin
-  postPatch = ''
-    substituteInPlace tools/CMakeLists.txt --replace "-Wl,--gc-sections" ""
-  '';
-
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
   ];
diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix
index 1a21766547ee..de156aebd739 100644
--- a/pkgs/by-name/si/simple-scan/package.nix
+++ b/pkgs/by-name/si/simple-scan/package.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simple-scan";
-  version = "49.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/simple-scan/${lib.versions.major finalAttrs.version}/simple-scan-${finalAttrs.version}.tar.xz";
-    hash = "sha256-mujUFR7K+VhF65+ZtDbVecg48s8Cdj+6O8A3gCUb4zQ=";
+    hash = "sha256-zDK1Ya4icYLTGpRGZjLjEXI3VuOskFOMPH4qLJqqSgk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix
index 449fe3e4e350..3453c0fca4eb 100644
--- a/pkgs/by-name/sn/snapshot/package.nix
+++ b/pkgs/by-name/sn/snapshot/package.nix
@@ -3,6 +3,7 @@
   lib,
   fetchurl,
   libglycin,
+  libglycin-gtk4,
   glycin-loaders,
   cargo,
   desktop-file-utils,
@@ -25,11 +26,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snapshot";
-  version = "49.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NVj2+ODTiylQtrrZue7COCSb7f7c5w+1iijK1pRebOk=";
+    hash = "sha256-7J2vmIPrkDMJEbtR5rae7YydvdVDjoZK3JDuVaX+nu0=";
   };
 
   cargoVendorDir = "vendor";
@@ -37,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cargo
     desktop-file-utils
-    libglycin.patchVendorHook
     meson
     ninja
     pkg-config
@@ -48,7 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     glib
+    libglycin
     libglycin.setupHook
+    libglycin-gtk4
     glycin-loaders
     gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-base
@@ -65,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src/meson.build --replace-fail \
-      "'src' / rust_target / meson.project_name()" \
-      "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
+      "'cp', cargo_target / rust_target / meson.project_name()" \
+      "'cp', cargo_target / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
   '';
 
   preFixup = ''
diff --git a/pkgs/by-name/su/sushi/package.nix b/pkgs/by-name/su/sushi/package.nix
index 7fbd1f4d407d..6bb8f31e72ed 100644
--- a/pkgs/by-name/su/sushi/package.nix
+++ b/pkgs/by-name/su/sushi/package.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sushi";
-  version = "46.0";
+  version = "50.rc.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/sushi/${lib.versions.major finalAttrs.version}/sushi-${finalAttrs.version}.tar.xz";
-    hash = "sha256-lghbqqQwqyFCxgaqtcR+L7sv0+two1ITfmXFmlig8sY=";
+    hash = "sha256-l6efnH4IsLF2Am7Ux6BDXwYSxMENoz1H4rr6ucYpImM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sw/swell-foop/package.nix b/pkgs/by-name/sw/swell-foop/package.nix
index 5d5d8cc70f1e..72cdc99b9429 100644
--- a/pkgs/by-name/sw/swell-foop/package.nix
+++ b/pkgs/by-name/sw/swell-foop/package.nix
@@ -10,7 +10,6 @@
   gtk4,
   libadwaita,
   libgee,
-  libgnome-games-support_2_0,
   pango,
   gnome,
   desktop-file-utils,
@@ -23,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "swell-foop";
-  version = "48.1";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/swell-foop/${lib.versions.major finalAttrs.version}/swell-foop-${finalAttrs.version}.tar.xz";
-    hash = "sha256-W5Ywh4/nAa7nUe1G/3ZcK82fgVpOVYJnajwmsxGCAxs=";
+    hash = "sha256-lrJDAj4NSmb5hrwpaLDwuGYY4VpV+X6D/mqwCefngus=";
   };
 
   nativeBuildInputs = [
@@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
     gtk4
     libadwaita
     libgee
-    libgnome-games-support_2_0
     pango
   ];
 
diff --git a/pkgs/by-name/te/template-glib/package.nix b/pkgs/by-name/te/template-glib/package.nix
index ca2f39059656..a664b37b754e 100644
--- a/pkgs/by-name/te/template-glib/package.nix
+++ b/pkgs/by-name/te/template-glib/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "template-glib";
-  version = "3.38.0";
+  version = "3.40.0";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor finalAttrs.version}/template-glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-QNANwiPc8ut/LsQi997FpnNzoMoRAavKD0nGLwUMsxI=";
+    hash = "sha256-5TPsL2wkzG32asVayCT63RtKX0M6EcvzprJYFcDPz9U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix
index 88d9f88f13f3..25e5d9aaa0f0 100644
--- a/pkgs/by-name/ti/tinysparql/package.nix
+++ b/pkgs/by-name/ti/tinysparql/package.nix
@@ -34,7 +34,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tinysparql";
-  version = "3.10.1";
+  version = "3.11.1";
 
   outputs = [
     "out"
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     url =
       with finalAttrs;
       "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz";
-    hash = "sha256-Wn8+eJ22ZxpVDtYoDtT2CmC+p3No2pK+aNx9jX4jAmU=";
+    hash = "sha256-z9RgIe4VFK1DXnFPeqHsenh8f1FqlPTHQ4iX7j1uyh4=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/to/totem-pl-parser/package.nix b/pkgs/by-name/to/totem-pl-parser/package.nix
index d2b93c95e5c6..beec96d34af0 100644
--- a/pkgs/by-name/to/totem-pl-parser/package.nix
+++ b/pkgs/by-name/to/totem-pl-parser/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "totem-pl-parser";
-  version = "3.26.6";
+  version = "3.26.7";
 
   src = fetchurl {
     url = "mirror://gnome/sources/totem-pl-parser/${lib.versions.majorMinor version}/totem-pl-parser-${version}.tar.xz";
-    sha256 = "wN8PaNXPnX2kPIHH8T8RFYNYNo+Ywi1Hci870EvTrBw=";
+    sha256 = "YNUXwayr5UrjN/ZEUSZPx2cwaW6q4mtUgPs3FmaJtfM=";
   };
 
   patches = [
diff --git a/pkgs/by-name/tz/tzdata/package.nix b/pkgs/by-name/tz/tzdata/package.nix
index ea9457183064..ad04029c4b80 100644
--- a/pkgs/by-name/tz/tzdata/package.nix
+++ b/pkgs/by-name/tz/tzdata/package.nix
@@ -8,16 +8,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tzdata";
-  version = "2026a";
+  version = "2026b";
 
   srcs = [
     (fetchurl {
       url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz";
-      hash = "sha256-d7VBclk3u1O9kr1ITAtDvshUXi00Me4B8E748iA7orc=";
+      hash = "sha256-EUVD2fGaa/61vKQ2hq6hc9OHVaPbHy7sESZHrpLG9UQ=";
     })
     (fetchurl {
       url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz";
-      hash = "sha256-+AoXou3dK1QEH5yY11sKqAOLAW18XecokqFG2ZOHQOE=";
+      hash = "sha256-N+nthCf101IcIvxY4pPL+wQ9cO7fEAOHCzPzY/Yco0Q=";
     })
   ];
 
diff --git a/pkgs/by-name/uc/ucx/package.nix b/pkgs/by-name/uc/ucx/package.nix
index a85fffb2df78..2ca0ff0ca69f 100644
--- a/pkgs/by-name/uc/ucx/package.nix
+++ b/pkgs/by-name/uc/ucx/package.nix
@@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   pname = "ucx";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchFromGitHub {
     owner = "openucx";
     repo = "ucx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-G0Qt2FsCETwDPrvDtEwB/hzNDDr2wkD3RzzQylSvgYs=";
+    hash = "sha256-CD8a7CoKAj5DuRa9C+Eef54qGcH3F0uNBXRlO0hneI4=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 2cb8ab3ac1bd..45cdc57ff0a8 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -57,13 +57,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unbound";
-  version = "1.24.2";
+  version = "1.25.0";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = "unbound";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-kyTcDmNGKJuOMZ7cxIWh6o7aasRUoAB4M0tIG81BQsE=";
+    hash = "sha256-BAqGNi5lfYYTQd7CPH0lssLc5/AkeuKSVEFcrF/cNyc=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ut/util-linux/fix-musl-nsenter.patch b/pkgs/by-name/ut/util-linux/fix-musl-nsenter.patch
deleted file mode 100644
index 73a201bd5b4c..000000000000
--- a/pkgs/by-name/ut/util-linux/fix-musl-nsenter.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 126c850f74cbafd3af55a6f829308d7f63de4c7b Mon Sep 17 00:00:00 2001
-From: Aleksi Hannula <ahannula4+nixgit@gmail.com>
-Date: Tue, 7 Apr 2026 14:52:16 +0300
-Subject: [PATCH] nsenter: Fix AT_HANDLE_FID on musl
-
----
- sys-utils/nsenter.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
-index e10ba9c..340e6b1 100644
---- a/sys-utils/nsenter.c
-+++ b/sys-utils/nsenter.c
-@@ -220,7 +220,7 @@ static int fill_nsfs_file_handle(struct file_handle *fh, uint64_t ns_id)
- 
- 	fh->handle_bytes = sizeof(struct nsfs_file_handle);
- 	if (name_to_handle_at(nsfs_fd, "", fh, &mount_id,
--			      AT_EMPTY_PATH | AT_HANDLE_FID) == -1)
-+			      AT_EMPTY_PATH | 0x200 /* AT_HANDLE_FID */) == -1)
- 		return -errno;
- 	assert(fh->handle_type);
- 	nsfs_fh_tmpl = *fh;
--- 
-2.51.2
-
diff --git a/pkgs/by-name/ut/util-linux/include-correct-struct-statfs-header.patch b/pkgs/by-name/ut/util-linux/include-correct-struct-statfs-header.patch
deleted file mode 100644
index 6787ef311abf..000000000000
--- a/pkgs/by-name/ut/util-linux/include-correct-struct-statfs-header.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 145b6a66dcc725de3c3161db62db7047eb407214 Mon Sep 17 00:00:00 2001
-From: Morgan Jones <me@numin.it>
-Date: Sun, 5 Apr 2026 18:03:54 -0700
-Subject: [PATCH] pidfd-utils: include correct struct statfs header for darwin
-
-Fixes the build on Darwin since struct statfs is in sys/mount.h
-and sys/vfs.h doesn't even exist. Just conditionally include all the
-headers.
----
- include/statfs_magic.h | 16 ++++++++++++++++
- lib/pidfd-utils.c      |  3 ---
- 2 files changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/include/statfs_magic.h b/include/statfs_magic.h
-index 6921abaa4..28977f392 100644
---- a/include/statfs_magic.h
-+++ b/include/statfs_magic.h
-@@ -5,10 +5,26 @@
- #ifndef UTIL_LINUX_STATFS_MAGIC_H
- #define UTIL_LINUX_STATFS_MAGIC_H
- 
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+
-+#ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+
- #ifdef HAVE_SYS_STATFS_H
- # include <sys/statfs.h>
- #endif
- 
-+#ifdef HAVE_SYS_VFS_H
-+# include <sys/vfs.h>
-+#endif
-+
-+#ifdef HAVE_SYS_MOUNT_H
-+# include <sys/mount.h>
-+#endif
-+
- /*
-  * If possible then don't depend on internal libc __SWORD_TYPE type.
-  */
-diff --git a/lib/pidfd-utils.c b/lib/pidfd-utils.c
-index a83735920..f7c649144 100644
---- a/lib/pidfd-utils.c
-+++ b/lib/pidfd-utils.c
-@@ -5,9 +5,6 @@
-  * Authors: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu> [2025]
-  */
- #include <stdlib.h>
--#include <sys/stat.h>
--#include <sys/vfs.h>
--#include <sys/types.h>
- #include <errno.h>
- #include <err.h>
- 
--- 
-2.50.1
-
diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index c543091bf426..0c9c7542a23c 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -50,6 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-NFKyYLuqd11udJrDuyIRF4UAP8H0RJcAJcjaJt+nWOk=";
   };
 
+  # Note: fetchpatch/fetchpatch2 cause infinite recursion with util-linuxMinimal.
+  # Prefer fetchurl for the below instead of vendoring patches; it will work.
   patches = [
     # Search $PATH for the shutdown binary instead of hard-coding /sbin/shutdown,
     # which isn't valid on NixOS (and a compatibility link on most other modern
@@ -58,12 +60,35 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Fix compile of 2.42+ on Darwin.
     # https://lore.kernel.org/util-linux/CAEUYr6ZjVX1bd-xcBGtFN_ZYwQnXDYsw7d1-7sTpF2BbgfrR+g@mail.gmail.com/T/#u
-    ./include-correct-struct-statfs-header.patch
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isMusl [
-    # Musl does not define AT_HANDLE_FID, hard-code it.
+    # Different fix than originally proposed; we just don't compile that file on Darwin now and the previous patch was able to be reverted.
+    # See: https://github.com/util-linux/util-linux/commit/6ccf20d2fd8e45eed70bd1b915c0d16f646bf133
+    (fetchurl {
+      name = "pidfd-utils-linux-only.patch";
+      url = "https://github.com/util-linux/util-linux/commit/afdade4a3d8e4e6070343c5576470c575719b81f.patch";
+      hash = "sha256-EnHsIhU6jaS4Qm+kQMP2an7Ay08nKbIO0MbU7Y2pwkU=";
+    })
+
+    # Musl does not define AT_HANDLE_FID, hard-code it if left undefined.
     # https://github.com/util-linux/util-linux/pull/4203
-    ./fix-musl-nsenter.patch
+    (fetchurl {
+      name = "fix-musl-nsenter.patch";
+      url = "https://github.com/util-linux/util-linux/commit/000aff333e5c3a23967280cb0d6451fbbfc9c91b.patch";
+      hash = "sha256-6K3jRr2RsAfHnweBOlMn2F0h8hD3xjZobJ1pSlCQHw8=";
+    })
+
+    # `script` is broken with options after non-option args and has new memory leaks
+    # https://lore.kernel.org/util-linux/adi3573O-5gr9m2q@per.namespace.at/T/#t
+    # https://github.com/util-linux/util-linux/pull/4201
+    (fetchurl {
+      name = "script-fix-backwards-compat.patch";
+      url = "https://github.com/util-linux/util-linux/commit/70507ab9eaed10b8dd77b77d4ea25c11ee726bed.patch";
+      hash = "sha256-PpFtv8XOK36npCVSvdgKcxGQmkJtgdyMmlN+4yQuWS8=";
+    })
+    (fetchurl {
+      name = "script-fix-memory-leaks.patch";
+      url = "https://github.com/util-linux/util-linux/commit/2f1c12a49500ca7ed9c3d5e80664c1622925456b.patch";
+      hash = "sha256-9ZwA6sZwM1rQDoxV5x1KHLWxsFpI5CGWJqubtdEHj/I=";
+    })
   ];
 
   # We separate some of the utilities into their own outputs. This
@@ -113,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
   # root...
   configureFlags = [
     "--localstatedir=/var"
+    "--sysconfdir=/etc"
     "--disable-use-tty-group"
     "--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin"
     "--disable-makeinstall-setuid"
diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index b11bcdfa4960..5898430b732d 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "valkey";
-  version = "9.0.3";
+  version = "9.0.4";
 
   src = fetchFromGitHub {
     owner = "valkey-io";
     repo = "valkey";
     rev = finalAttrs.version;
-    hash = "sha256-cic4XBRFcSyttaMK6grzmi/RmrZiLRnYjMwGiU9teMw=";
+    hash = "sha256-FDm6i6G6h9WapMTj7ke4YtOjZ4rwIJZGONunQi0v7CE=";
   };
 
   patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch;
diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
index 710b78aaa85c..21e5d6e42162 100644
--- a/pkgs/by-name/vt/vte/package.nix
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -39,7 +39,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vte";
-  version = "0.82.3";
+  version = "0.84.0";
 
   outputs = [
     "out"
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
-    hash = "sha256-bcYnj2/uMNB9GgPiujM1sepOjSlWzrWdhhlDEV2TCoU=";
+    hash = "sha256-BBTjFYODaut4eNol9nxRX36IeZF+zDfJLia4Po2Pw+M=";
   };
 
   patches = [
@@ -61,12 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
       hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
     })
-
-    # https://gitlab.gnome.org/GNOME/vte/-/merge_requests/11
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/f672ed15a88dd3e25c33aa0a5ef6f6d291a6d5c7.patch";
-      hash = "sha256-JdLDild5j7marvR5n2heW9YD00+bwzJIoxDlzO5r/6w=";
-    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xd/xdg-dbus-proxy/package.nix b/pkgs/by-name/xd/xdg-dbus-proxy/package.nix
index 9c661cd0dc0b..098785d5556c 100644
--- a/pkgs/by-name/xd/xdg-dbus-proxy/package.nix
+++ b/pkgs/by-name/xd/xdg-dbus-proxy/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-dbus-proxy";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchurl {
     url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${finalAttrs.version}/xdg-dbus-proxy-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Exv1n858fufsvF2RBtZ1D09Ze/5gmWZXMkD35JUpc6E=";
+    hash = "sha256-OtPSe6V04XisteTUOLo2rOJeNWT4mcNvMcVvgsetu+c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
index e7ecf7ff7168..95c538036275 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-gnome";
-  version = "49.0";
+  version = "50.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz";
-    hash = "sha256-QB2vzfjLkR8JwI0oE/d03YZBJ6v8qT/0yvH8TJtexNI=";
+    hash = "sha256-zu7y+2izSz9mo97wozKiKnCvJyZB+2xQBlt6L949V1k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix
index e31ff0f1be71..28b17fca422a 100644
--- a/pkgs/by-name/xd/xdg-user-dirs/package.nix
+++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-user-dirs";
-  version = "0.19";
+  version = "0.20";
 
   src = fetchurl {
     url = "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6S3rkpwQ1LKTKTl6+KJYUQEkf35hd6xvHSjoITDtjBk=";
+    hash = "sha256-uONChiePT+8+G/6WhcOVzMDrUMFNOi+0lT3QD7/Trzk=";
   };
 
   outputs = [
@@ -52,9 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
     wrapProgram "$out/bin/xdg-user-dirs-update" \
       --suffix XDG_CONFIG_DIRS : "$out/etc/xdg"
 
-    substituteInPlace "$out/lib/systemd/user/xdg-user-dirs.service" \
-      --replace-fail "/usr/bin/xdg-user-dirs-update" "$out/bin/xdg-user-dirs-update"
-
     # Autostart, because the installed service is never explicitly enabled in NixOS
     substituteInPlace "$out/etc/xdg/autostart/xdg-user-dirs.desktop" \
       --replace-fail "X-systemd-skip=true" "X-systemd-skip=false"
diff --git a/pkgs/by-name/xr/xrandr/package.nix b/pkgs/by-name/xr/xrandr/package.nix
index 11a74880ff8d..18a13fbb06d7 100644
--- a/pkgs/by-name/xr/xrandr/package.nix
+++ b/pkgs/by-name/xr/xrandr/package.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  meson,
+  ninja,
   pkg-config,
   xorgproto,
   libx11,
@@ -11,16 +13,20 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xrandr";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/xrandr-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+N11Zq23QUf6uZZGgLa7re6Hz0Bqf8/1Fxil5pSbhBw=";
+    hash = "sha256-LK/MsqrySRpAaGdhF6DU+QqzB3JLlv/8VM0dqVN3lAA=";
   };
 
   strictDeps = true;
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
 
   buildInputs = [
     xorgproto
diff --git a/pkgs/by-name/xs/xsimd/disable-test_error_gamma.patch b/pkgs/by-name/xs/xsimd/disable-test_error_gamma.patch
deleted file mode 100644
index 49957ea62ed7..000000000000
--- a/pkgs/by-name/xs/xsimd/disable-test_error_gamma.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git i/test/test_error_gamma.cpp w/test/test_error_gamma.cpp
-index 214cbb5..299e5b8 100644
---- i/test/test_error_gamma.cpp
-+++ w/test/test_error_gamma.cpp
-@@ -131,25 +131,6 @@ struct error_gamma_test
-             INFO("lgamma");
-             CHECK_EQ(diff, 0);
-         }
--#if !(XSIMD_WITH_AVX && !XSIMD_WITH_AVX2)
--
--        // tgamma (negative input)
--        {
--            std::transform(gamma_neg_input.cbegin(), gamma_neg_input.cend(), expected.begin(),
--                           [](const value_type& v)
--                           { return std::lgamma(v); });
--            batch_type in, out;
--            for (size_t i = 0; i < nb_input; i += size)
--            {
--                detail::load_batch(in, gamma_neg_input, i);
--                out = lgamma(in);
--                detail::store_batch(out, res, i);
--            }
--            size_t diff = detail::get_nb_diff(res, expected);
--            INFO("lgamma (negative input)");
--            CHECK_EQ(diff, 0);
--        }
--#endif
-     }
- };
- 
diff --git a/pkgs/by-name/xs/xsimd/package.nix b/pkgs/by-name/xs/xsimd/package.nix
index 0a3cabfc2969..1b9e1f3e4788 100644
--- a/pkgs/by-name/xs/xsimd/package.nix
+++ b/pkgs/by-name/xs/xsimd/package.nix
@@ -8,23 +8,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xsimd";
-  version = "13.2.0";
+  version = "14.2.0";
 
   src = fetchFromGitHub {
     owner = "xtensor-stack";
     repo = "xsimd";
     tag = finalAttrs.version;
-    hash = "sha256-L4ttJxP46uNwQAEUMoJ8rsc51Le2GeIGbT1kX7ZzcPA=";
+    hash = "sha256-BTiN4B3//wlB3nmOoluM/7bL7J7YIBp5afih9zUP1yw=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isDarwin [
-    # https://github.com/xtensor-stack/xsimd/issues/1030
-    ./disable-test_error_gamma.patch
-
-    # https://github.com/xtensor-stack/xsimd/issues/1063
-    ./relax-asin-precision.diff
-  ];
-
   # strictDeps raises the chance that xsimd will be able to be cross compiled
   strictDeps = true;
 
diff --git a/pkgs/by-name/xs/xsimd/relax-asin-precision.diff b/pkgs/by-name/xs/xsimd/relax-asin-precision.diff
deleted file mode 100644
index 7623f6e81e4a..000000000000
--- a/pkgs/by-name/xs/xsimd/relax-asin-precision.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp
-index f416ae9..1f8253e 100644
---- a/test/test_xsimd_api.cpp
-+++ b/test/test_xsimd_api.cpp
-@@ -468,7 +468,8 @@ struct xsimd_api_float_types_functions
-     void test_asin()
-     {
-         value_type val(1);
--        CHECK_EQ(extract(xsimd::asin(T(val))), std::asin(val));
-+        CHECK(extract(xsimd::asin(T(val)))
-+              == doctest::Approx(std::asin(val)).epsilon(1e-7));
-     }
-     void test_asinh()
-     {
diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix
index a43c046ee57f..10cc131d07d8 100644
--- a/pkgs/by-name/xt/xterm/package.nix
+++ b/pkgs/by-name/xt/xterm/package.nix
@@ -24,14 +24,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xterm";
-  version = "407";
+  version = "410";
 
   src = fetchurl {
     urls = [
-      "https://invisible-island.net/archives/xterm/${finalAttrs.pname}-${finalAttrs.version}.tgz"
-      "https://invisible-mirror.net/archives/xterm/${finalAttrs.pname}-${finalAttrs.version}.tgz"
+      "https://invisible-island.net/archives/xterm/xterm-${finalAttrs.version}.tgz"
+      "https://invisible-mirror.net/archives/xterm/xterm-${finalAttrs.version}.tgz"
     ];
-    hash = "sha256-ITbrpTAGiht1Zau/F4IydPXO+3/jYYNVy8idxVyLe2o=";
+    hash = "sha256-e6n7swPdPZXQbKJDYNAZBI2E5YItxv5yLNdzab2/Ix8=";
   };
 
   patches = [ ./sixel-256.support.patch ];
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index 4f6afbc8f6b3..f765440f13f6 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -7,7 +7,6 @@
   ninja,
   pkg-config,
   xorg-server,
-  fetchurl,
   dri-pkgconfig-stub,
   libdrm,
   libGL,
@@ -38,13 +37,7 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "xvfb";
 
-  #FIXME: go back to xorg-server version on nixpkgs staging
-  #inherit (xorg-server) src version;
-  version = "21.1.21";
-  src = fetchurl {
-    url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";
-    hash = "sha256-wMvlVFs/ZFuuYCS4MNHRFUqVY1BoOk5Ssv/1sPoatRk=";
-  };
+  inherit (xorg-server) src version;
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/xx/xxhash/package.nix b/pkgs/by-name/xx/xxhash/package.nix
index 678e9d1c1864..533f638305f6 100644
--- a/pkgs/by-name/xx/xxhash/package.nix
+++ b/pkgs/by-name/xx/xxhash/package.nix
@@ -8,6 +8,8 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "xxhash";
   version = "0.8.3";
+  __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "Cyan4973";
@@ -35,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Cyan4973/xxHash";
     license = with lib.licenses; [
       bsd2
-      gpl2
+      gpl2Plus
     ];
     mainProgram = "xxhsum";
     maintainers = [ ];
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 0606e5f812e1..7b080d790bf2 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "18df06fa5c94e82240afb89aafe72572abf4b4ef",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/18df06fa5c94e82240afb89aafe72572abf4b4ef.tar.gz",
-  "sha256": "1iikxr7z5qswp65kw08zwilj0n7gwr875f455mnd7ppm96cfgiid",
-  "msg": "Update from Hackage at 2026-03-15T11:30:53Z"
+  "commit": "3a3b69bdd8114e4503dc8cb9909a3b0ea32e6be6",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a3b69bdd8114e4503dc8cb9909a3b0ea32e6be6.tar.gz",
+  "sha256": "1qjd5gp9d4r4y6qjf52m7w9dzy9nq622aqv72ma8d4xlrxrrachp",
+  "msg": "Update from Hackage at 2026-04-24T19:35:23Z"
 }
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index f7a19a73673b..fa2c3c2f978e 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -223,6 +223,8 @@ pipe
 
       inherit patches;
 
+      __structuredAttrs = true;
+
       outputs = [
         "out"
         "man"
diff --git a/pkgs/development/compilers/ghc/9.10.2.nix b/pkgs/development/compilers/ghc/9.10.2.nix
deleted file mode 100644
index 96e251654429..000000000000
--- a/pkgs/development/compilers/ghc/9.10.2.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common-hadrian.nix {
-  version = "9.10.2";
-  sha256 = "55fd40a005575ac6b33ea928beda81e8c56ffea354b6ac474ee9f9911f23a8de";
-}
diff --git a/pkgs/development/compilers/ghc/9.12.2.nix b/pkgs/development/compilers/ghc/9.12.2.nix
deleted file mode 100644
index 40ca6681a391..000000000000
--- a/pkgs/development/compilers/ghc/9.12.2.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common-hadrian.nix {
-  version = "9.12.2";
-  sha256 = "0e49cd5dde43f348c5716e5de9a5d7a0f8d68d945dc41cf75dfdefe65084f933";
-}
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 2b66c97aa3ae..9bf6b1784d92 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -238,51 +238,39 @@
           hash = "sha256-L3FQvcm9QB59BOiR2g5/HACAufIG08HiT53EIOjj64g=";
         })
       ]
-      ++ lib.optionals (lib.versionOlder version "9.12.1") [
+      ++ lib.optionals (lib.versionOlder version "9.12") [
         (fetchpatch {
           name = "ghc-ppc-support-elf-v2-on-powerpc64-big-endian.patch";
           url = "https://gitlab.haskell.org/ghc/ghc/-/commit/ead75532c9dc915bfa9ebaef0ef5d148e793cc0a.patch";
           # ghc-platform was split out of ghc-boot in ddcdd88c2c95445a87ee028f215d1e876939a4d9
-          postFetch = lib.optionalString (lib.versionOlder version "9.10.1") ''
+          postFetch = lib.optionalString (lib.versionOlder version "9.10") ''
             substituteInPlace $out \
               --replace-fail 'libraries/ghc-platform/src/GHC' 'libraries/ghc-boot/GHC'
           '';
           hash =
-            if lib.versionOlder version "9.10.1" then
+            if lib.versionOlder version "9.10" then
               "sha256-5SVSW1aYoItqHli5QjnudH4zGporYNLDeEo4gZksBZw="
             else
               "sha256-vtjT+TL/7sYPu4rcVV3xCqJQ+uqkyBbf9l0KIi97j/0=";
         })
       ]
-      ++
-        lib.optionals
-          (
-            (lib.versions.majorMinor version == "9.12" && lib.versionOlder version "9.12.3")
-            || (lib.versions.majorMinor version != "9.12" && lib.versionOlder version "9.14.1")
-          )
-          [
-            (fetchpatch {
-              name = "ghc-rts-Fix-compile-on-powerpc64-elf-v1.patch";
-              url = "https://gitlab.haskell.org/ghc/ghc/-/commit/05e5785a3157c71e327a8e9bdc80fa7082918739.patch";
-              hash = "sha256-xP5v3cKhXeTRSFvRiKEn9hPxGXgVgykjTILKjh/pdDU=";
-            })
-          ]
+      ++ lib.optionals (lib.versionOlder version "9.12") [
+        (fetchpatch {
+          name = "ghc-rts-Fix-compile-on-powerpc64-elf-v1.patch";
+          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/05e5785a3157c71e327a8e9bdc80fa7082918739.patch";
+          hash = "sha256-xP5v3cKhXeTRSFvRiKEn9hPxGXgVgykjTILKjh/pdDU=";
+        })
+      ]
       # Fix build with gcc15
       # https://gitlab.haskell.org/ghc/ghc/-/issues/25662
       # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13863
-      ++
-        lib.optionals
-          (
-            lib.versionOlder version "9.12.3"
-            && !(lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.12")
-          )
-          [
-            (fetchpatch {
-              name = "ghc-hp2ps-c-gnu17.patch";
-              url = "https://src.fedoraproject.org/rpms/ghc/raw/9c26d7c3c3de73509a25806e5663b37bcf2e0b4e/f/hp2ps-C-gnu17.patch";
-              hash = "sha256-Vr5wkiSE1S5e+cJ8pWUvG9KFpxtmvQ8wAy08ElGNp5E=";
-            })
-          ]
+      ++ lib.optionals (lib.versionOlder version "9.10") [
+        (fetchpatch {
+          name = "ghc-hp2ps-c-gnu17.patch";
+          url = "https://src.fedoraproject.org/rpms/ghc/raw/9c26d7c3c3de73509a25806e5663b37bcf2e0b4e/f/hp2ps-C-gnu17.patch";
+          hash = "sha256-Vr5wkiSE1S5e+cJ8pWUvG9KFpxtmvQ8wAy08ElGNp5E=";
+        })
+      ]
       # Fix subword division regression in 9.12.3 https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15264
       ++ lib.optionals (version == "9.12.3") [
         (fetchpatch {
@@ -304,7 +292,7 @@
       ]
 
       # Unreleased or still in-progress upstream cross fixes
-      ++ lib.optionals (lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.15") [
+      ++ lib.optionals (lib.versionAtLeast version "9.10" && lib.versionOlder version "9.15") [
         # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13919
         (fetchpatch {
           name = "include-modern-utimbuf.patch";
@@ -319,6 +307,8 @@
         # https://gitlab.haskell.org/ghc/ghc/-/issues/26518 krank:ignore-line
         ./ghc-define-undefined-elf-st-visibility.patch
       ]
+
+      # Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810
       ++
         lib.optionals
           (
diff --git a/pkgs/development/compilers/rust/1_94.nix b/pkgs/development/compilers/rust/1_95.nix
similarity index 55%
rename from pkgs/development/compilers/rust/1_94.nix
rename to pkgs/development/compilers/rust/1_95.nix
index 42e23b200c64..0c69095341b4 100644
--- a/pkgs/development/compilers/rust/1_94.nix
+++ b/pkgs/development/compilers/rust/1_95.nix
@@ -50,9 +50,8 @@ let
 in
 import ./default.nix
   {
-    rustcVersion = "1.94.1";
-    rustcSha256 = "sha256-TBQqYl8S4833FsaK4Z9PYNmK0UgmJ7CFebFYOOla1RQ=";
-    rustcPatches = [ ./ignore-missing-docs.patch ];
+    rustcVersion = "1.95.0";
+    rustcSha256 = "sha256-6puCqD5GlnU3w1ac6db6FoEcBDqW5lE3bDSecCQcpRU=";
 
     llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
     llvmSharedForHost = llvmSharedFor pkgsBuildHost;
@@ -66,30 +65,30 @@ import ./default.nix
     # Note: the version MUST be the same version that we are building. Upstream
     # ensures that each released compiler can compile itself:
     # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363
-    bootstrapVersion = "1.94.1";
+    bootstrapVersion = "1.95.0";
 
     # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
     bootstrapHashes = {
-      i686-unknown-linux-gnu = "b458db6cf8366fa9f830bf05b15e3866fbb2b7e0a1921b91fd52aff9accfb405";
-      x86_64-unknown-linux-gnu = "ea7866c5cab0d8c99e7416bcc5f9ecf0e122d396b85c7e7dee5669f10ee80194";
-      x86_64-unknown-linux-musl = "5568d1b7992dcb0cabc9936476a0569ff314a3f1322886b4f414eb2d07b0ffd6";
-      arm-unknown-linux-gnueabihf = "0b5d43c00ef1a72352f7b08937018ab52f624047f1403e0d2c4d7c67456eff16";
-      armv7-unknown-linux-gnueabihf = "31b7deb5f38a504e21865a8bd98ff546884e66910ee11ed55e51a976ac7a645a";
-      aarch64-unknown-linux-gnu = "99dba6decb780158b2b94f0054ec15c8cd4a04a497c84349fb86fb7a70722c78";
-      aarch64-unknown-linux-musl = "caa1d50676518532cc9b4c4c491f219edbdcb9ebf9e6624432b5b43b87d8cc0a";
-      x86_64-apple-darwin = "6d9c5a4bf9962987d616417e2669a50b52cc7ecbfa682d56e9ce8244a57d7b60";
-      aarch64-apple-darwin = "630349bd157632ff65aafd1b5753e6a09153278cdac8196e8678b40b30cf1ecb";
-      powerpc64-unknown-linux-gnu = "ef5ece383b3b0c2e3b020b95420020b247d73e6885cc9d8b328456b84cfcb6e6";
-      powerpc64le-unknown-linux-gnu = "e4375d9081ce229786849ac4cd1be56e3a4ff117371d557ebcdb832c5ec20a4e";
-      powerpc64le-unknown-linux-musl = "80fc13d8a78427a7065208a8aac17f542a173efd73c217be11b75de83c2f661f";
-      riscv64gc-unknown-linux-gnu = "58038bca429819cc4cd52b9c364983c2e8a4c1dade8beaa0e4edd767e952ebf8";
-      s390x-unknown-linux-gnu = "9b1043df30e406bf87cd73be5e5472f0353313ea081bd2ab1feb3b3d45f03e76";
-      loongarch64-unknown-linux-gnu = "462881b156c5bd838943c6074649ad296dc87162753010fd328c2b698655b6ec";
-      loongarch64-unknown-linux-musl = "5100cd191031a9549b2689b774306e5f37902dcc259a99b9e2de502720c52c0c";
-      x86_64-unknown-freebsd = "68b687b408a4b443faeb2c81e2cb1c51f8f738da30ce04b0584db81068d77229";
+      i686-unknown-linux-gnu = "3ef2320bdfa9b69b19c6ca42f950b6bfb9d2af3b925b0c43a6bfecc4d355a66e";
+      x86_64-unknown-linux-gnu = "a47ac940abd12399d59ad15c877e7113fa35f2b9ec7e6a8a045d4fd8b9741dea";
+      x86_64-unknown-linux-musl = "059086762ac6f4ebe15b5b10e629e4e33e96b372765e65741251f75c4fdfb4e0";
+      arm-unknown-linux-gnueabihf = "7d742098e8bb0d10415775634eed83240ae88c1bae6bc73b470ccf0be4629b4c";
+      armv7-unknown-linux-gnueabihf = "23a201e72c082c285e957a32b40e1c30805b15d344b84b984be3659e9aefadf6";
+      aarch64-unknown-linux-gnu = "3b9385d3144ac57616befa0ccbac524f857ba1b4ab074226e73a24d43568a98e";
+      aarch64-unknown-linux-musl = "ad35bcc6928ccb4fd8a12fe19ce88c8fb6e6e3690578a0cb4e0839008017484f";
+      x86_64-apple-darwin = "3f3d9f29f8eb7aa821bd8531cb9b1c3c74c3976aa558dfabfcc15c2febb3cfb8";
+      aarch64-apple-darwin = "ec23ad2e0e15a7397d2c3c232356149cc871b7df7f47e25c2acb1070157f5398";
+      powerpc64-unknown-linux-gnu = "6d89e3739cfb7b3a05880734513361d5860492385217dcd166d033f3e974e823";
+      powerpc64le-unknown-linux-gnu = "29e3430f38406c926ee24ff911357dba0c46ff1d3ea59e91625b03677bd51b30";
+      powerpc64le-unknown-linux-musl = "b8856b651d64f4f4a2e2ee009366d99ea6135bdf88d15cf2134fc9e166745030";
+      riscv64gc-unknown-linux-gnu = "8b527cb1a09f53f83aa3420b4e763c9ea64a54d89e6d7242da35c8aeaa325593";
+      s390x-unknown-linux-gnu = "e9598bdd3bc1438d965208ef5186f0dd671826cddd4bcbb20e22a3cec14c111d";
+      loongarch64-unknown-linux-gnu = "18038ce7a910930c6742cc76e06fdd4b21b879466a3e67d63a0b6cae955bb4dc";
+      loongarch64-unknown-linux-musl = "eef910858c7e833b13c9cb32e79e59d89434999bc2a7d0b6447ab4046eb40461";
+      x86_64-unknown-freebsd = "0ffb7aa1999ea12363bbfaea500e152565bb4918ad5a73e9713be40510d75e49";
     };
 
-    selectRustPackage = pkgs: pkgs.rust_1_94;
+    selectRustPackage = pkgs: pkgs.rust_1_95;
   }
 
   (
diff --git a/pkgs/development/compilers/rust/ignore-missing-docs.patch b/pkgs/development/compilers/rust/ignore-missing-docs.patch
deleted file mode 100644
index 1d433a59713d..000000000000
--- a/pkgs/development/compilers/rust/ignore-missing-docs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-index 897f59f530..c94a4a804f 100644
---- a/library/core/src/os/mod.rs
-+++ b/library/core/src/os/mod.rs
-@@ -1,6 +1,7 @@
- //! OS-specific functionality.
-
- #![unstable(feature = "darwin_objc", issue = "145496")]
-+#[allow(missing_docs)]
-
- #[cfg(all(
-     doc,
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 4dd4e56f6dfd..cf86b5412571 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -23,6 +23,7 @@
   openssl,
   xz,
   zlib,
+  rust-jemalloc-sys,
   bintools,
   which,
   libffi,
@@ -402,6 +403,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     openssl
+    rust-jemalloc-sys
   ]
   ++ optionals stdenv.hostPlatform.isDarwin [
     zlib
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index ddb5dc2d07e2..ef7afd954258 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -30,8 +30,8 @@ let
     "2.4.10".sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg=";
     # By unofficial and very loose convention we keep the latest version of
     # SBCL, and the previous one in case someone quickly needs to roll back.
-    "2.6.1".sha256 = "sha256-XyzVu30+bZFJpZwFrNhCmzvhhJIRdp5aN0UdAB4ZbX8=";
     "2.6.3".sha256 = "sha256-50MvtkKVLdJaX8DFbSGPPQqlls5C0z76gwkbyn1pmIo=";
+    "2.6.4".sha256 = "sha256-O6U+ZUtg/rfE9QRmGZ1tUmDyZhxxG6ItS3cLZVQA1Xs=";
   };
   # Collection of pre-built SBCL binaries for platforms that need them for
   # bootstrapping. Ideally these are to be avoided.  If ECL (or any other
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ef0381a6c58b..cecf57705f36 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -29,29 +29,6 @@ with haskellLib;
 
 # To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead.
 {
-  # Hackage's accelerate is from 2020 and incompatible with our GHC.
-  # The existing derivation also has missing dependencies
-  # compared to the source from github.
-  # https://github.com/AccelerateHS/accelerate/issues/553
-  accelerate = lib.pipe super.accelerate [
-    (warnAfterVersion "1.3.0.0")
-    (addBuildDepends [
-      self.double-conversion
-      self.formatting
-      self.microlens
-    ])
-
-    (overrideCabal (drv: {
-      version = "1.3.0.0-unstable-2026-01-30";
-      src = pkgs.fetchFromGitHub {
-        owner = "AccelerateHS";
-        repo = "accelerate";
-        rev = "c22387ed2e00b00a6c79dcec5d22b53874da91fc";
-        sha256 = "sha256-AtKdxeCytRbmOIFe7OPbSMlhFhJnrgMuIqLFIeqnBGU";
-      };
-    }))
-  ];
-
   # Make sure that Cabal_* can be built as-is
   Cabal_3_10_3_0 = doDistribute (
     super.Cabal_3_10_3_0.override {
@@ -98,7 +75,7 @@ with haskellLib;
 
   # Needs matching version of Cabal
   Cabal-hooks = super.Cabal-hooks.override {
-    Cabal = self.Cabal_3_14_2_0;
+    Cabal = self.Cabal_3_16_1_0;
   };
 
   # Needs Cabal>=3.14
@@ -146,14 +123,6 @@ with haskellLib;
         cabal2nix-unstable = super.cabal2nix-unstable.overrideScope cabalInstallOverlay;
         distribution-nixpkgs-unstable = super.distribution-nixpkgs-unstable.overrideScope cabalInstallOverlay;
         hackage-db-unstable = super.hackage-db-unstable.overrideScope cabalInstallOverlay;
-
-        # Needs cabal-install >= 3.8 /as well as/ matching Cabal
-        guardian = lib.pipe (super.guardian.overrideScope cabalInstallOverlay) [
-          # Tests need internet access (run stack)
-          dontCheck
-          # May as well…
-          (self.generateOptparseApplicativeCompletions [ "guardian" ])
-        ];
       }
     )
     cabal-install
@@ -161,7 +130,6 @@ with haskellLib;
     cabal2nix-unstable
     distribution-nixpkgs-unstable
     hackage-db-unstable
-    guardian
     ;
 
   # Stack uses pure nix-shells for certain operations including HTTPS requests
@@ -204,6 +172,20 @@ with haskellLib;
   # First to upgrade to lsp >= 2.8 while HLS hasn't yet had a compatible release
   futhark = super.futhark.override {
     lsp = self.lsp_2_8_0_0;
+    lsp-test =
+      overrideCabal
+        (old: {
+          testTargets = [
+            "tests"
+            "func-test"
+          ];
+        })
+        (
+          self.lsp-test_0_18_0_0.override {
+            lsp = self.lsp_2_8_0_0;
+            lsp-types = self.lsp-types_2_4_0_0;
+          }
+        );
     lsp-types = self.lsp-types_2_4_0_0;
   };
 
@@ -363,6 +345,29 @@ with haskellLib;
     '';
   }) super.streamly-core;
 
+  # Work around tasty >= 1.5.4 parallelism breaking the test suite
+  criterion = appendPatches [
+    (pkgs.fetchpatch {
+      name = "criterion-tasty-1.5.4.patch";
+      url = "https://github.com/haskell/criterion/commit/d555422d1779434432489efbc19d75011226c3e6.patch";
+      hash = "sha256-VRSfdzT/mzdRSMQmmIeycuChvRN/VDhYsHJQb0bRMaA=";
+    })
+  ] super.criterion;
+
+  # Avoid rebinding to the same port with tasty >= 1.5.4 parallelism
+  # https://github.com/lpeterse/haskell-socket/pull/73
+  socket = appendPatches [
+    (pkgs.fetchpatch {
+      name = "socket-tasty-1.5.4.patch";
+      url = "https://github.com/lpeterse/haskell-socket/commit/a2687d9f1a60cfb72f85962c501a68d110ed6de0.patch";
+      hash = "sha256-21qkRFnRF6nuM1BILps8o5A/QvaVQ6SkKxO0u2goXos=";
+    })
+  ] super.socket;
+  # https://github.com/flip111/haskell-socket-unix/issues/1
+  socket-unix = overrideCabal (drv: {
+    testFlags = drv.testFlags or [ ] ++ [ "-j1" ];
+  }) super.socket-unix;
+
   # Expected failures are fixed as of GHC-9.10,
   # but the tests haven't been updated yet.
   # https://github.com/ocharles/weeder/issues/198
@@ -408,6 +413,10 @@ with haskellLib;
       dontCheck
       super.bloomfilter-blocked;
 
+  # Missing files necessary for test suite compilation
+  # https://github.com/brandonchinn178/kdl-hs/issues/33
+  kdl-hs = dontCheck super.kdl-hs;
+
   # support for transformers >= 0.6
   lifted-base = appendPatch (fetchpatch {
     url = "https://github.com/basvandijk/lifted-base/commit/6b61483ec7fd0d5d5d56ccb967860d42740781e8.patch";
@@ -438,18 +447,26 @@ with haskellLib;
   # https://github.com/raehik/binrep/issues/14
   binrep = warnAfterVersion "1.1.0" (doJailbreak super.binrep);
 
-  # Does not support QuickCheck == 2.15.*
-  # https://codeberg.org/noiioiu/comonad-coactions/issues/1
-  comonad-coactions = dontCheck super.comonad-coactions;
+  # Test suite can't be built with GHC 9.10, incorrect lower bound on t-h
+  # https://codeberg.org/noiioiu/comonad-coactions/issues/1#issuecomment-14082215
+  comonad-coactions = dontCheck (doJailbreak super.comonad-coactions);
 
   # doctests don't evaluate properly
   # https://github.com/morphismtech/distributors/issues/23
   distributors = dontCheck super.distributors;
 
+  # Test files missing from sdist
+  # https://github.com/sol/ghc-bench/issues/81
+  ghc-bench = dontCheck super.ghc-bench;
+
   # Needs QuickCheck >= 2.16
   # https://github.com/input-output-hk/io-sim/issues/248
   io-sim = dontCheck super.io-sim;
 
+  # Test suites broken by hakyll 4.16, but lib is still okay
+  # https://github.com/LaurentRDC/hakyll-images/issues/14
+  hakyll-images = dontCheck super.hakyll-images;
+
   # 2024-06-23: Hourglass is archived and had its last commit 6 years ago.
   # Patch is needed to add support for time 1.10, which is only used in the tests
   # https://github.com/vincenthz/hs-hourglass/pull/56
@@ -491,14 +508,6 @@ with haskellLib;
     sha256 = "1c7knpvxr7p8c159jkyk6w29653z5yzgjjqj11130bbb8mk9qhq7";
   }) super.c2hsc;
 
-  # 2025-02-10: Too strict bounds on bytestring < 0.12
-  ghc-debug-common = doJailbreak super.ghc-debug-common;
-  ghc-debug-client = lib.pipe super.ghc-debug-client [
-    (warnAfterVersion "0.7.0.0")
-    # 2025-09-18: Too strict bounds on containers < 0.7
-    doJailbreak
-  ];
-
   # https://github.com/agrafix/superbuffer/issues/4
   # Too strict bounds on bytestring < 0.12
   superbuffer = doJailbreak super.superbuffer;
@@ -558,6 +567,7 @@ with haskellLib;
   jpeg-turbo = dontCheck super.jpeg-turbo;
   JuicyPixels-jpeg-turbo = dontCheck super.JuicyPixels-jpeg-turbo;
 
+  # Repo is archived, package is abandoned: https://github.com/haskell-foundation/foundation
   basement = appendPatches [
     # Fixes compilation for basement on i686
     # https://github.com/haskell-foundation/foundation/pull/573
@@ -567,13 +577,15 @@ with haskellLib;
       sha256 = "17kz8glfim29vyhj8idw8bdh3id5sl9zaq18zzih3schfvyjppj7";
       stripLen = 1;
     })
-
-    # Fixes compilation on windows
-    # Repo is archived, package is abandoned: https://github.com/haskell-foundation/foundation
-    ./patches/basement-add-cast.patch
+    ./patches/basement-add-cast.patch # Fixes compilation on windows
+    ./patches/basement-ghcjs.patch # Fixes compilation on ghcjs
 
   ] super.basement;
 
+  # Repo is archived, package is abandoned: https://github.com/haskell-foundation/foundation
+  # Fixes compilation on ghcjs
+  foundation = appendPatch ./patches/foundation-ghcjs.patch super.foundation;
+
   # Fixes compilation of memory with GHC >= 9.4 on 32bit platforms
   # https://github.com/vincenthz/hs-memory/pull/99
   memory = appendPatches [
@@ -670,7 +682,7 @@ with haskellLib;
         name = "git-annex-${super.git-annex.version}-src";
         url = "git://git-annex.branchable.com/";
         tag = super.git-annex.version;
-        sha256 = "sha256-oh9lrQvj1Ooi3PI5heNXBopX35s1K5Kyn/mH7V4sXB8=";
+        sha256 = "sha256-9DHaOZplSGuUQufra/hMdpykztbKKjDfu1Rp9zUs+tg=";
         # delete android and Android directories which cause issues on
         # darwin (case insensitive directory). Since we don't need them
         # during the build process, we can delete it to prevent a hash
@@ -692,6 +704,13 @@ with haskellLib;
           --replace-fail 'InstallDesktopFile $(PREFIX)/bin/git-annex' \
                          'InstallDesktopFile git-annex'
       '';
+
+      # Work around race condition in test suite exposed by tasty-1.5.4
+      # TODO(@sternenseemann): make testFlags arg usable with git-annex
+      preCheck = ''
+        ${drv.preCheck or ""}
+        appendToVar checkFlags -j1
+      '';
     }))
   ];
 
@@ -725,7 +744,7 @@ with haskellLib;
   # Pass in `pkgs.nix` for the required tools. This means that overriding
   # them sort of works, but only if you override all instances.
   nix-paths =
-    if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
+    if with pkgs.stdenv; buildPlatform.canExecute hostPlatform then
       super.nix-paths.override {
         nix-build = pkgs.nix;
         nix-env = pkgs.nix;
@@ -785,9 +804,6 @@ with haskellLib;
   migrant-hdbc = doJailbreak super.migrant-hdbc;
   migrant-postgresql-simple = doJailbreak super.migrant-postgresql-simple;
 
-  # https://github.com/froozen/kademlia/issues/2
-  kademlia = dontCheck super.kademlia;
-
   # 2025-09-03: jailbreak for base 4.20 and hashable 1.5
   # https://github.com/typeclasses/ascii-case/pulls/1
   ascii-case = lib.pipe super.ascii-case [
@@ -795,9 +811,6 @@ with haskellLib;
     doJailbreak
   ];
 
-  # Tests require older versions of tasty.
-  hzk = dontCheck super.hzk;
-
   # 2025-12-11: Too strict bound on containers (<0.7)
   # https://github.com/byteverse/disjoint-containers/pull/15
   disjoint-containers = doJailbreak super.disjoint-containers;
@@ -819,19 +832,6 @@ with haskellLib;
   # Tests require a Kafka broker running locally
   haskakafka = dontCheck super.haskakafka;
 
-  bindings-levmar = addExtraLibrary pkgs.blas super.bindings-levmar;
-
-  # Requires wrapQtAppsHook
-  qtah-cpp-qt5 = overrideCabal (drv: {
-    buildDepends = [ pkgs.qt5.wrapQtAppsHook ];
-  }) super.qtah-cpp-qt5;
-
-  # The Haddock phase fails for one reason or another.
-  deepseq-magic = dontHaddock super.deepseq-magic;
-  feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1
-  hoodle-core = dontHaddock super.hoodle-core;
-  hsc3-db = dontHaddock super.hsc3-db;
-
   # Fix build with time >= 1.10 while retaining compat with time < 1.9
   mbox = appendPatch ./patches/mbox-time-1.10.patch (
     overrideCabal {
@@ -849,42 +849,23 @@ with haskellLib;
     '';
   }) super.inline-c-cpp;
 
-  inline-java = addBuildDepend pkgs.jdk super.inline-java;
-
   # Too strict upper bound on unicode-transforms
   # <https://gitlab.com/ngua/ipa-hs/-/issues/1>
   ipa = doJailbreak super.ipa;
 
-  # Upstream notified by e-mail.
-  permutation = dontCheck super.permutation;
-
   # Test suite depends on source code being available
   simple-affine-space = dontCheck super.simple-affine-space;
 
-  # Fails no apparent reason. Upstream has been notified by e-mail.
-  assertions = dontCheck super.assertions;
-
   # These packages try to execute non-existent external programs.
   cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw
-  dbmigrations = dontCheck super.dbmigrations;
   filestore = dontCheck super.filestore;
-  graceful = dontCheck super.graceful;
-  ide-backend = dontCheck super.ide-backend;
-  marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69
-  memcached-binary = dontCheck super.memcached-binary;
-  msgpack-rpc = dontCheck super.msgpack-rpc;
-  persistent-zookeeper = dontCheck super.persistent-zookeeper;
-  pocket-dns = dontCheck super.pocket-dns;
   squeal-postgresql = dontCheck super.squeal-postgresql;
-  postgrest-ws = dontCheck super.postgrest-ws;
   snowball = dontCheck super.snowball;
   sophia = dontCheck super.sophia;
   test-sandbox = dontCheck super.test-sandbox;
   texrunner = dontCheck super.texrunner;
   wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
-  xkbcommon = dontCheck super.xkbcommon;
   xmlgen = dontCheck super.xmlgen;
-  HerbiePlugin = dontCheck super.HerbiePlugin;
   wai-cors = dontCheck super.wai-cors;
 
   # Needs QuickCheck >= 2.16, but Stackage is currently on 2.15
@@ -918,22 +899,31 @@ with haskellLib;
     ))
   ];
 
-  pandoc = appendPatches [
-    # Adjust test fixtures for djot >= 0.1.2.3, patch extracted from unrelated change.
-    (pkgs.fetchpatch {
-      name = "pandoc-djot-0.1.2.3.patch";
-      url = "https://github.com/jgm/pandoc/commit/643712ca70b924c0edcc059699aa1ee42234be34.patch";
-      hash = "sha256-khDkb1PzC0fTaWTq3T04UvgoI+XefOJMaTV1d3Du8BU=";
-      includes = [ "test/djot-reader.native" ];
-    })
-    # Adjust tests for skylighting-format-blaze-html >= 0.1.2
-    (pkgs.fetchpatch {
-      name = "pandoc-skylighting-format-blaze-html-0.1.2.patch";
-      url = "https://github.com/jgm/pandoc/commit/cab682ba58f2eb7e940d1af508e196ff6b1c1112.patch";
-      hash = "sha256-lpddKGa8xs+Lhi62HhBgV04fUq2kkippA1xX2/b2ukM=";
-      includes = [ "test/Tests/Writers/HTML.hs" ];
-    })
-  ] super.pandoc;
+  pandoc = overrideCabal (drv: {
+    patches = drv.patches or [ ] ++ [
+      # Adjust test fixtures for djot >= 0.1.2.3, patch extracted from unrelated change.
+      (pkgs.fetchpatch {
+        name = "pandoc-djot-0.1.2.3.patch";
+        url = "https://github.com/jgm/pandoc/commit/643712ca70b924c0edcc059699aa1ee42234be34.patch";
+        hash = "sha256-khDkb1PzC0fTaWTq3T04UvgoI+XefOJMaTV1d3Du8BU=";
+        includes = [ "test/djot-reader.native" ];
+      })
+      # Adjust tests for skylighting-format-blaze-html >= 0.1.2
+      (pkgs.fetchpatch {
+        name = "pandoc-skylighting-format-blaze-html-0.1.2.patch";
+        url = "https://github.com/jgm/pandoc/commit/cab682ba58f2eb7e940d1af508e196ff6b1c1112.patch";
+        hash = "sha256-lpddKGa8xs+Lhi62HhBgV04fUq2kkippA1xX2/b2ukM=";
+        includes = [ "test/Tests/Writers/HTML.hs" ];
+      })
+      # Resolve test suite race condition(s) due to tasty >= 1.5.4 and
+      # inDirectory, https://github.com/jgm/pandoc/issues/11566 krank:ignore-line
+      (pkgs.fetchpatch {
+        name = "pandoc-tests-fix-race-condition.patch";
+        url = "https://github.com/jgm/pandoc/commit/134296c54145ef8ea7de523774837055239e0b3d.patch";
+        hash = "sha256-s3v6ukoVZm8cvh9mAp0U+cQDT3p8QSu1F0oQD4Ks9F8=";
+      })
+    ];
+  }) super.pandoc;
 
   # Too strict upper bound on data-default-class (< 0.2)
   # https://github.com/stackbuilders/dotenv-hs/issues/203
@@ -942,8 +932,6 @@ with haskellLib;
   # 2022-01-29: Tests require package to be in ghc-db.
   aeson-schemas = dontCheck super.aeson-schemas;
 
-  matterhorn = doJailbreak super.matterhorn;
-
   # Too strict bounds on transformers and resourcet
   # https://github.com/alphaHeavy/lzma-conduit/issues/23 krank:ignore-line
   lzma-conduit = doJailbreak super.lzma-conduit;
@@ -972,10 +960,6 @@ with haskellLib;
 
   # Fails for non-obvious reasons while attempting to use doctest.
   focuslist = dontCheck super.focuslist;
-  search = dontCheck super.search;
-
-  # https://github.com/ekmett/structures/issues/3
-  structures = dontCheck super.structures;
 
   # ships broken Setup.hs https://github.com/facebook/Haxl/issues/165
   # https://github.com/facebook/Haxl/pull/164
@@ -991,59 +975,20 @@ with haskellLib;
 
   # Disable test suites to fix the build.
   acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw
-  aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw
-  angel = dontCheck super.angel;
-  apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw
-  app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw
-  aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing
-  binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw
   binary-search = dontCheck super.binary-search;
   bloodhound = dontCheck super.bloodhound; # https://github.com/plow-technologies/quickcheck-arbitrary-template/issues/10
-  buildwrapper = dontCheck super.buildwrapper;
-  burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw
-  cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw
-  camfort = dontCheck super.camfort;
-  cjk = dontCheck super.cjk;
-  CLI = dontCheck super.CLI; # Upstream has no issue tracker.
   command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw
-  conduit-connection = dontCheck super.conduit-connection;
-  craftwerk = dontCheck super.craftwerk;
   crc = dontCheck super.crc; # https://github.com/MichaelXavier/crc/issues/2
-  damnpacket = dontCheck super.damnpacket; # http://hydra.cryp.to/build/496923/log
-  Deadpan-DDP = dontCheck super.Deadpan-DDP; # http://hydra.cryp.to/build/496418/log/raw
-  DigitalOcean = dontCheck super.DigitalOcean;
   directory-layout = dontCheck super.directory-layout;
-  dom-selector = dontCheck super.dom-selector; # http://hydra.cryp.to/build/497670/log/raw
-  dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw
-  DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw
   ed25519 = dontCheck super.ed25519;
-  etcd = dontCheck super.etcd;
   fb = dontCheck super.fb; # needs credentials for Facebook
-  fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw
   friday-juicypixels = dontCheck super.friday-juicypixels; # tarball missing test/rgba8.png
-  ghc-events-parallel = dontCheck super.ghc-events-parallel; # http://hydra.cryp.to/build/496828/log/raw
-  ghc-imported-from = dontCheck super.ghc-imported-from;
-  ghc-parmake = dontCheck super.ghc-parmake;
-  git-vogue = dontCheck super.git-vogue;
   github-rest = dontCheck super.github-rest; # test suite needs the network
   gitlib-cmdline = dontCheck super.gitlib-cmdline;
   hackport = dontCheck super.hackport;
-  hadoop-formats = dontCheck super.hadoop-formats;
-  hashed-storage = dontCheck super.hashed-storage;
-  hashring = dontCheck super.hashring;
-  haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing
-  hdbi-postgresql = dontCheck super.hdbi-postgresql;
   hedis = dontCheck super.hedis;
-  hedis-pile = dontCheck super.hedis-pile;
-  hedis-tags = dontCheck super.hedis-tags;
-  hgdbmi = dontCheck super.hgdbmi;
-  hi = dontCheck super.hi;
-  hierarchical-clustering = dontCheck super.hierarchical-clustering;
   hlibgit2 = disableHardening [ "format" ] super.hlibgit2;
-  hmatrix-tests = dontCheck super.hmatrix-tests;
-  hquery = dontCheck super.hquery;
   hs2048 = dontCheck super.hs2048;
-  hsbencher = dontCheck super.hsbencher;
   # 2025-02-11: Too strict bounds on bytestring
   hsexif = doJailbreak (dontCheck super.hsexif);
   hspec-server = dontCheck super.hspec-server;
@@ -1054,13 +999,10 @@ with haskellLib;
     # https://github.com/skogsbaer/HTF/issues/114
     doCheck = false;
   }) super.HTF;
-  htsn = dontCheck super.htsn;
-  htsn-import = dontCheck super.htsn-import;
   http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105
   influxdb = dontCheck super.influxdb;
   integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0
   itanium-abi = dontCheck super.itanium-abi;
-  katt = dontCheck super.katt;
   language-slice = dontCheck super.language-slice;
 
   # Group of libraries by same upstream maintainer for interacting with
@@ -1076,58 +1018,28 @@ with haskellLib;
   language-tl = doJailbreak super.language-tl;
 
   ldap-client = dontCheck super.ldap-client;
-  lensref = dontCheck super.lensref;
-  lvmrun = disableHardening [ "format" ] (dontCheck super.lvmrun);
   matplotlib = dontCheck super.matplotlib;
-  milena = dontCheck super.milena;
   modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*)
-  nats-queue = dontCheck super.nats-queue;
-  network-dbus = dontCheck super.network-dbus;
-  notcpp = dontCheck super.notcpp;
-  ntp-control = dontCheck super.ntp-control;
-  odpic-raw = dontCheck super.odpic-raw; # needs a running oracle database server
   opaleye = dontCheck super.opaleye;
-  openpgp = dontCheck super.openpgp;
-  optional = dontCheck super.optional;
-  orgmode-parse = dontCheck super.orgmode-parse;
   os-release = dontCheck super.os-release;
   parameterized = dontCheck super.parameterized; # https://github.com/louispan/parameterized/issues/2
   persistent-redis = dontCheck super.persistent-redis;
-  pipes-extra = dontCheck super.pipes-extra;
   posix-pty = dontCheck super.posix-pty; # https://github.com/merijn/posix-pty/issues/12
   postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server
-  powerdns = dontCheck super.powerdns; # Tests require networking and external services
-  process-streaming = dontCheck super.process-streaming;
-  punycode = dontCheck super.punycode;
   pwstore-cli = dontCheck super.pwstore-cli;
   quantities = dontCheck super.quantities;
-  redis-io = dontCheck super.redis-io;
-  rethinkdb = dontCheck super.rethinkdb;
-  Rlang-QQ = dontCheck super.Rlang-QQ;
-  sai-shape-syb = dontCheck super.sai-shape-syb;
   # https://github.com/LeventErkok/sbv/pull/772#issuecomment-3930657736
   # SBV requires a multitude of external tools, some not packaged with nixpkgs
   # for tests to pass, users may only want to use one or two of tools.
   # maintainer recomends disabling tests
   sbv = dontCheck super.sbv;
-  scp-streams = dontCheck super.scp-streams;
   sdl2 = dontCheck super.sdl2; # the test suite needs an x server
-  separated = dontCheck super.separated;
   shadowsocks = dontCheck super.shadowsocks;
-  shake-language-c = dontCheck super.shake-language-c;
   sourcemap = dontCheck super.sourcemap;
-  static-resources = dontCheck super.static-resources;
-  svndump = dontCheck super.svndump;
   tar = dontCheck super.tar; # https://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit)
-  thumbnail-plus = dontCheck super.thumbnail-plus;
-  tickle = dontCheck super.tickle;
   tpdb = dontCheck super.tpdb;
-  translatable-intset = dontCheck super.translatable-intset;
   ua-parser = dontCheck super.ua-parser;
   unagi-chan = dontCheck super.unagi-chan;
-  WebBits = dontCheck super.WebBits; # http://hydra.cryp.to/build/499604/log/raw
-  webdriver-angular = dontCheck super.webdriver-angular;
-  xsd = dontCheck super.xsd;
 
   # Test in question times out on Hydra builders.
   grisette = overrideCabal (drv: {
@@ -1160,15 +1072,13 @@ with haskellLib;
         } super.ixset-typed
       );
 
-  # https://github.com/eli-frey/cmdtheline/issues/28
-  cmdtheline = dontCheck super.cmdtheline;
-
   # https://github.com/bos/snappy/issues/1
   # https://github.com/bos/snappy/pull/10
   snappy = dontCheck super.snappy;
 
-  # https://github.com/vincenthz/hs-crypto-pubkey/issues/20
-  crypto-pubkey = dontCheck super.crypto-pubkey;
+  # 2026-04-07: jailbreak for time 1.15
+  # https://github.com/mchav/snappy-hs/issues/2
+  snappy-hs = doJailbreak super.snappy-hs;
 
   # https://github.com/joeyadams/haskell-stm-delay/issues/3
   stm-delay = dontCheck super.stm-delay;
@@ -1181,60 +1091,25 @@ with haskellLib;
     ];
   }) super.stm-queue;
 
-  # https://github.com/pixbi/duplo/issues/25
-  duplo = doJailbreak super.duplo;
-
-  # https://github.com/evanrinehart/mikmod/issues/1
-  mikmod = addExtraLibrary pkgs.libmikmod super.mikmod;
-
   # Missing module.
   rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
-  rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6
 
   # Package exists only to be example of documentation, yet it has restrictive
   # "base" dependency.
   haddock-cheatsheet = doJailbreak super.haddock-cheatsheet;
 
-  # no haddock since this is an umbrella package.
-  cloud-haskell = dontHaddock super.cloud-haskell;
-
   # This packages compiles 4+ hours on a fast machine. That's just unreasonable.
   CHXHtml = dontDistribute super.CHXHtml;
 
-  # https://github.com/NixOS/nixpkgs/issues/6350
-  paypal-adaptive-hoops = overrideCabal (drv: {
-    testTargets = [ "local" ];
-  }) super.paypal-adaptive-hoops;
-
   # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x.
   test-framework = dontCheck super.test-framework;
 
-  # Depends on broken test-framework-quickcheck.
-  apiary = dontCheck super.apiary;
-  apiary-authenticate = dontCheck super.apiary-authenticate;
-  apiary-clientsession = dontCheck super.apiary-clientsession;
-  apiary-cookie = dontCheck super.apiary-cookie;
-  apiary-eventsource = dontCheck super.apiary-eventsource;
-  apiary-logger = dontCheck super.apiary-logger;
-  apiary-memcached = dontCheck super.apiary-memcached;
-  apiary-mongoDB = dontCheck super.apiary-mongoDB;
-  apiary-persistent = dontCheck super.apiary-persistent;
-  apiary-purescript = dontCheck super.apiary-purescript;
-  apiary-session = dontCheck super.apiary-session;
-  apiary-websockets = dontCheck super.apiary-websockets;
-
-  # https://github.com/junjihashimoto/test-sandbox-compose/issues/2
-  test-sandbox-compose = dontCheck super.test-sandbox-compose;
-
   # Test suite won't compile against tasty-hunit 0.10.x.
   binary-parsers = dontCheck super.binary-parsers;
 
   # https://github.com/ndmitchell/shake/issues/804
   shake = dontCheck super.shake;
 
-  # https://github.com/nushio3/doctest-prop/issues/1
-  doctest-prop = dontCheck super.doctest-prop;
-
   # Missing file in source distribution:
   # - https://github.com/karun012/doctest-discover/issues/22
   # - https://github.com/karun012/doctest-discover/issues/23
@@ -1252,9 +1127,6 @@ with haskellLib;
   # https://github.com/nomeata/tasty-expected-failure/issues/21
   tasty-expected-failure = dontCheck super.tasty-expected-failure;
 
-  # https://github.com/yaccz/saturnin/issues/3
-  Saturnin = dontCheck super.Saturnin;
-
   # https://github.com/kkardzis/curlhs/issues/6
   curlhs = dontCheck super.curlhs;
 
@@ -1267,69 +1139,16 @@ with haskellLib;
     "--ghc-option=-DCURL_DISABLE_TYPECHECK"
   ] super.curl;
 
-  # https://github.com/alphaHeavy/lzma-enumerator/issues/3
-  lzma-enumerator = dontCheck super.lzma-enumerator;
-
-  # FPCO's fork of Cabal won't succeed its test suite.
-  Cabal-ide-backend = dontCheck super.Cabal-ide-backend;
-
-  # This package can't be built on non-Windows systems.
-  inline-c-win32 = dontDistribute super.inline-c-win32;
-  Southpaw = dontDistribute super.Southpaw;
-
-  # https://ghc.haskell.org/trac/ghc/ticket/9825
-  vimus = overrideCabal (drv: {
-    broken = pkgs.stdenv.hostPlatform.isLinux && pkgs.stdenv.hostPlatform.isi686;
-  }) super.vimus;
-
   # 2026-02-19: too strict bounds on bytestring (<0.11) and text (<2)
   # https://github.com/theam/require/pull/31
   require = doJailbreak super.require;
 
-  # https://github.com/kazu-yamamoto/logger/issues/42
-  logger = dontCheck super.logger;
-
-  # Byte-compile elisp code for Emacs.
-  ghc-mod = overrideCabal (drv: {
-    preCheck = "export HOME=$TMPDIR";
-    testToolDepends = drv.testToolDepends or [ ] ++ [ self.cabal-install ];
-    doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335
-    executableToolDepends = drv.executableToolDepends or [ ] ++ [ pkgs.buildPackages.emacs ];
-    postInstall = ''
-      local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/*/${drv.pname}-${drv.version}/elisp" )
-      make -C $lispdir
-      mkdir -p $data/share/emacs/site-lisp
-      ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/
-    '';
-  }) super.ghc-mod;
-
   # 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2
   jwt = dontCheck super.jwt;
 
   # 2024-03-10: Getting the test suite to run requires a correctly crafted GHC_ENVIRONMENT variable.
   graphql-client = dontCheck super.graphql-client;
 
-  # Build the latest git version instead of the official release. This isn't
-  # ideal, but Chris doesn't seem to make official releases any more.
-  structured-haskell-mode = overrideCabal (drv: {
-    src = pkgs.fetchFromGitHub {
-      owner = "projectional-haskell";
-      repo = "structured-haskell-mode";
-      rev = "7f9df73f45d107017c18ce4835bbc190dfe6782e";
-      sha256 = "1jcc30048j369jgsbbmkb63whs4wb37bq21jrm3r6ry22izndsqa";
-    };
-    version = "20170205-git";
-    editedCabalFile = null;
-    # Make elisp files available at a location where people expect it. We
-    # cannot easily byte-compile these files, unfortunately, because they
-    # depend on a new version of haskell-mode that we don't have yet.
-    postInstall = ''
-      local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" )
-      mkdir -p $data/share/emacs
-      ln -s $lispdir $data/share/emacs/site-lisp
-    '';
-  }) super.structured-haskell-mode;
-
   # Make elisp files available at a location where people expect it.
   hindent = (
     overrideCabal (drv: {
@@ -1346,42 +1165,10 @@ with haskellLib;
   # https://github.com/basvandijk/concurrent-extra/issues/12
   concurrent-extra = dontCheck super.concurrent-extra;
 
-  # https://github.com/pxqr/base32-bytestring/issues/4
-  base32-bytestring = dontCheck super.base32-bytestring;
-
   # Too strict bounds on bytestring (<0.12) on the test suite
   # https://github.com/emilypi/Base32/issues/24
   base32 = doJailbreak super.base32;
 
-  # https://github.com/Philonous/hs-stun/pull/1
-  # Remove if a version > 0.1.0.1 ever gets released.
-  stunclient = overrideCabal (drv: {
-    postPatch = (drv.postPatch or "") + ''
-      substituteInPlace source/Network/Stun/MappedAddress.hs --replace "import Network.Endian" ""
-    '';
-  }) super.stunclient;
-
-  d-bus =
-    let
-      # The latest release on hackage is missing necessary patches for recent compilers
-      # https://github.com/Philonous/d-bus/issues/24
-      newer = overrideSrc {
-        version = "unstable-2021-01-08";
-        src = pkgs.fetchFromGitHub {
-          owner = "Philonous";
-          repo = "d-bus";
-          rev = "fb8a948a3b9d51db618454328dbe18fb1f313c70";
-          hash = "sha256-R7/+okb6t9DAkPVUV70QdYJW8vRcvBdz4zKJT13jb3A=";
-        };
-      } super.d-bus;
-      # Add now required extension on recent compilers.
-      # https://github.com/Philonous/d-bus/pull/23
-    in
-    appendPatch (fetchpatch {
-      url = "https://github.com/Philonous/d-bus/commit/e5f37900a3a301c41d98bdaa134754894c705681.patch";
-      sha256 = "6rQ7H9t483sJe1x95yLPAZ0BKTaRjgqQvvrQv7HkJRE=";
-    }) newer;
-
   # * The standard libraries are compiled separately.
   # * We need a few patches from master to fix compilation with
   #   updated dependencies which can be
@@ -1422,13 +1209,6 @@ with haskellLib;
   # https://github.com/danidiaz/tailfile-hinotify/issues/2
   tailfile-hinotify = doJailbreak (dontCheck super.tailfile-hinotify);
 
-  # Test suite fails: https://github.com/lymar/hastache/issues/46.
-  # Don't install internal mkReadme tool.
-  hastache = overrideCabal (drv: {
-    doCheck = false;
-    postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
-  }) super.hastache;
-
   # 2025-09-01: Merged patch from upstream to fix bounds:
   optics = appendPatch (fetchpatch {
     name = "optics-fix-inspection-testing-bound";
@@ -1440,17 +1220,8 @@ with haskellLib;
   # 2025-02-10: Too strict bounds on text < 2.1
   digestive-functors-blaze = doJailbreak super.digestive-functors-blaze;
 
-  # Wrap the generated binaries to include their run-time dependencies in
-  # $PATH. Also, cryptol needs a version of sbl that's newer than what we have
-  # in LTS-13.x.
-  cryptol = overrideCabal (drv: {
-    buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
-    postInstall = drv.postInstall or "" + ''
-      for b in $out/bin/cryptol $out/bin/cryptol-html; do
-        wrapProgram $b --prefix 'PATH' ':' "${lib.getBin pkgs.z3}/bin"
-      done
-    '';
-  }) super.cryptol;
+  # Too strict bound on QuickCheck <2.15
+  hgmp = doJailbreak super.hgmp;
 
   # Z3 removed aliases for boolean types in 4.12
   inherit
@@ -1477,26 +1248,12 @@ with haskellLib;
   # Work around https://github.com/haskell/c2hs/issues/192.
   c2hs = dontCheck super.c2hs;
 
-  # Needs pginit to function and pgrep to verify.
-  tmp-postgres = overrideCabal (drv: {
-    # Flaky tests: https://github.com/jfischoff/tmp-postgres/issues/274
-    doCheck = false;
-
-    preCheck = ''
-      export HOME="$TMPDIR"
-    ''
-    + (drv.preCheck or "");
-    libraryToolDepends = drv.libraryToolDepends or [ ] ++ [ pkgs.buildPackages.postgresql ];
-    testToolDepends = drv.testToolDepends or [ ] ++ [ pkgs.procps ];
-  }) super.tmp-postgres;
+  # Flaky tests: https://github.com/jfischoff/tmp-postgres/issues/274
+  tmp-postgres = dontCheck super.tmp-postgres;
 
   # Needs QuickCheck <2.10, which we don't have.
   edit-distance = doJailbreak super.edit-distance;
 
-  # With ghc-8.2.x haddock would time out for unknown reason
-  # See https://github.com/haskell/haddock/issues/679
-  language-puppet = dontHaddock super.language-puppet;
-
   # https://github.com/alphaHeavy/protobuf/issues/34
   protobuf = dontCheck super.protobuf;
 
@@ -1506,10 +1263,6 @@ with haskellLib;
     preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
   }) super.alex;
 
-  # Compiles some C or C++ source which requires these headers
-  VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator;
-  vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils;
-
   # Generate cli completions for dhall.
   dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall;
   # 2025-01-27: allow aeson >= 2.2, 9.8 versions of text and bytestring
@@ -1539,11 +1292,11 @@ with haskellLib;
   # The test suite runs for 20+ minutes on a very fast machine, which feels kinda disproportionate.
   prettyprinter = dontCheck super.prettyprinter;
 
-  # Fix with Cabal 2.2, https://github.com/guillaume-nargeot/hpc-coveralls/pull/73
-  hpc-coveralls = appendPatch (fetchpatch {
-    url = "https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch";
-    sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j";
-  }) super.hpc-coveralls;
+  hpc-codecov = overrideCabal (drv: {
+    # Work around test suite race condition due to tasty >= 1.5.4
+    # https://github.com/8c6794b6/hpc-codecov/issues/52
+    testFlags = drv.testFlags or [ ] ++ [ "-j1" ];
+  }) super.hpc-codecov;
 
   # sexpr is old, broken and has no issue-tracker. Let's fix it the best we can.
   sexpr = appendPatch ./patches/sexpr-0.2.1.patch (
@@ -1553,9 +1306,6 @@ with haskellLib;
     }) super.sexpr
   );
 
-  # https://github.com/haskell/hoopl/issues/50
-  hoopl = dontCheck super.hoopl;
-
   # TODO(Profpatsch): factor out local nix store setup from
   # lib/tests/release.nix and use that for the tests of libnix
   # libnix = overrideCabal (old: {
@@ -1569,9 +1319,6 @@ with haskellLib;
   # 2025-02-10: Too strict bounds on aeson < 1.5
   json-alt = doJailbreak super.json-alt;
 
-  # https://github.com/mgajda/json-autotype/issues/25
-  json-autotype = dontCheck super.json-autotype;
-
   gargoyle-postgresql-nix = addBuildTool [ pkgs.postgresql ] super.gargoyle-postgresql-nix;
 
   # PortMidi needs an environment variable to have ALSA find its plugins:
@@ -1612,13 +1359,8 @@ with haskellLib;
   xattr = appendPatch ./patches/xattr-fix-build.patch super.xattr;
 
   # Requires API keys to run tests
-  algolia = dontCheck super.algolia;
   openai-hs = dontCheck super.openai-hs;
 
-  # antiope-s3's latest stackage version has a hspec < 2.6 requirement, but
-  # hspec which isn't in stackage is already past that
-  antiope-s3 = doJailbreak super.antiope-s3;
-
   # Has tasty < 1.2 requirement, but works just fine with 1.2
   temporary-resourcet = doJailbreak super.temporary-resourcet;
 
@@ -1626,9 +1368,6 @@ with haskellLib;
   # https://github.com/pruvisto/heap/issues/11
   heap = dontCheck super.heap;
 
-  # Test suite won't link for no apparent reason.
-  constraints-deriving = dontCheck super.constraints-deriving;
-
   # https://github.com/erikd/hjsmin/issues/32
   hjsmin = dontCheck super.hjsmin;
 
@@ -1638,9 +1377,6 @@ with haskellLib;
   # https://github.com/kazu-yamamoto/dns/issues/150
   dns = dontCheck super.dns;
 
-  # https://github.com/haskell-servant/servant-ekg/issues/15
-  servant-ekg = doJailbreak super.servant-ekg;
-
   # it wants to build a statically linked binary by default
   hledger-flow = overrideCabal (drv: {
     postPatch = (drv.postPatch or "") + ''
@@ -1704,13 +1440,21 @@ with haskellLib;
   ];
 
   # Unreleased patch fixing compilation with text >= 2.1.2
-  dom-parser = appendPatches [
-    (pkgs.fetchpatch {
-      name = "dom-parser-text-2.1.2.patch";
-      url = "https://github.com/typeable/dom-parser/commit/b8d9af75595072026a1706e94750dba55e65326b.patch";
-      hash = "sha256-c7ea0YCtXhv4u+pTuxcWoISa+yV2oEtxS/RmC6Bbx1M=";
-    })
-  ] super.dom-parser;
+  dom-parser =
+    appendPatches
+      [
+        (pkgs.fetchpatch {
+          name = "dom-parser-text-2.1.2.patch";
+          url = "https://github.com/typeable/dom-parser/commit/b8d9af75595072026a1706e94750dba55e65326b.patch";
+          hash = "sha256-c7ea0YCtXhv4u+pTuxcWoISa+yV2oEtxS/RmC6Bbx1M=";
+        })
+      ]
+      (
+        overrideCabal {
+          revision = null;
+          editedCabalFile = null;
+        } super.dom-parser
+      );
 
   # Requires jsaddle-webkit2gtk to build outside of pkgsCross.ghcjs
   # which requires a version of libsoup that's marked as insecure
@@ -1718,20 +1462,6 @@ with haskellLib;
   reflex-localize-dom = dontDistribute super.reflex-localize-dom;
   trasa-reflex = dontDistribute super.trasa-reflex;
 
-  # https://github.com/ghcjs/jsaddle/pull/160/
-  jsaddle = appendPatch (fetchpatch {
-    name = "fix-on-firefox.patch";
-    url = "https://github.com/ghcjs/jsaddle/commit/71ef7f0cbc60a380ba0dc299e758c8f90cc4b526.patch";
-    relative = "jsaddle";
-    sha256 = "sha256-IBOX74r+lyywVWp0ZucoseeevFrGiInkq7V6RoWADNU=";
-  }) super.jsaddle;
-  jsaddle-warp = appendPatch (fetchpatch {
-    name = "fix-on-firefox.patch";
-    url = "https://github.com/ghcjs/jsaddle/commit/71ef7f0cbc60a380ba0dc299e758c8f90cc4b526.patch";
-    relative = "jsaddle-warp";
-    sha256 = "sha256-jYEUOkP4Kv3yBjo3SbN7sruV+T5R5XWbRFcCUAa6HvE=";
-  }) super.jsaddle-warp;
-
   # https://github.com/ghcjs/jsaddle/issues/151
   jsaddle-webkit2gtk =
     overrideCabal
@@ -1791,12 +1521,6 @@ with haskellLib;
   # See: https://github.com/robstewart57/rdf4h/issues/39
   rdf4h = dontCheck super.rdf4h;
 
-  # Fixed upstream but not released to Hackage yet:
-  # https://github.com/k0001/hs-libsodium/issues/2
-  libsodium = overrideCabal (drv: {
-    libraryToolDepends = (drv.libraryToolDepends or [ ]) ++ [ self.buildHaskellPackages.c2hs ];
-  }) super.libsodium;
-
   svgcairo = overrideCabal (drv: {
     patches = drv.patches or [ ] ++ [
       # Remove when https://github.com/gtk2hs/svgcairo/pull/12 goes in.
@@ -1817,19 +1541,6 @@ with haskellLib;
   # Too strict upper bound on tasty-hedgehog (<1.5)
   # https://github.com/typeclasses/ascii-predicates/pull/1
   ascii-predicates = doJailbreak super.ascii-predicates;
-  ascii-numbers = doJailbreak super.ascii-numbers;
-
-  # Upstream PR: https://github.com/jkff/splot/pull/9
-  splot = appendPatch (fetchpatch {
-    url = "https://github.com/jkff/splot/commit/a6710b05470d25cb5373481cf1cfc1febd686407.patch";
-    sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63";
-  }) super.splot;
-
-  # Support ansi-terminal 1.1: https://github.com/facebookincubator/retrie/pull/73
-  retrie = appendPatch (fetchpatch {
-    url = "https://github.com/facebookincubator/retrie/commit/b0df07178133b5b049e3e7764acba0e5e3fa57af.patch";
-    sha256 = "sha256-Ea/u6PctSxy4h8VySjOwD2xW3TbwY1qE49dG9Av1SbQ=";
-  }) super.retrie;
 
   # Fails with encoding problems, likely needs locale data.
   # Test can be executed by adding which to testToolDepends and
@@ -1926,14 +1637,6 @@ with haskellLib;
       ])
     ];
 
-  # Raise version bounds: https://github.com/idontgetoutmuch/binary-low-level/pull/16
-  binary-strict = appendPatches [
-    (fetchpatch {
-      url = "https://github.com/idontgetoutmuch/binary-low-level/pull/16/commits/c16d06a1f274559be0dea0b1f7497753e1b1a8ae.patch";
-      sha256 = "sha256-deSbudy+2je1SWapirWZ1IVWtJ0sJVR5O/fnaAaib2g=";
-    })
-  ] super.binary-strict;
-
   # The tests for semver-range need to be updated for the MonadFail change in
   # ghc-8.8:
   # https://github.com/adnelson/semver-range/issues/15
@@ -1945,9 +1648,6 @@ with haskellLib;
   # 2024-09-18: transformers <0.5  https://github.com/reflex-frp/reflex-gloss/issues/6
   reflex-gloss = warnAfterVersion "0.2" (doJailbreak super.reflex-gloss);
 
-  # 2024-09-18: primitive <0.8  https://gitlab.com/Kritzefitz/reflex-gi-gtk/-/merge_requests/20
-  reflex-gi-gtk = warnAfterVersion "0.2.0.1" (doJailbreak super.reflex-gi-gtk);
-
   # Due to tests restricting base in 0.8.0.0 release
   http-media = doJailbreak super.http-media;
 
@@ -2029,20 +1729,36 @@ with haskellLib;
     "--ghc-option=-fno-safe-haskell"
     "--haddock-option=--optghc=-fno-safe-haskell"
   ] (doJailbreak super.util); # unmaintained
-  category = appendConfigureFlags [
-    "--ghc-option=-fno-safe-haskell"
-    "--haddock-option=--optghc=-fno-safe-haskell"
-  ] super.category;
-  alg = appendConfigureFlags [
-    "--ghc-option=-fno-safe-haskell"
-    "--haddock-option=--optghc=-fno-safe-haskell"
-  ] super.alg;
 
   # Test suite fails, upstream not reachable for simple fix (not responsive on github)
   vivid-supercollider = dontCheck super.vivid-supercollider;
 
-  # Test suite does not compile.
-  feed = dontCheck super.feed;
+  # Test suite `readme` does not compile.
+  # https://github.com/haskell-party/feed/issues/77
+  # `readme-doctests` are also broken (can't find a variety of imports)
+  feed = overrideCabal {
+    buildTarget = "tests";
+    testTargets = [ "tests" ];
+    jailbreak = true;
+  } super.feed;
+
+  # 2026-04-14: Apache Iceberg not included in pkgs.duckdb and not packaged
+  beam-duckdb = overrideCabal (drv: {
+    testFlags = (drv.testFlags or [ ]) ++ [
+      "--pattern"
+      "!/Iceberg/"
+    ];
+  }) super.beam-duckdb;
+
+  # 2026-03-25: one test fails
+  # https://github.com/Tritlo/duckdb-haskell/issues/8
+  # TODO: remove after PR https://github.com/Tritlo/duckdb-haskell/pull/9 is merged
+  duckdb-ffi = overrideCabal (drv: {
+    testFlags = (drv.testFlags or [ ]) ++ [
+      "--pattern"
+      "!/bind every supported value type/"
+    ];
+  }) super.duckdb-ffi;
 
   spacecookie = overrideCabal (old: {
     buildTools = (old.buildTools or [ ]) ++ [ pkgs.buildPackages.installShellFiles ];
@@ -2071,15 +1787,9 @@ with haskellLib;
   # test suite doesn't compile anymore due to changed hunit/tasty APIs
   fullstop = dontCheck super.fullstop;
 
-  # * doctests don't work without cabal
-  #   https://github.com/noinia/hgeometry/issues/132
   # * Too strict version bound on vector-builder
   #   https://github.com/noinia/hgeometry/commit/a6abecb1ce4a7fd96b25cc1a5c65cd4257ecde7a#commitcomment-49282301
-  hgeometry-combinatorial = dontCheck (doJailbreak super.hgeometry-combinatorial);
-
-  # Too strict bounds on containers
-  # https://github.com/jswebtools/language-ecmascript-analysis/issues/1
-  language-ecmascript-analysis = doJailbreak super.language-ecmascript-analysis;
+  hgeometry-combinatorial = doJailbreak super.hgeometry-combinatorial;
 
   cli-git = addBuildTool pkgs.git super.cli-git;
 
@@ -2092,17 +1802,9 @@ with haskellLib;
   # list `modbus` in librarySystemDepends, correct to `libmodbus`
   libmodbus = doJailbreak (addExtraLibrary pkgs.libmodbus super.libmodbus);
 
-  # Missing test files in sdist tarball:
-  # https://gitlab.com/dpwiz/geomancy-layout/-/issues/1
-  geomancy-layout = dontCheck super.geomancy-layout;
-
   # 2025-02-11: Too strict bounds on base < 4.19, bytestring < 0.12, tasty < 1.5, tasty-quickcheck < 0.11
   blake2 = doJailbreak super.blake2;
 
-  # Test suite doesn't support base16-bytestring >= 1.0
-  # https://github.com/serokell/haskell-crypto/issues/25
-  crypto-sodium = dontCheck super.crypto-sodium;
-
   # 2021-04-09: too strict time bound
   # PR pending https://github.com/zohl/cereal-time/pull/2
   cereal-time = doJailbreak super.cereal-time;
@@ -2183,19 +1885,6 @@ with haskellLib;
   # https://github.com/minimapletinytools/linear-tests/issues/1
   linear-tests = dontCheck super.linear-tests;
 
-  # 2024-09-18: Make compatible with haskell-gi 0.26.10
-  # https://github.com/owickstrom/gi-gtk-declarative/pull/118
-  gi-gtk-declarative = warnAfterVersion "0.7.1" (
-    overrideCabal (drv: {
-      jailbreak = true;
-      postPatch = ''
-        sed -i '1 i {-# LANGUAGE FlexibleContexts #-}' \
-          src/GI/Gtk/Declarative/Widget/Conversions.hs
-      '';
-    }) super.gi-gtk-declarative
-  );
-  gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple;
-
   # 2023-04-09: haskell-ci needs Cabal-syntax 3.10
   # 2024-03-21: pins specific version of ShellCheck
   # 2025-03-10: jailbreak, https://github.com/haskell-CI/haskell-ci/issues/771
@@ -2231,15 +1920,6 @@ with haskellLib;
     }
   );
 
-  # Disable flaky tests
-  # https://github.com/DavidEichmann/alpaca-netcode/issues/2
-  alpaca-netcode = overrideCabal {
-    testFlags = [
-      "--pattern"
-      "!/[NOCI]/"
-    ];
-  } super.alpaca-netcode;
-
   # 2021-05-22: Tests fail sometimes (even consistently on hydra)
   # when running a fs-related test with >= 12 jobs. To work around
   # this, run tests with only a single job.
@@ -2272,9 +1952,6 @@ with haskellLib;
   # https://github.com/hadolint/hadolint/issues/1127
   hadolint = doJailbreak super.hadolint;
 
-  # test suite requires stack to run, https://github.com/dino-/photoname/issues/24
-  photoname = dontCheck super.photoname;
-
   # Too strict bounds on
   # QuickCheck (<2.15): https://github.com/kapralVV/Unique/issues/12
   # hashable (<1.5): https://github.com/kapralVV/Unique/issues/11#issuecomment-3088832168
@@ -2295,44 +1972,7 @@ with haskellLib;
     }) super.aeson-casing
   );
 
-  # https://github.com/emc2/HUnit-Plus/issues/26
-  HUnit-Plus = dontCheck super.HUnit-Plus;
-  # https://github.com/ewestern/haskell-postgis/issues/7
-  haskell-postgis = overrideCabal (drv: {
-    testFlags = [
-      "--skip"
-      "/Geo/Hexable/Encodes a linestring/"
-    ]
-    ++ drv.testFlags or [ ];
-  }) super.haskell-postgis;
-  # https://github.com/ChrisPenner/json-to-haskell/issues/5
-  json-to-haskell = overrideCabal (drv: {
-    testFlags = [
-      "--match"
-      "/should sanitize weird field and record names/"
-    ]
-    ++ drv.testFlags or [ ];
-  }) super.json-to-haskell;
-  # https://github.com/fieldstrength/aeson-deriving/issues/5
-  aeson-deriving = dontCheck super.aeson-deriving;
-
   drunken-bishop = doJailbreak super.drunken-bishop;
-  # https://github.com/SupercedeTech/dropbox-client/issues/1
-  dropbox = overrideCabal (drv: {
-    testFlags = [
-      "--skip"
-      "/Dropbox/Dropbox aeson aeson/encodes list folder correctly/"
-    ]
-    ++ drv.testFlags or [ ];
-  }) super.dropbox;
-  # https://github.com/alonsodomin/haskell-schema/issues/11
-  hschema-aeson = overrideCabal (drv: {
-    testFlags = [
-      "--skip"
-      "/toJsonSerializer/should generate valid JSON/"
-    ]
-    ++ drv.testFlags or [ ];
-  }) super.hschema-aeson;
   # https://github.com/minio/minio-hs/issues/165
   # https://github.com/minio/minio-hs/pull/191 Use crypton-connection instead of unmaintained connection
   minio-hs = overrideCabal (drv: {
@@ -2355,9 +1995,6 @@ with haskellLib;
     ];
   }) (super.minio-hs.override { connection = self.crypton-connection; });
 
-  # Invalid CPP in test suite: https://github.com/cdornan/memory-cd/issues/1
-  memory-cd = dontCheck super.memory-cd;
-
   fgl-arbitrary = doJailbreak super.fgl-arbitrary;
 
   # raaz-0.3 onwards uses backpack and it does not play nicely with
@@ -2377,18 +2014,6 @@ with haskellLib;
     else
       super.cryptohash-sha256;
 
-  # https://github.com/andreymulik/sdp/issues/3
-  sdp = disableLibraryProfiling super.sdp;
-  sdp-binary = disableLibraryProfiling super.sdp-binary;
-  sdp-deepseq = disableLibraryProfiling super.sdp-deepseq;
-  sdp-hashable = disableLibraryProfiling super.sdp-hashable;
-  sdp-io = disableLibraryProfiling super.sdp-io;
-  sdp-quickcheck = disableLibraryProfiling super.sdp-quickcheck;
-  sdp4bytestring = disableLibraryProfiling super.sdp4bytestring;
-  sdp4text = disableLibraryProfiling super.sdp4text;
-  sdp4unordered = disableLibraryProfiling super.sdp4unordered;
-  sdp4vector = disableLibraryProfiling super.sdp4vector;
-
   # Fixes compilation with GHC 9.0 and above
   # https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3
   regex-compat-tdfa =
@@ -2423,12 +2048,6 @@ with haskellLib;
   # https://github.com/andrewufrank/uniform-fileio/issues/2
   uniform-fileio = dontCheck super.uniform-fileio;
 
-  # Waiting on https://github.com/mastratisi/railroad/commit/3fc1360ebec6337de3115968660361b1b7e92f0b
-  railroad = lib.pipe super.railroad [
-    (warnAfterVersion "0.1.1.1")
-    doJailbreak
-  ];
-
   # The shipped Setup.hs file is broken.
   csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv;
 
@@ -2528,6 +2147,12 @@ with haskellLib;
   # 2025-01-07: unreleased upstream supports hedgehog 1.5 but drifted quite a bit from hackage revisions so hard to patch
   hw-hspec-hedgehog = doJailbreak super.hw-hspec-hedgehog;
 
+  # 2026-04-19: Too strict upper bound on doctest (excluding 0.24)
+  # https://github.com/haskell-works/hw-hedgehog/issues/51
+  hw-hedgehog = doJailbreak super.hw-hedgehog;
+  # https://github.com/haskell-works/hw-string-parse/issues/43
+  hw-string-parse = doJailbreak super.hw-string-parse;
+
   # 2025-09-03: allow QuickCheck 2.15
   # https://github.com/haskell-works/hw-prim/issues/150
   hw-prim = lib.pipe super.hw-prim [
@@ -2535,13 +2160,74 @@ with haskellLib;
     doJailbreak
   ];
 
-  # Test suite doesn't support hspec 2.8
-  # https://github.com/zellige/hs-geojson/issues/29
-  geojson = dontCheck super.geojson;
+  # too strict bounds on extra < 1.8
+  # https://github.com/georgefst/svgone/pull/3
+  svgone = doJailbreak super.svgone;
 
-  # Test data missing from sdist
-  # https://github.com/ngless-toolkit/ngless/issues/152
-  NGLess = dontCheck super.NGLess;
+  # 2026-01-06: unbreak and modernize to GHC 9.10.3
+  reanimate-svg = overrideCabal (drv: {
+    # patching doesn't actually move files, need to do manually
+    prePatch = ''
+      # Move tests marked good due to previous librsvg failures
+      for f in \
+      animate-elem-32-t.svg \
+      fonts-desc-02-t.svg \
+      shapes-ellipse-02-t.svg \
+      shapes-intro-01-t.svg \
+      styling-css-06-b.svg \
+      text-intro-05-t.svg \
+      ; do
+      mv test/good/$f test/bad/$f
+      done
+
+      # Move tests previously marked bad but now fixed from new changes
+      for f in \
+      filters-displace-02-f.svg \
+      filters-gauss-01-b.svg \
+      masking-mask-01-b.svg \
+      painting-render-01-b.svg \
+      pservers-grad-04-b.svg \
+      pservers-grad-05-b.svg \
+      pservers-grad-07-b.svg \
+      pservers-grad-08-b.svg \
+      pservers-grad-09-b.svg \
+      pservers-grad-10-b.svg \
+      pservers-grad-11-b.svg \
+      pservers-grad-12-b.svg \
+      pservers-grad-14-b.svg \
+      pservers-grad-15-b.svg \
+      pservers-grad-16-b.svg \
+      pservers-grad-22-b.svg \
+      ; do
+      mv test/bad/$f test/good/$f
+      done
+    '';
+    patches = (drv.patches or [ ]) ++ [
+      (pkgs.fetchpatch2 {
+        name = "modernize-to-ghc-9.10.3-and-regress-tests-wrt-librsvg";
+        url = "https://github.com/reanimate/reanimate-svg/commit/3f2fab8eb08b7f35b03f5fa17819e43e3879ea80.patch";
+        sha256 = "sha256-Em10QyAAiIwHId3CZuByKJ4Fv9W6MII4go5rychg07Y=";
+      })
+    ];
+  }) super.reanimate-svg;
+
+  # 2026-01-06: modernize to GHC 9.10.3
+  reanimate = overrideCabal (drv: {
+    # file in Hackage but not on github, need to remove here
+    # test relies on hegometry but that was removed as a dependency
+    # https://github.com/reanimate/reanimate/commit/f58a00e
+    prePatch = drv.prePatch or "" + ''
+      rm -f examples/decompose.hs
+    '';
+    patches = (drv.patches or [ ]) ++ [
+      # variant of PR https://github.com/reanimate/reanimate/pull/317
+      (pkgs.fetchpatch2 {
+        name = "modernize-to-ghc-9.10.3";
+        url = "https://github.com/reanimate/reanimate/commit/273f48c2b82dcfa027481133a6a606e73a22461b.patch";
+        sha256 = "sha256-aibbIoc54I4Ibg6t2o8vykL8MqzmxLvayUNa8MiibEw=";
+      })
+    ];
+  }) super.reanimate;
 
   # Too strict bound on network (<3.2)
   hookup =
@@ -2578,22 +2264,6 @@ with haskellLib;
     sha256 = "sha256-CDd/vvlRq1cldyH+qsJVNMiwViqKVSosr9A0ilv2gLM";
   }) (doJailbreak super.failure);
 
-  # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20)
-  polynomial =
-    appendPatch
-      (fetchpatch {
-        name = "haskell-polynomial.20.patch";
-        url = "https://github.com/mokus0/polynomial/pull/20.diff";
-        sha256 = "1bwivimpi2hiil3zdnl5qkds1inyn239wgxbn3y8l2pwyppnnfl0";
-      })
-      (
-        overrideCabal (drv: {
-          revision = null;
-          editedCabalFile = null;
-          doCheck = false; # Source dist doesn't include the checks
-        }) super.polynomial
-      );
-
   # lucid-htmx has restrictive upper bounds on lucid and servant:
   #
   #   Setup: Encountered missing or private dependencies:
@@ -2641,12 +2311,9 @@ with haskellLib;
     testTargets = [ "regex-tdfa-unittest" ];
   } super.regex-tdfa;
 
-  # Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1
-  xdg-basedir-compliant = dontCheck super.xdg-basedir-compliant;
-
   # Test failure after libxcrypt migration, reported upstream at
   # https://github.com/phadej/crypt-sha512/issues/13
-  crypt-sha512 = dontCheck super.crypt-sha512;
+  crypt-sha512 = dontCheck (doJailbreak super.crypt-sha512);
 
   # Latest release depends on crypton-connection ==0.3.2 https://github.com/ndmitchell/hoogle/issues/435
   hoogle = overrideSrc {
@@ -2718,9 +2385,6 @@ with haskellLib;
   # containers <0.6, semigroupoids <5.3
   data-lens = doJailbreak super.data-lens;
 
-  # hashable <1.4, mmorph <1.2
-  composite-aeson = doJailbreak super.composite-aeson;
-
   hashable = lib.pipe super.hashable [
     # Big-endian POWER:
     # Test suite xxhash-tests: RUNNING...
@@ -2770,9 +2434,6 @@ with haskellLib;
   # https://github.com/phadej/aeson-extra/issues/62
   aeson-extra = doJailbreak super.aeson-extra;
 
-  # composite-aeson <0.8, composite-base <0.8
-  compdoc = doJailbreak super.compdoc;
-
   # composite-aeson <0.8, composite-base <0.8
   haskell-coffee = doJailbreak super.haskell-coffee;
 
@@ -2792,9 +2453,6 @@ with haskellLib;
   # unix-compat <0.5
   hxt-cache = doJailbreak super.hxt-cache;
 
-  # QuickCheck <2.14
-  term-rewriting = doJailbreak super.term-rewriting;
-
   # tests can't find the test binary anymore - parseargs-example
   parseargs = dontCheck super.parseargs;
 
@@ -2810,8 +2468,6 @@ with haskellLib;
     })
   ] super.heist;
 
-  tailwind = doJailbreak super.tailwind; # base <=4.17.0.0
-
   # 2025-09-03: Disable tests until this is solved:
   # https://github.com/clash-lang/ghc-typelits-extra/issues/60
   ghc-typelits-extra = lib.pipe super.ghc-typelits-extra [
@@ -2828,10 +2484,6 @@ with haskellLib;
   # which Stackage LTS won't update to, but we can.
   ghc-typelits-natnormalise = doDistribute self.ghc-typelits-natnormalise_0_7_12;
 
-  # Test files missing from sdist
-  # https://github.com/tweag/webauthn/issues/166
-  webauthn = dontCheck super.webauthn;
-
   # calls ghc in tests
   # https://github.com/brandonchinn178/tasty-autocollect/issues/54
   tasty-autocollect = dontCheck super.tasty-autocollect;
@@ -2886,6 +2538,9 @@ with haskellLib;
   # Too strict bounds on hspec < 2.11
   fuzzyset_0_2_4 = doJailbreak super.fuzzyset_0_2_4;
 
+  # 2026-04-27 too strict bounds on thread-utils-context < 0.4
+  # https://github.com/iand675/hs-opentelemetry/issues/218
+  hs-opentelemetry-api = doJailbreak super.hs-opentelemetry-api;
   # The following all have too strict bounds on hs-opentelemtry-api < 0.3
   # https://github.com/iand675/hs-opentelemetry/issues/203
   hs-opentelemetry-exporter-handle = doJailbreak super.hs-opentelemetry-exporter-handle;
@@ -2910,14 +2565,6 @@ with haskellLib;
   # libfuse3 fails to mount fuse file systems within the build environment
   libfuse3 = dontCheck super.libfuse3;
 
-  # Merged upstream, but never released. Allows both intel and aarch64 darwin to build.
-  # https://github.com/vincenthz/hs-gauge/pull/106
-  gauge = appendPatch (pkgs.fetchpatch {
-    name = "darwin-aarch64-fix.patch";
-    url = "https://github.com/vincenthz/hs-gauge/commit/3d7776f41187c70c4f0b4517e6a7dde10dc02309.patch";
-    hash = "sha256-4osUMo0cvTvyDTXF8lY9tQbFqLywRwsc3RkHIhqSriQ=";
-  }) super.gauge;
-
   # The hackage source is somehow missing a file present in the repo (tests/ListStat.hs).
   sym = dontCheck super.sym;
 
@@ -2941,9 +2588,6 @@ with haskellLib;
   # Too strict bounds on base
   kewar = doJailbreak super.kewar;
 
-  # Tests rely on (missing) submodule
-  unleash-client-haskell-core = dontCheck super.unleash-client-haskell-core;
-
   # Workaround for Cabal failing to find nonexistent SDL2 library?!
   # https://github.com/NixOS/nixpkgs/issues/260863
   sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx;
@@ -2978,21 +2622,6 @@ with haskellLib;
     doJailbreak
   ];
 
-  # Use recent git version as the hackage version is outdated and not building on recent GHC versions
-  haskell-to-elm = overrideSrc {
-    version = "unstable-2023-12-02";
-    src = pkgs.fetchFromGitHub {
-      owner = "haskell-to-elm";
-      repo = "haskell-to-elm";
-      rev = "52ab086a320a14051aa38d0353d957fb6b2525e9";
-      hash = "sha256-j6F4WplJy7NyhTAuiDd/tHT+Agk1QdyPjOEkceZSxq8=";
-    };
-  } super.haskell-to-elm;
-
-  # Overly strict upper bounds on esqueleto
-  # https://github.com/jonschoning/espial/issues/61
-  espial = doJailbreak super.espial;
-
   # https://github.com/isovector/type-errors/issues/9
   type-errors = dontCheck super.type-errors;
 
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 0c6c30554097..9d679a00f809 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -16,17 +16,17 @@ self: super:
     # see: https://github.com/psibi/shell-conduit/issues/12
     shell-conduit = dontCheck super.shell-conduit;
 
-    conduit-extra = super.conduit-extra.overrideAttrs (drv: {
+    conduit-extra = overrideCabal (drv: {
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.conduit-extra;
 
-    spacecookie = super.spacecookie.overrideAttrs (_: {
+    spacecookie = overrideCabal (_: {
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.spacecookie;
 
-    streaming-commons = super.streaming-commons.overrideAttrs (_: {
+    streaming-commons = overrideCabal (_: {
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.streaming-commons;
 
     # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
     hakyll = overrideCabal {
@@ -136,11 +136,11 @@ self: super:
 
     sym = markBroken super.sym;
 
-    yesod-core = super.yesod-core.overrideAttrs (drv: {
+    yesod-core = overrideCabal (drv: {
       # Allow access to local networking when the Darwin sandbox is enabled, so yesod-core can
       # run tests that access localhost.
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.yesod-core;
 
     hidapi = super.hidapi.override { systemd = null; };
 
@@ -236,11 +236,11 @@ self: super:
     # Otherwise impure gcc is used, which is Apple's weird wrapper
     c2hsc = addTestToolDepends [ pkgs.gcc ] super.c2hsc;
 
-    http2 = super.http2.overrideAttrs (drv: {
+    http2 = overrideCabal (drv: {
       # Allow access to local networking when the Darwin sandbox is enabled, so http2 can run tests
       # that access localhost.
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.http2;
 
     # https://hydra.nixos.org/build/230964714/nixlog/1
     inline-c-cpp = appendPatch (pkgs.fetchpatch {
@@ -254,29 +254,49 @@ self: super:
     # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112
     zip = dontCheck super.zip;
 
-    http-streams = super.http-streams.overrideAttrs (drv: {
+    dap = overrideCabal (drv: {
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.dap;
 
-    io-streams = super.io-streams.overrideAttrs (drv: {
+    essence-of-live-coding-warp = overrideCabal (drv: {
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.essence-of-live-coding-warp;
 
-    io-streams-haproxy = super.io-streams-haproxy.overrideAttrs (drv: {
+    http-streams = overrideCabal (drv: {
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.http-streams;
 
-    openssl-streams = super.openssl-streams.overrideAttrs (drv: {
+    io-streams = overrideCabal (drv: {
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.io-streams;
 
-    snap = super.snap.overrideAttrs (drv: {
+    io-streams-haproxy = overrideCabal (drv: {
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.io-streams-haproxy;
 
-    warp = super.warp.overrideAttrs (drv: {
+    jsaddle-warp = overrideCabal (drv: {
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.jsaddle-warp;
+
+    openssl-streams = overrideCabal (drv: {
+      __darwinAllowLocalNetworking = true;
+    }) super.openssl-streams;
+
+    servant-auth-client = overrideCabal (drv: {
+      __darwinAllowLocalNetworking = true;
+    }) super.servant-auth-client;
+
+    servant-client = overrideCabal (drv: {
+      __darwinAllowLocalNetworking = true;
+    }) super.servant-client;
+
+    snap = overrideCabal (drv: {
+      __darwinAllowLocalNetworking = true;
+    }) super.snap;
+
+    warp = overrideCabal (drv: {
+      __darwinAllowLocalNetworking = true;
+    }) super.warp;
 
     ghcjs-dom-hello = overrideCabal (drv: {
       libraryHaskellDepends = with self; [
@@ -353,9 +373,9 @@ self: super:
 
     sysinfo = dontCheck super.sysinfo;
 
-    network = super.network.overrideAttrs (drv: {
+    network = overrideCabal (drv: {
       __darwinAllowLocalNetworking = true;
-    });
+    }) super.network;
   }
   // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 {
     # aarch64-darwin
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix
index 812caea9b98b..1946ceb26a0c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix
@@ -82,11 +82,12 @@ with haskellLib;
 
   ghc-exactprint = doDistribute self.ghc-exactprint_1_14_0_0;
   hedgehog = doDistribute self.hedgehog_1_7;
-  hie-bios = doDistribute (dontCheck self.hie-bios_0_18_0); # Tests access homeless-shelter.
+  hie-bios = doDistribute (dontCheck self.hie-bios_0_19_0); # Tests access homeless-shelter.
   lifted-async = doDistribute self.lifted-async_0_11_0;
   parallel = doDistribute self.parallel_3_3_0_0;
   tagged = doDistribute self.tagged_0_8_10;
   unordered-containers = doDistribute self.unordered-containers_0_2_21;
+  HTTP = doDistribute self.HTTP_4000_5_0;
 
   #
   # Jailbreaks
@@ -115,6 +116,9 @@ with haskellLib;
   text-iso8601 = doJailbreak super.text-iso8601;
   aeson = doJailbreak super.aeson;
 
+  # https://github.com/haskell-party/feed/issues/76
+  feed = doJailbreak super.feed; # time<1.15, base<4.22
+
   # https://github.com/well-typed/cborg/issues/373
   cborg = doJailbreak super.cborg;
   serialise = doJailbreak (
@@ -153,4 +157,11 @@ with haskellLib;
 
   # Fails to compile with GHC 9.14 https://github.com/snoyberg/mono-traversable/pull/261
   mono-traversable = dontCheck super.mono-traversable;
+
+  # Too strict bound on containers in test suite
+  # https://github.com/jaspervdj/blaze-markup/issues/69
+  blaze-markup = doJailbreak super.blaze-markup;
+  # https://github.com/jaspervdj/blaze-html/issues/151
+  blaze-html = doJailbreak super.blaze-html;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
index f7603f5a088d..5f16c45e9118 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
@@ -38,7 +38,6 @@ in
   haskeline = null;
   hpc = null;
   integer-gmp = null;
-  libiserv = null;
   mtl = null;
   parsec = null;
   pretty = null;
@@ -60,6 +59,10 @@ in
   xhtml = null;
   Win32 = null;
 
+  libiserv = doJailbreak (markUnbroken (doDistribute super.libiserv)); # ghci ==9.6.6
+
+  iserv-proxy = addBuildDepend self.libiserv super.iserv-proxy;
+
   # Becomes a core package in GHC >= 9.8
   semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index 91efaecae918..f30daa8d4c15 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -3,7 +3,6 @@ broken-packages:
   - 2captcha # failure in job https://hydra.nixos.org/build/324105279 at 2026-03-15
   - 3d-graphics-examples # failure in job https://hydra.nixos.org/build/234454565 at 2023-09-13
   - 3dmodels # failure in job https://hydra.nixos.org/build/233220850 at 2023-09-02
-  - A-gent # failure in job https://hydra.nixos.org/build/324105105 at 2026-03-15
   - AAI # failure in job https://hydra.nixos.org/build/233258828 at 2023-09-02
   - aasam # failure in job https://hydra.nixos.org/build/233216423 at 2023-09-02
   - abacate # failure in job https://hydra.nixos.org/build/233201225 at 2023-09-02
@@ -22,6 +21,7 @@ broken-packages:
   - AC-Terminal # failure in job https://hydra.nixos.org/build/233192747 at 2023-09-02
   - AC-VanillaArray # failure in job https://hydra.nixos.org/build/233216801 at 2023-09-02
   - accelerate-fftw # failure in job https://hydra.nixos.org/build/296049868 at 2025-05-02
+  - accelerate-llvm-native # passes -march=native to get CPU info at _compile time_ which needs to be patched out, currently the cc-wrapper warning fails the build anyway, https://github.com/AccelerateHS/accelerate-llvm/issues/117
   - accelerate-random # failure in job https://hydra.nixos.org/build/296049869 at 2025-05-02
   - accelerate-utility # failure in job https://hydra.nixos.org/build/296049871 at 2025-05-02
   - accentuateus # failure in job https://hydra.nixos.org/build/233253627 at 2023-09-02
@@ -276,6 +276,7 @@ broken-packages:
   - asset-map # failure in job https://hydra.nixos.org/build/233218566 at 2023-09-02
   - assoc-list # failure in job https://hydra.nixos.org/build/233224148 at 2023-09-02
   - assoc-listlike # failure in job https://hydra.nixos.org/build/233200483 at 2023-09-02
+  - associative # failure in job https://hydra.nixos.org/build/325265084 at 2026-04-12
   - assumpta # failure in job https://hydra.nixos.org/build/233245580 at 2023-09-02
   - assumpta-core # failure in job https://hydra.nixos.org/build/252727584 at 2024-03-16
   - ast-monad # failure in job https://hydra.nixos.org/build/233192822 at 2023-09-02
@@ -581,7 +582,6 @@ broken-packages:
   - brick-list-search # failure in job https://hydra.nixos.org/build/233193835 at 2023-09-02
   - bricks-internal # failure in job https://hydra.nixos.org/build/233215572 at 2023-09-02
   - brillig # failure in job https://hydra.nixos.org/build/233208148 at 2023-09-02
-  - brillo-algorithms # failure in job https://hydra.nixos.org/build/307517131 at 2025-09-19
   - brittany # failure in job https://hydra.nixos.org/build/233234100 at 2023-09-02
   - broadcast-chan-conduit # failure in job https://hydra.nixos.org/build/295092082 at 2025-04-22
   - broadcast-chan-tests # failure in job https://hydra.nixos.org/build/233202605 at 2023-09-02
@@ -667,7 +667,6 @@ broken-packages:
   - cabal-ghci # failure in job https://hydra.nixos.org/build/233239354 at 2023-09-02
   - cabal-graphdeps # failure in job https://hydra.nixos.org/build/233221966 at 2023-09-02
   - cabal-helper # failure in job https://hydra.nixos.org/build/252732588 at 2024-03-16
-  - Cabal-hooks # failure in job https://hydra.nixos.org/build/307515931 at 2025-09-19
   - Cabal-ide-backend # failure in job https://hydra.nixos.org/build/233258880 at 2023-09-02
   - cabal-info # failure in job https://hydra.nixos.org/build/233225001 at 2023-09-02
   - cabal-install-bundle # failure in job https://hydra.nixos.org/build/233194629 at 2023-09-02
@@ -727,7 +726,6 @@ broken-packages:
   - caramia # failure in job https://hydra.nixos.org/build/233257225 at 2023-09-02
   - carbonara # failure in job https://hydra.nixos.org/build/233201166 at 2023-09-02
   - carettah # failure in job https://hydra.nixos.org/build/233230612 at 2023-09-02
-  - CarneadesDSL # failure in job https://hydra.nixos.org/build/233236706 at 2023-09-02
   - carte # failure in job https://hydra.nixos.org/build/233201806 at 2023-09-02
   - Cartesian # failure in job https://hydra.nixos.org/build/233249956 at 2023-09-02
   - cas-hashable # failure in job https://hydra.nixos.org/build/233238789 at 2023-09-02
@@ -747,7 +745,6 @@ broken-packages:
   - catamorphism # failure in job https://hydra.nixos.org/build/233208488 at 2023-09-02
   - Catana # failure in job https://hydra.nixos.org/build/233196550 at 2023-09-02
   - catch-fd # failure in job https://hydra.nixos.org/build/233223935 at 2023-09-02
-  - category-printf # failure in job https://hydra.nixos.org/build/233216355 at 2023-09-02
   - category-traced # failure in job https://hydra.nixos.org/build/233193963 at 2023-09-02
   - catnplus # failure in job https://hydra.nixos.org/build/233241280 at 2023-09-02
   - cautious-file # failure in job https://hydra.nixos.org/build/233218702 at 2023-09-02
@@ -784,7 +781,6 @@ broken-packages:
   - cg # failure in job https://hydra.nixos.org/build/233212272 at 2023-09-02
   - cgen # failure in job https://hydra.nixos.org/build/233198570 at 2023-09-02
   - cgi-utils # failure in job https://hydra.nixos.org/build/233251773 at 2023-09-02
-  - cgrep # failure in job https://hydra.nixos.org/build/315095274 at 2025-11-29
   - cgroup-rts-threads # failure in job https://hydra.nixos.org/build/233207888 at 2023-09-02
   - chakra # failure in job https://hydra.nixos.org/build/282936173 at 2024-12-24
   - chalkboard # failure in job https://hydra.nixos.org/build/234453414 at 2023-09-13
@@ -802,6 +798,7 @@ broken-packages:
   - check-cfg-ambiguity # failure in job https://hydra.nixos.org/build/233251852 at 2023-09-02
   - checked # failure in job https://hydra.nixos.org/build/233223182 at 2023-09-02
   - Checked # failure in job https://hydra.nixos.org/build/233257598 at 2023-09-02
+  - checked-literals # failure in job https://hydra.nixos.org/build/326308168 at 2026-04-12
   - checkmate # failure in job https://hydra.nixos.org/build/233248012 at 2023-09-02
   - chell-quickcheck # won't support QuickCheck >= 2.15 https://github.com/typeclasses/chell/issues/5#issuecomment-3152262118
   - chessica # failure in job https://hydra.nixos.org/build/307517327 at 2025-09-19
@@ -849,7 +846,6 @@ broken-packages:
   - clash-verilog # failure in job https://hydra.nixos.org/build/273466517 at 2024-10-01
   - clash-vhdl # failure in job https://hydra.nixos.org/build/273460098 at 2024-10-01
   - clashilator # failure in job https://hydra.nixos.org/build/273442437 at 2024-10-01
-  - ClasshSS # failure in job https://hydra.nixos.org/build/255688076 at 2024-04-16
   - ClassLaws # failure in job https://hydra.nixos.org/build/233243019 at 2023-09-02
   - classy-effects-base # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237233636 at 2023-10-21
   - classy-influxdb-simple # failure in job https://hydra.nixos.org/build/233253418 at 2023-09-02
@@ -1134,7 +1130,6 @@ broken-packages:
   - crucible-llvm # failure in job https://hydra.nixos.org/build/315095700 at 2025-11-29
   - cruncher-types # failure in job https://hydra.nixos.org/build/233229024 at 2023-09-02
   - crunghc # failure in job https://hydra.nixos.org/build/233193295 at 2023-09-02
-  - crypt-sha512 # failure in job https://hydra.nixos.org/build/307517616 at 2025-09-19
   - Crypto # failure in job https://hydra.nixos.org/build/252738609 at 2024-03-16
   - crypto-cipher-benchmarks # failure in job https://hydra.nixos.org/build/233195297 at 2023-09-02
   - crypto-enigma # failure in job https://hydra.nixos.org/build/252722224 at 2024-03-16
@@ -1268,6 +1263,7 @@ broken-packages:
   - database-migrate # failure in job https://hydra.nixos.org/build/233201597 at 2023-09-02
   - database-study # failure in job https://hydra.nixos.org/build/233222466 at 2023-09-02
   - datadog # failure in job https://hydra.nixos.org/build/233191124 at 2023-09-02
+  - dataframe-fastcsv # failure in job https://hydra.nixos.org/build/327518669 at 2026-04-30
   - DataIndex # failure in job https://hydra.nixos.org/build/233254506 at 2023-09-02
   - datalog # failure in job https://hydra.nixos.org/build/233242707 at 2023-09-02
   - datapacker # failure in job https://hydra.nixos.org/build/233206524 at 2023-09-02
@@ -1375,6 +1371,7 @@ broken-packages:
   - dhscanner-bitcode # failure in job https://hydra.nixos.org/build/270090641 at 2024-08-31
   - dia-base # failure in job https://hydra.nixos.org/build/233230896 at 2023-09-02
   - diagnose # failure in job https://hydra.nixos.org/build/233231767 at 2023-09-02
+  - diagnostician # failure in job https://hydra.nixos.org/build/326308198 at 2026-04-12
   - diagrams-boolean # failure in job https://hydra.nixos.org/build/233202036 at 2023-09-02
   - diagrams-haddock # failure in job https://hydra.nixos.org/build/295092844 at 2025-04-22
   - diagrams-pdf # failure in job https://hydra.nixos.org/build/233197864 at 2023-09-02
@@ -1471,7 +1468,6 @@ broken-packages:
   - DOH # failure in job https://hydra.nixos.org/build/233231913 at 2023-09-02
   - doi # failure in job https://hydra.nixos.org/build/295092999 at 2025-04-22
   - dom-events # failure in job https://hydra.nixos.org/build/233231199 at 2023-09-02
-  - dom-parser # failure in job https://hydra.nixos.org/build/315095926 at 2025-11-29
   - dom-selector # failure in job https://hydra.nixos.org/build/233212663 at 2023-09-02
   - domaindriven-core # failure in job https://hydra.nixos.org/build/233234739 at 2023-09-02
   - dominion # failure in job https://hydra.nixos.org/build/252714022 at 2024-03-16
@@ -1515,7 +1511,6 @@ broken-packages:
   - dtw # failure in job https://hydra.nixos.org/build/233198932 at 2023-09-02
   - dual # failure in job https://hydra.nixos.org/build/252724683 at 2024-03-16
   - dualizer # failure in job https://hydra.nixos.org/build/233237592 at 2023-09-02
-  - duckdb-ffi # failure in job https://hydra.nixos.org/build/311300709, https://github.com/Tritlo/duckdb-haskell/issues/2
   - duckdb-haskell # failure in job https://hydra.nixos.org/build/318373036 at 2026-01-10
   - duckling # failure in job https://hydra.nixos.org/build/233247880 at 2023-09-02
   - duet # failure in job https://hydra.nixos.org/build/233219004 at 2023-09-02
@@ -1717,6 +1712,7 @@ broken-packages:
   - eventloop # failure in job https://hydra.nixos.org/build/295093203 at 2025-04-22
   - eventsource-api # failure in job https://hydra.nixos.org/build/233243220 at 2023-09-02
   - eventsourced # failure in job https://hydra.nixos.org/build/233192731 at 2023-09-02
+  - eventsourcing # failure in job https://hydra.nixos.org/build/325266425 at 2026-04-12
   - eventstore # failure in job https://hydra.nixos.org/build/233202734 at 2023-09-02
   - eventuo11y # failure in job https://hydra.nixos.org/build/252711747 at 2024-03-16
   - eventuo11y-dsl # failure in job https://hydra.nixos.org/build/252711345 at 2024-03-16
@@ -1833,6 +1829,7 @@ broken-packages:
   - feed-crawl # failure in job https://hydra.nixos.org/build/233227566 at 2023-09-02
   - feedback # failure in job https://hydra.nixos.org/build/295093247 at 2025-04-22
   - fei-cocoapi # failure in job https://hydra.nixos.org/build/252726625 at 2024-03-16
+  - feldspar-language # failure in job https://hydra.nixos.org/build/326308211 at 2026-04-12
   - fenfire # failure in job https://hydra.nixos.org/build/233254038 at 2023-09-02
   - fernet # failure in job https://hydra.nixos.org/build/233228830 at 2023-09-02
   - FerryCore # failure in job https://hydra.nixos.org/build/233198667 at 2023-09-02
@@ -2012,7 +2009,6 @@ broken-packages:
   - frown # failure in job https://hydra.nixos.org/build/233208462 at 2023-09-02
   - frp-arduino # failure in job https://hydra.nixos.org/build/233192216 at 2023-09-02
   - frpnow # failure in job https://hydra.nixos.org/build/233236056 at 2023-09-02
-  - fs-api # failure in job https://hydra.nixos.org/build/316127858 at 2025-12-19
   - fs-events # failure in job https://hydra.nixos.org/build/233218231 at 2023-09-02
   - fsh-csv # failure in job https://hydra.nixos.org/build/233220196 at 2023-09-02
   - FSM # failure in job https://hydra.nixos.org/build/233247343 at 2023-09-02
@@ -2059,10 +2055,11 @@ broken-packages:
   - fuzzy-parse # failure in job https://hydra.nixos.org/build/252728734 at 2024-03-16
   - fuzzy-timings # failure in job https://hydra.nixos.org/build/233235765 at 2023-09-02
   - fuzzyfind # failure in job https://hydra.nixos.org/build/307518431 at 2025-09-19
+  - fuzzySets # failure in job https://hydra.nixos.org/build/327519257 at 2026-04-30
   - fvars # failure in job https://hydra.nixos.org/build/234461649 at 2023-09-13
   - fwgl # failure in job https://hydra.nixos.org/build/233246210 at 2023-09-02
   - fwgl-javascript # broken by fwgl, manually entered here, because it does not appear in transitive-broken.yaml at 2024-07-09
-  - fx # failure in job https://hydra.nixos.org/build/295093438 at 2025-04-22
+  - fx # failure in job https://hydra.nixos.org/build/326308215 at 2026-04-12
   - fxpak # failure in job https://hydra.nixos.org/build/309813706 at 2025-10-15
   - g-npm # failure in job https://hydra.nixos.org/build/233215965 at 2023-09-02
   - g4ip # failure in job https://hydra.nixos.org/build/233248315 at 2023-09-02
@@ -2122,6 +2119,7 @@ broken-packages:
   - GenSmsPdu # failure in job https://hydra.nixos.org/build/253702098 at 2024-03-31
   - gentlemark # failure in job https://hydra.nixos.org/build/233202158 at 2023-09-02
   - genvalidity-appendful # failure in job https://hydra.nixos.org/build/295093519 at 2025-04-22
+  - genvalidity-hspec-hashable # failure in job https://hydra.nixos.org/build/325266754 at 2026-04-12
   - genvalidity-mergeful # failure in job https://hydra.nixos.org/build/295093508 at 2025-04-22
   - geo-resolver # failure in job https://hydra.nixos.org/build/233206563 at 2023-09-02
   - geo-uk # failure in job https://hydra.nixos.org/build/233221284 at 2023-09-02
@@ -2167,6 +2165,7 @@ broken-packages:
   - ghc-proofs # failure in job https://hydra.nixos.org/build/233230633 at 2023-09-02
   - ghc-simple # failure in job https://hydra.nixos.org/build/233201423 at 2023-09-02
   - ghc-srcspan-plugin # failure in job https://hydra.nixos.org/build/233231564 at 2023-09-02
+  - ghc-stack-profiler # failure in job https://hydra.nixos.org/build/327519432 at 2026-04-30
   - ghc-stack-profiler-speedscope # failure in job https://hydra.nixos.org/build/316138499 at 2025-12-19
   - ghc-syb # failure in job https://hydra.nixos.org/build/233236783 at 2023-09-02
   - ghc-syb-utils # failure in job https://hydra.nixos.org/build/233229196 at 2023-09-02
@@ -2244,7 +2243,6 @@ broken-packages:
   - GLFW-b-demo # failure in job https://hydra.nixos.org/build/233230505 at 2023-09-02
   - gli # failure in job https://hydra.nixos.org/build/233210279 at 2023-09-02
   - glider-nlp # failure in job https://hydra.nixos.org/build/233229600 at 2023-09-02
-  - gll # failure in job https://hydra.nixos.org/build/307518707 at 2025-09-19
   - GLMatrix # failure in job https://hydra.nixos.org/build/233202880 at 2023-09-02
   - glob-posix # failure in job https://hydra.nixos.org/build/233253059 at 2023-09-02
   - global-variables # failure in job https://hydra.nixos.org/build/233204607 at 2023-09-02
@@ -2434,6 +2432,8 @@ broken-packages:
   - hakyll-contrib-elm # failure in job https://hydra.nixos.org/build/233234686 at 2023-09-02
   - hakyll-contrib-i18n # failure in job https://hydra.nixos.org/build/233218608 at 2023-09-02
   - hakyll-contrib-links # failure in job https://hydra.nixos.org/build/233218456 at 2023-09-02
+  - hakyll-dhall # failure in job https://hydra.nixos.org/build/327519844 at 2026-04-30
+  - hakyll-diagrams # failure in job https://hydra.nixos.org/build/326308228 at 2026-04-12
   - hakyll-dir-list # failure in job https://hydra.nixos.org/build/233221518 at 2023-09-02
   - hakyll-process # failure in job https://hydra.nixos.org/build/295094014 at 2025-04-22
   - hakyll-R # failure in job https://hydra.nixos.org/build/233230132 at 2023-09-02
@@ -2493,6 +2493,7 @@ broken-packages:
   - HaPy # failure in job https://hydra.nixos.org/build/233256693 at 2023-09-02
   - haquery # failure in job https://hydra.nixos.org/build/233216714 at 2023-09-02
   - harchive # failure in job https://hydra.nixos.org/build/233259819 at 2023-09-02
+  - hardware-edsl # failure in job https://hydra.nixos.org/build/326308229 at 2026-04-12
   - harfbuzz-pure # failure in job https://hydra.nixos.org/build/237235780 at 2023-10-21
   - harg # failure in job https://hydra.nixos.org/build/233232453 at 2023-09-02
   - HARM # failure in job https://hydra.nixos.org/build/233232650 at 2023-09-02
@@ -2552,6 +2553,7 @@ broken-packages:
   - haskell-go-checkers # failure in job https://hydra.nixos.org/build/234459896 at 2023-09-13
   - haskell-halogen-core # failure in job https://hydra.nixos.org/build/299138362 at 2025-06-23
   - haskell-holes-th # failure in job https://hydra.nixos.org/build/233238457 at 2023-09-02
+  - haskell-igraph # failure in job https://hydra.nixos.org/build/325267326 at 2026-04-12
   - haskell-import-graph # failure in job https://hydra.nixos.org/build/233225328 at 2023-09-02
   - haskell-in-space # failure in job https://hydra.nixos.org/build/233207121 at 2023-09-02
   - haskell-kubernetes # failure in job https://hydra.nixos.org/build/233214499 at 2023-09-02
@@ -2712,6 +2714,7 @@ broken-packages:
   - hedis-simple # failure in job https://hydra.nixos.org/build/233231466 at 2023-09-02
   - hedis-tags # failure in job https://hydra.nixos.org/build/233246456 at 2023-09-02
   - hedra # failure in job https://hydra.nixos.org/build/233217122 at 2023-09-02
+  - hegel # failure in job https://hydra.nixos.org/build/327519993 at 2026-04-30
   - hegg # failure in job https://hydra.nixos.org/build/295094168 at 2025-04-22
   - heidi # failure in job https://hydra.nixos.org/build/233199241 at 2023-09-02
   - hein # failure in job https://hydra.nixos.org/build/233241797 at 2023-09-02
@@ -2723,7 +2726,6 @@ broken-packages:
   - helm # failure in job https://hydra.nixos.org/build/233251620 at 2023-09-02
   - help-esb # failure in job https://hydra.nixos.org/build/233202622 at 2023-09-02
   - hemkay # failure in job https://hydra.nixos.org/build/233227889 at 2023-09-02
-  - henforcer # failure in job https://hydra.nixos.org/build/320783245 at 2026-02-07
   - her-lexer-parsec # failure in job https://hydra.nixos.org/build/233237312 at 2023-09-02
   - HERA # failure in job https://hydra.nixos.org/build/233204724 at 2023-09-02
   - herbalizer # failure in job https://hydra.nixos.org/build/233214866 at 2023-09-02
@@ -2769,7 +2771,6 @@ broken-packages:
   - hgearman # failure in job https://hydra.nixos.org/build/233231063 at 2023-09-02
   - hGelf # failure in job https://hydra.nixos.org/build/233203909 at 2023-09-02
   - hgeometric # failure in job https://hydra.nixos.org/build/233197856 at 2023-09-02
-  - hgettext # failure in job https://hydra.nixos.org/build/309814473 at 2025-10-15
   - hgis # failure in job https://hydra.nixos.org/build/233200418 at 2023-09-02
   - hgmp # failure in job https://hydra.nixos.org/build/307519217 at 2025-09-19
   - hgom # failure in job https://hydra.nixos.org/build/233255569 at 2023-09-02
@@ -2781,6 +2782,7 @@ broken-packages:
   - hgrib # failure in job https://hydra.nixos.org/build/233226885 at 2023-09-02
   - hharp # failure in job https://hydra.nixos.org/build/233237395 at 2023-09-02
   - HHDL # failure in job https://hydra.nixos.org/build/233197917 at 2023-09-02
+  - hhlo # failure in job https://hydra.nixos.org/build/327520065 at 2026-04-30
   - hhp # failure in job https://hydra.nixos.org/build/233244322 at 2023-09-02
   - hhwloc # failure in job https://hydra.nixos.org/build/233215132 at 2023-09-02
   - hi # failure in job https://hydra.nixos.org/build/295094222 at 2025-04-22
@@ -3037,6 +3039,7 @@ broken-packages:
   - hsay # failure in job https://hydra.nixos.org/build/233218925 at 2023-09-02
   - hsbc # failure in job https://hydra.nixos.org/build/233206310 at 2023-09-02
   - hsbencher # failure in job https://hydra.nixos.org/build/233214962 at 2023-09-02
+  - hsblst # failure in job https://hydra.nixos.org/build/325267680 at 2026-04-12
   - hsc3-cairo # failure in job https://hydra.nixos.org/build/233215926 at 2023-09-02
   - hsc3-db # failure in job https://hydra.nixos.org/build/233191679 at 2023-09-02
   - hsc3-dot # failure in job https://hydra.nixos.org/build/233219452 at 2023-09-02
@@ -3083,8 +3086,10 @@ broken-packages:
   - hslinks # failure in job https://hydra.nixos.org/build/233221444 at 2023-09-02
   - hslogger-reader # failure in job https://hydra.nixos.org/build/233226346 at 2023-09-02
   - hslogger-template # failure in job https://hydra.nixos.org/build/233192309 at 2023-09-02
+  - hslua-annotations # failure in job https://hydra.nixos.org/build/326308258 at 2026-04-12
   - hsluv-haskell # failure in job https://hydra.nixos.org/build/233239548 at 2023-09-02
   - hsmagick # failure in job https://hydra.nixos.org/build/233235964 at 2023-09-02
+  - hsmin # failure in job https://hydra.nixos.org/build/325267665 at 2026-04-12
   - hsmodetweaks # failure in job https://hydra.nixos.org/build/233663004 at 2023-09-02
   - hsmrc # failure in job https://hydra.nixos.org/build/315097363 at 2025-11-29
   - Hsmtlib # failure in job https://hydra.nixos.org/build/233213073 at 2023-09-02
@@ -3103,6 +3108,7 @@ broken-packages:
   - hspec-experimental # failure in job https://hydra.nixos.org/build/233216119 at 2023-09-02
   - hspec-jenkins # failure in job https://hydra.nixos.org/build/233213269 at 2023-09-02
   - hspec-monad-control # failure in job https://hydra.nixos.org/build/233223942 at 2023-09-02
+  - hspec-quickcheck-classes # failure in job https://hydra.nixos.org/build/327520327 at 2026-04-30
   - hspec-slow # failure in job https://hydra.nixos.org/build/233248782 at 2023-09-02
   - hspec-snap # failure in job https://hydra.nixos.org/build/252725428 at 2024-03-16
   - hspec-structured-formatter # failure in job https://hydra.nixos.org/build/233199636 at 2023-09-02
@@ -3177,7 +3183,6 @@ broken-packages:
   - http-wget # failure in job https://hydra.nixos.org/build/233236793 at 2023-09-02
   - http2-client-exe # failure in job https://hydra.nixos.org/build/260189666 at 2024-05-19
   - http2-grpc-types # failure in job https://hydra.nixos.org/build/233197769 at 2023-09-02
-  - http2-tls # failure in job https://hydra.nixos.org/build/316190912 at 2025-12-19
   - httpstan # failure in job https://hydra.nixos.org/build/233202072 at 2023-09-02
   - htune # failure in job https://hydra.nixos.org/build/234447885 at 2023-09-13
   - htvm # failure in job https://hydra.nixos.org/build/233218993 at 2023-09-02
@@ -3212,8 +3217,8 @@ broken-packages:
   - hw-dsv # failure in job https://hydra.nixos.org/build/233252280 at 2023-09-02
   - hw-dump # failure in job https://hydra.nixos.org/build/233208818 at 2023-09-02
   - hw-fingertree-strict # failure in job https://hydra.nixos.org/build/252718249 at 2024-03-16
-  - hw-hedgehog # failure in job https://hydra.nixos.org/build/307519553 at 2025-09-19
   - hw-kafka-conduit # failure in job https://hydra.nixos.org/build/252714760 at 2024-03-16
+  - hw-kafka-streamly # failure in job https://hydra.nixos.org/build/327520402 at 2026-04-30
   - hw-lazy # failure in job https://hydra.nixos.org/build/252722974 at 2024-03-16
   - hw-packed-vector # failure in job https://hydra.nixos.org/build/252735800 at 2024-03-16
   - hw-parser # failure in job https://hydra.nixos.org/build/295094576 at 2025-04-22
@@ -3222,7 +3227,6 @@ broken-packages:
   - hw-prim-bits # failure in job https://hydra.nixos.org/build/233246627 at 2023-09-02
   - hw-rankselect-base # failure in job https://hydra.nixos.org/build/295122851 at 2025-04-22
   - hw-simd-cli # failure in job https://hydra.nixos.org/build/233223251 at 2023-09-02
-  - hw-string-parse # failure in job https://hydra.nixos.org/build/307519565 at 2025-09-19
   - hw-tar # failure in job https://hydra.nixos.org/build/233219650 at 2023-09-02
   - hw-xml # failure in job https://hydra.nixos.org/build/233197758 at 2023-09-02
   - hwall-auth-iitk # failure in job https://hydra.nixos.org/build/233217629 at 2023-09-02
@@ -3253,7 +3257,6 @@ broken-packages:
   - hypertypes # failure in job https://hydra.nixos.org/build/252735804 at 2024-03-16
   - hypher # failure in job https://hydra.nixos.org/build/233233236 at 2023-09-02
   - hyraxAbif # failure in job https://hydra.nixos.org/build/233195246 at 2023-09-02
-  - hzenity # failure in job https://hydra.nixos.org/build/295094627 at 2025-04-22
   - hzulip # failure in job https://hydra.nixos.org/build/233191086 at 2023-09-02
   - i # failure in job https://hydra.nixos.org/build/295094611 at 2025-04-22
   - i18n # failure in job https://hydra.nixos.org/build/233247578 at 2023-09-02
@@ -3292,6 +3295,7 @@ broken-packages:
   - ihaskell-parsec # failure in job https://hydra.nixos.org/build/233244271 at 2023-09-02
   - ihaskell-plot # failure in job https://hydra.nixos.org/build/233255936 at 2023-09-02
   - ihaskell-widgets # failure in job https://hydra.nixos.org/build/265955663 at 2024-07-14
+  - ihp-pglistener # failure in job https://hydra.nixos.org/build/325267877 at 2026-04-12
   - illuminate # failure in job https://hydra.nixos.org/build/233219478 at 2023-09-02
   - image-type # failure in job https://hydra.nixos.org/build/233251466 at 2023-09-02
   - imagemagick # failure in job https://hydra.nixos.org/build/233598237 at 2023-09-02
@@ -3301,6 +3305,8 @@ broken-packages:
   - imj-prelude # failure in job https://hydra.nixos.org/build/233234877 at 2023-09-02
   - imm # failure in job https://hydra.nixos.org/build/237239261 at 2023-10-21
   - immortal-worker # failure in job https://hydra.nixos.org/build/233246961 at 2023-09-02
+  - imperative-edsl # failure in job https://hydra.nixos.org/build/326308263 at 2026-04-12
+  - imperative-edsl-vhdl # failure in job https://hydra.nixos.org/build/326308261 at 2026-04-12
   - ImperativeHaskell # failure in job https://hydra.nixos.org/build/233240920 at 2023-09-02
   - impl # failure in job https://hydra.nixos.org/build/233203425 at 2023-09-02
   - implicit-hie-cradle # failure in job https://hydra.nixos.org/build/252710698 at 2024-03-16
@@ -3341,6 +3347,7 @@ broken-packages:
   - injections # failure in job https://hydra.nixos.org/build/233207796 at 2023-09-02
   - inline-c-cuda # failure in job https://hydra.nixos.org/build/237234701 at 2023-10-21
   - inline-c-objc # failure in job https://hydra.nixos.org/build/233223704 at 2023-09-02
+  - inline-r # failure in job https://hydra.nixos.org/build/325304052 at 2026-04-12
   - inserts # failure in job https://hydra.nixos.org/build/233198758 at 2023-09-02
   - instana-haskell-trace-sdk # failure in job https://hydra.nixos.org/build/233211339 at 2023-09-02
   - instance-control # failure in job https://hydra.nixos.org/build/252726549 at 2024-03-16
@@ -3494,8 +3501,6 @@ broken-packages:
   - jsonlogic-aeson # failure in job https://hydra.nixos.org/build/233246828 at 2023-09-02
   - jsonnet # failure in job https://hydra.nixos.org/build/233254884 at 2023-09-02
   - jsonresume # failure in job https://hydra.nixos.org/build/233202350 at 2023-09-02
-  - jsonrpc-tinyclient # failure in job https://hydra.nixos.org/build/233214174 at 2023-09-02
-  - jsonschema # failure in job https://hydra.nixos.org/build/311053632 at 2025-11-02
   - jsonschema-gen # failure in job https://hydra.nixos.org/build/233225063 at 2023-09-02
   - jsonsql # failure in job https://hydra.nixos.org/build/233255704 at 2023-09-02
   - jsontsv # failure in job https://hydra.nixos.org/build/233234129 at 2023-09-02
@@ -3520,6 +3525,7 @@ broken-packages:
   - kademlia # failure in job https://hydra.nixos.org/build/233250935 at 2023-09-02
   - kafka-client # failure in job https://hydra.nixos.org/build/233243580 at 2023-09-02
   - kafka-client-sync # failure in job https://hydra.nixos.org/build/233208699 at 2023-09-02
+  - kafka-effectful # failure in job https://hydra.nixos.org/build/327520661 at 2026-04-30
   - kafka-interchange # failure in job https://hydra.nixos.org/build/255676938 at 2024-04-16
   - Kalman # failure in job https://hydra.nixos.org/build/233210601 at 2023-09-02
   - kalman # failure in job https://hydra.nixos.org/build/233226292 at 2023-09-02
@@ -3719,6 +3725,7 @@ broken-packages:
   - lhc # failure in job https://hydra.nixos.org/build/233220731 at 2023-09-02
   - lhs2TeX-hl # failure in job https://hydra.nixos.org/build/233221405 at 2023-09-02
   - lhslatex # failure in job https://hydra.nixos.org/build/233246375 at 2023-09-02
+  - libarchive-clib # failure in job https://hydra.nixos.org/build/325268249 at 2026-04-12
   - LibClang # failure in job https://hydra.nixos.org/build/233194732 at 2023-09-02
   - libexpect # failure in job https://hydra.nixos.org/build/233226545 at 2023-09-02
   - libGenI # failure in job https://hydra.nixos.org/build/233240857 at 2023-09-02
@@ -3784,6 +3791,7 @@ broken-packages:
   - lines-of-action # failure in job https://hydra.nixos.org/build/233244937 at 2023-09-02
   - lingo # failure in job https://hydra.nixos.org/build/233254522 at 2023-09-02
   - linguistic-ordinals # failure in job https://hydra.nixos.org/build/233228974 at 2023-09-02
+  - link-canonical-effectful # failure in job https://hydra.nixos.org/build/325268303 at 2026-04-12
   - linked-list-with-iterator # failure in job https://hydra.nixos.org/build/233220466 at 2023-09-02
   - linkedhashmap # failure in job https://hydra.nixos.org/build/233234634 at 2023-09-02
   - linklater # failure in job https://hydra.nixos.org/build/233220508 at 2023-09-02
@@ -3867,7 +3875,6 @@ broken-packages:
   - long-double # failure in job https://hydra.nixos.org/build/307520133 at 2025-09-19
   - longboi # failure in job https://hydra.nixos.org/build/233233913 at 2023-09-02
   - longshot # bounds issues https://hydra.nixos.org/build/295428416
-  - looksee # failure in job https://hydra.nixos.org/build/307520163 at 2025-09-19
   - lookup-tables # failure in job https://hydra.nixos.org/build/233196965 at 2023-09-02
   - loop-dsl # failure in job https://hydra.nixos.org/build/233198743 at 2023-09-02
   - loop-while # failure in job https://hydra.nixos.org/build/233198041 at 2023-09-02
@@ -3984,7 +3991,6 @@ broken-packages:
   - mcm # failure in job https://hydra.nixos.org/build/233229087 at 2023-09-02
   - mcmaster-gloss-examples # failure in job https://hydra.nixos.org/build/234457610 at 2023-09-13
   - mcmc-synthesis # failure in job https://hydra.nixos.org/build/233208414 at 2023-09-02
-  - mcp # failure in job https://hydra.nixos.org/build/302804588 at 2025-07-27
   - mcpi # failure in job https://hydra.nixos.org/build/233231465 at 2023-09-02
   - mdapi # failure in job https://hydra.nixos.org/build/233257724 at 2023-09-02
   - mdcat # failure in job https://hydra.nixos.org/build/233249429 at 2023-09-02
@@ -4051,7 +4057,6 @@ broken-packages:
   - midi-util # failure in job https://hydra.nixos.org/build/307520300 at 2025-09-19
   - midi-utils # failure in job https://hydra.nixos.org/build/233222257 at 2023-09-02
   - midisurface # failure in job https://hydra.nixos.org/build/233224559 at 2023-09-02
-  - mig-swagger-ui # failure in job https://hydra.nixos.org/build/295095369 at 2025-04-22
   - mikmod # failure in job https://hydra.nixos.org/build/233247364 at 2023-09-02
   - mikrokosmos # failure in job https://hydra.nixos.org/build/233232143 at 2023-09-02
   - miku # failure in job https://hydra.nixos.org/build/233212186 at 2023-09-02
@@ -4073,6 +4078,9 @@ broken-packages:
   - mios # failure in job https://hydra.nixos.org/build/233251863 at 2023-09-02
   - mirror-tweet # failure in job https://hydra.nixos.org/build/233216951 at 2023-09-02
   - mismi-p # failure in job https://hydra.nixos.org/build/233257227 at 2023-09-02
+  - miso-aeson # failure in job https://hydra.nixos.org/build/326308286 at 2026-04-12
+  - miso-from-html # failure in job https://hydra.nixos.org/build/326308289 at 2026-04-12
+  - miso-optics # failure in job https://hydra.nixos.org/build/326308284 at 2026-04-12
   - mit-3qvpPyAi6mH # failure in job https://hydra.nixos.org/build/233229967 at 2023-09-02
   - mix-arrows # failure in job https://hydra.nixos.org/build/233257720 at 2023-09-02
   - mixpanel-client # failure in job https://hydra.nixos.org/build/233220132 at 2023-09-02
@@ -4407,7 +4415,6 @@ broken-packages:
   - normalization-insensitive # failure in job https://hydra.nixos.org/build/233239612 at 2023-09-02
   - not-prelude # failure in job https://hydra.nixos.org/build/233248453 at 2023-09-02
   - notcpp # failure in job https://hydra.nixos.org/build/233216543 at 2023-09-02
-  - notifications-tray-icon # failure in job https://hydra.nixos.org/build/267969113 at 2024-07-31
   - notmuch-haskell # failure in job https://hydra.nixos.org/build/233332618 at 2023-09-02
   - NoTrace # failure in job https://hydra.nixos.org/build/233229305 at 2023-09-02
   - notzero # failure in job https://hydra.nixos.org/build/233216133 at 2023-09-02
@@ -4478,6 +4485,7 @@ broken-packages:
   - on-demand-ssh-tunnel # failure in job https://hydra.nixos.org/build/233197181 at 2023-09-02
   - onama # failure in job https://hydra.nixos.org/build/307520792 at 2025-09-19
   - ONC-RPC # failure in job https://hydra.nixos.org/build/233225207 at 2023-09-02
+  - one # failure in job https://hydra.nixos.org/build/325268995 at 2026-04-12
   - one-line-aeson-text # failure in job https://hydra.nixos.org/build/307520746 at 2025-09-19
   - oneormore # failure in job https://hydra.nixos.org/build/233242475 at 2023-09-02
   - online # failure in job https://hydra.nixos.org/build/233195360 at 2023-09-02
@@ -4494,6 +4502,7 @@ broken-packages:
   - open-haddock # failure in job https://hydra.nixos.org/build/233205112 at 2023-09-02
   - open-pandoc # failure in job https://hydra.nixos.org/build/233247973 at 2023-09-02
   - open-signals # failure in job https://hydra.nixos.org/build/233207409 at 2023-09-02
+  - open-typerep # failure in job https://hydra.nixos.org/build/326308306 at 2026-04-12
   - OpenAFP # failure in job https://hydra.nixos.org/build/233249295 at 2023-09-02
   - openai # failure in job https://hydra.nixos.org/build/295095863 at 2025-04-22
   - openai-servant-gen # failure in job https://hydra.nixos.org/build/295095800 at 2025-04-22
@@ -4768,6 +4777,7 @@ broken-packages:
   - pg-harness-server # failure in job https://hydra.nixos.org/build/233236493 at 2023-09-02
   - pg-query # failure in job https://hydra.nixos.org/build/283202281 at 2024-12-31
   - pg-recorder # failure in job https://hydra.nixos.org/build/233241248 at 2023-09-02
+  - pg-schema # failure in job https://hydra.nixos.org/build/326308316 at 2026-04-12
   - pg-store # failure in job https://hydra.nixos.org/build/233208603 at 2023-09-02
   - pg-transact # failure in job https://hydra.nixos.org/build/233253337 at 2023-09-02
   - pgdl # failure in job https://hydra.nixos.org/build/233203790 at 2023-09-02
@@ -4968,6 +4978,7 @@ broken-packages:
   - postgresql-simple-interval # failure in job https://hydra.nixos.org/build/307611243 at 2025-09-19
   - postgresql-simple-named # failure in job https://hydra.nixos.org/build/233202481 at 2023-09-02
   - postgresql-simple-opts # failure in job https://hydra.nixos.org/build/252718901 at 2024-03-16
+  - postgresql-simple-postgresql-types # failure in job https://hydra.nixos.org/build/327522032 at 2026-04-30
   - postgresql-simple-sop # failure in job https://hydra.nixos.org/build/233249757 at 2023-09-02
   - postgresql-simple-url # failure in job https://hydra.nixos.org/build/295096191 at 2025-04-22
   - postgresql-tx # failure in job https://hydra.nixos.org/build/252717914 at 2024-03-16
@@ -5026,6 +5037,7 @@ broken-packages:
   - prim-ref # failure in job https://hydra.nixos.org/build/233226138 at 2023-09-02
   - primal # failure in job https://hydra.nixos.org/build/233260049 at 2023-09-02
   - prime # failure in job https://hydra.nixos.org/build/233197550 at 2023-09-02
+  - primecount # failure in job https://hydra.nixos.org/build/325269458 at 2026-04-12
   - primes-type # failure in job https://hydra.nixos.org/build/233258302 at 2023-09-02
   - primitive-checked # failure in job https://hydra.nixos.org/build/233211674 at 2023-09-02
   - primitive-containers # failure in job https://hydra.nixos.org/build/307521213 at 2025-09-19
@@ -5111,7 +5123,6 @@ broken-packages:
   - psx # failure in job https://hydra.nixos.org/build/233199666 at 2023-09-02
   - ptera-core # failure in job https://hydra.nixos.org/build/295096340 at 2025-04-22
   - PTQ # failure in job https://hydra.nixos.org/build/233202571 at 2023-09-02
-  - ptr-peeker # failure in job https://hydra.nixos.org/build/307521316 at 2025-09-19
   - pub # failure in job https://hydra.nixos.org/build/233255415 at 2023-09-02
   - publicsuffix # failure in job https://hydra.nixos.org/build/233241572 at 2023-09-02
   - publicsuffixlistcreate # failure in job https://hydra.nixos.org/build/233251430 at 2023-09-02
@@ -5158,7 +5169,6 @@ broken-packages:
   - qm-interpolated-string # failure in job https://hydra.nixos.org/build/295096370 at 2025-04-22
   - qr-imager # failure in job https://hydra.nixos.org/build/233201973 at 2023-09-02
   - qrcode # failure in job https://hydra.nixos.org/build/233225438 at 2023-09-02
-  - qrcode-core # failure in job https://hydra.nixos.org/build/295096377 at 2025-04-22
   - qsem # failure in job https://hydra.nixos.org/build/295096373 at 2025-04-22
   - qt # failure in job https://hydra.nixos.org/build/233248869 at 2023-09-02
   - QuadEdge # failure in job https://hydra.nixos.org/build/233249144 at 2023-09-02
@@ -5173,7 +5183,6 @@ broken-packages:
   - quenya-verb # failure in job https://hydra.nixos.org/build/233209006 at 2023-09-02
   - querystring-pickle # failure in job https://hydra.nixos.org/build/233246108 at 2023-09-02
   - questioner # failure in job https://hydra.nixos.org/build/233213704 at 2023-09-02
-  - quibble-core # failure in job https://hydra.nixos.org/build/233200635 at 2023-09-02
   - quic # failure in job https://hydra.nixos.org/build/295457190 at 2025-05-02
   - quick-schema # failure in job https://hydra.nixos.org/build/233256519 at 2023-09-02
   - QuickAnnotate # failure in job https://hydra.nixos.org/build/233197428 at 2023-09-02
@@ -5212,7 +5221,6 @@ broken-packages:
   - raft # failure in job https://hydra.nixos.org/build/233248392 at 2023-09-02
   - rakhana # failure in job https://hydra.nixos.org/build/233256901 at 2023-09-02
   - rakuten # failure in job https://hydra.nixos.org/build/233196803 at 2023-09-02
-  - ralist # failure in job https://hydra.nixos.org/build/233195682 at 2023-09-02
   - raml # failure in job https://hydra.nixos.org/build/233212517 at 2023-09-02
   - rand-vars # failure in job https://hydra.nixos.org/build/233219255 at 2023-09-02
   - rando # failure in job https://hydra.nixos.org/build/233257817 at 2023-09-02
@@ -5246,6 +5254,7 @@ broken-packages:
   - rclient # failure in job https://hydra.nixos.org/build/233239290 at 2023-09-02
   - rds-data # failure in job https://hydra.nixos.org/build/299186719 at 2025-06-23
   - rds-data-codecs # failure in job https://hydra.nixos.org/build/253696582 at 2024-03-31
+  - re2 # failure in job https://hydra.nixos.org/build/325269682 at 2026-04-12
   - react # failure in job https://hydra.nixos.org/build/257372364 at 2024-04-27
   - react-flux # failure in job https://hydra.nixos.org/build/233246819 at 2023-09-02
   - react-haskell # failure in job https://hydra.nixos.org/build/233242976 at 2023-09-02
@@ -5265,7 +5274,6 @@ broken-packages:
   - readme-lhs # failure in job https://hydra.nixos.org/build/233248229 at 2023-09-02
   - readshp # failure in job https://hydra.nixos.org/build/233197835 at 2023-09-02
   - really-simple-xml-parser # failure in job https://hydra.nixos.org/build/233195945 at 2023-09-02
-  - reanimate-svg # failure in job https://hydra.nixos.org/build/233242271 at 2023-09-02
   - reason-export # failure in job https://hydra.nixos.org/build/233212942 at 2023-09-02
   - reasonable-lens # failure in job https://hydra.nixos.org/build/233233111 at 2023-09-02
   - rebound # failure in job https://hydra.nixos.org/build/311055152 at 2025-11-02
@@ -5385,6 +5393,7 @@ broken-packages:
   - request-monad # failure in job https://hydra.nixos.org/build/233204896 at 2023-09-02
   - rescue # failure in job https://hydra.nixos.org/build/233230073 at 2023-09-02
   - reservoir # failure in job https://hydra.nixos.org/build/233194430 at 2023-09-02
+  - resin # failure in job https://hydra.nixos.org/build/326308336 at 2026-04-12
   - resolve # failure in job https://hydra.nixos.org/build/233224070 at 2023-09-02
   - resolve-trivial-conflicts # failure in job https://hydra.nixos.org/build/233237974 at 2023-09-02
   - resource-effect # failure in job https://hydra.nixos.org/build/233253816 at 2023-09-02
@@ -5447,8 +5456,9 @@ broken-packages:
   - rollbar-hs # failure in job https://hydra.nixos.org/build/233240182 at 2023-09-02
   - roller # failure in job https://hydra.nixos.org/build/233198848 at 2023-09-02
   - roman-numerals # failure in job https://hydra.nixos.org/build/233214716 at 2023-09-02
-  - ron # failure in job https://hydra.nixos.org/build/233197052 at 2023-09-02
   - ron-hs # failure in job https://hydra.nixos.org/build/295096708 at 2025-04-22
+  - ron-schema # failure in job https://hydra.nixos.org/build/326308345 at 2026-04-12
+  - ron-storage # failure in job https://hydra.nixos.org/build/326308346 at 2026-04-12
   - rope # failure in job https://hydra.nixos.org/build/233198109 at 2023-09-02
   - rose # failure in job https://hydra.nixos.org/build/252717613 at 2024-03-16
   - rose-trees # timeout
@@ -5467,7 +5477,6 @@ broken-packages:
   - rrule # failure in job https://hydra.nixos.org/build/233259470 at 2023-09-02
   - rsi-break # failure in job https://hydra.nixos.org/build/245788743 at 2024-01-07
   - rspp # failure in job https://hydra.nixos.org/build/233236691 at 2023-09-02
-  - rss-conduit # failure in job https://hydra.nixos.org/build/307611286 at 2025-09-19
   - rss2irc # failure in job https://hydra.nixos.org/build/233196081 at 2023-09-02
   - rstream # failure in job https://hydra.nixos.org/build/233249587 at 2023-09-02
   - RtMidi # failure in job https://hydra.nixos.org/build/233241377 at 2023-09-02
@@ -5529,7 +5538,6 @@ broken-packages:
   - sbv-program # failure in job https://hydra.nixos.org/build/323973607 at 2026-03-12
   - sbvPlugin # 2026-03-12
   - sc2-proto # failure in job https://hydra.nixos.org/build/252730301 at 2024-03-16
-  - scale # failure in job https://hydra.nixos.org/build/233222189 at 2023-09-02
   - scaleimage # failure in job https://hydra.nixos.org/build/233240688 at 2023-09-02
   - scalendar # failure in job https://hydra.nixos.org/build/233206581 at 2023-09-02
   - scgi # failure in job https://hydra.nixos.org/build/233247314 at 2023-09-02
@@ -5583,7 +5591,6 @@ broken-packages:
   - seclib # failure in job https://hydra.nixos.org/build/233203235 at 2023-09-02
   - second-transfer # failure in job https://hydra.nixos.org/build/233214725 at 2023-09-02
   - secp256k1 # failure in job https://hydra.nixos.org/build/233231129 at 2023-09-02
-  - secp256k1-haskell # failure in job https://hydra.nixos.org/build/323790174 at 2026-03-11
   - secp256k1-legacy # failure in job https://hydra.nixos.org/build/233197038 at 2023-09-02
   - secret-santa # failure in job https://hydra.nixos.org/build/233208686 at 2023-09-02
   - secure-memory # failure in job https://hydra.nixos.org/build/233226568 at 2023-09-02
@@ -5972,7 +5979,7 @@ broken-packages:
   - sqlcipher # failure in job https://hydra.nixos.org/build/233259217 at 2023-09-02
   - sqlcli # failure in job https://hydra.nixos.org/build/252719841 at 2024-03-16
   - sqlite # failure in job https://hydra.nixos.org/build/233215839 at 2023-09-02
-  - sqlite-easy # failure in job https://hydra.nixos.org/build/318377025 at 2026-01-10
+  - sqlite-easy # failure in job https://hydra.nixos.org/build/326308362 at 2026-04-12
   - sqlite-simple-errors # failure in job https://hydra.nixos.org/build/233232977 at 2023-09-02
   - sqlvalue-list # failure in job https://hydra.nixos.org/build/233197313 at 2023-09-02
   - sqsd-local # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237237046 at 2023-10-21
@@ -6008,6 +6015,7 @@ broken-packages:
   - stackage-to-hackage # failure in job https://hydra.nixos.org/build/233233948 at 2023-09-02
   - stackage-types # failure in job https://hydra.nixos.org/build/233239995 at 2023-09-02
   - stackcollapse-ghc # failure in job https://hydra.nixos.org/build/233250775 at 2023-09-02
+  - stacker # failure in job https://hydra.nixos.org/build/326308360 at 2026-04-12
   - staged-gg # failure in job https://hydra.nixos.org/build/233252183 at 2023-09-02
   - stagen # failure in job https://hydra.nixos.org/build/307611396 at 2025-09-19
   - standalone-derive-topdown # failure in job https://hydra.nixos.org/build/233252467 at 2023-09-02
@@ -6050,6 +6058,7 @@ broken-packages:
   - stm-firehose # failure in job https://hydra.nixos.org/build/233220943 at 2023-09-02
   - stm-lifted # failure in job https://hydra.nixos.org/build/252726872 at 2024-03-16
   - stm-promise # failure in job https://hydra.nixos.org/build/233204293 at 2023-09-02
+  - stm-ringbuffer # failure in job https://hydra.nixos.org/build/327523052 at 2026-04-30
   - stm-stats # failure in job https://hydra.nixos.org/build/233214914 at 2023-09-02
   - stm-tlist # failure in job https://hydra.nixos.org/build/307522184 at 2025-09-19
   - stochastic # failure in job https://hydra.nixos.org/build/233242019 at 2023-09-02
@@ -6407,7 +6416,6 @@ broken-packages:
   - sugarhaskell # failure in job https://hydra.nixos.org/build/233199879 at 2023-09-02
   - suitable # failure in job https://hydra.nixos.org/build/233225075 at 2023-09-02
   - sum-type-boilerplate # failure in job https://hydra.nixos.org/build/233251040 at 2023-09-02
-  - summer # failure in job https://hydra.nixos.org/build/252728622 at 2024-03-16
   - summoner # failure in job https://hydra.nixos.org/build/233232530 at 2023-09-02
   - sump # failure in job https://hydra.nixos.org/build/265955678 at 2024-07-14
   - sunlight # failure in job https://hydra.nixos.org/build/233212375 at 2023-09-02
@@ -6461,7 +6469,6 @@ broken-packages:
   - symtegration # failure in job https://hydra.nixos.org/build/307522286 at 2025-09-19
   - sync # failure in job https://hydra.nixos.org/build/233254114 at 2023-09-02
   - sync-mht # failure in job https://hydra.nixos.org/build/233236022 at 2023-09-02
-  - syntactic # failure in job https://hydra.nixos.org/build/233210123 at 2023-09-02
   - syntax-trees # failure in job https://hydra.nixos.org/build/233209576 at 2023-09-02
   - syntax-trees-fork-bairyn # failure in job https://hydra.nixos.org/build/233216989 at 2023-09-02
   - SyntaxMacros # failure in job https://hydra.nixos.org/build/309811610 at 2025-10-15
@@ -6758,6 +6765,7 @@ broken-packages:
   - TotalMap # failure in job https://hydra.nixos.org/build/233194327 at 2023-09-02
   - touched # failure in job https://hydra.nixos.org/build/233199113 at 2023-09-02
   - Tournament # failure in job https://hydra.nixos.org/build/233239014 at 2023-09-02
+  - tower-hs # failure in job https://hydra.nixos.org/build/326308388 at 2026-04-12
   - toxiproxy-haskell # failure in job https://hydra.nixos.org/build/233222810 at 2023-09-02
   - tpar # failure in job https://hydra.nixos.org/build/295097738 at 2025-04-22
   - tptp # failure in job https://hydra.nixos.org/build/233195607 at 2023-09-02
@@ -6768,7 +6776,6 @@ broken-packages:
   - tracetree # failure in job https://hydra.nixos.org/build/233213937 at 2023-09-02
   - tracked-files # failure in job https://hydra.nixos.org/build/233256779 at 2023-09-02
   - tracker # failure in job https://hydra.nixos.org/build/233226925 at 2023-09-02
-  - trackit # failure in job https://hydra.nixos.org/build/233243891 at 2023-09-02
   - traction # failure in job https://hydra.nixos.org/build/233193894 at 2023-09-02
   - tracy # failure in job https://hydra.nixos.org/build/233210215 at 2023-09-02
   - trade-journal # failure in job https://hydra.nixos.org/build/252737021 at 2024-03-16
@@ -6947,6 +6954,7 @@ broken-packages:
   - unicode-prelude # failure in job https://hydra.nixos.org/build/233241723 at 2023-09-02
   - unicode-symbols # failure in job https://hydra.nixos.org/build/233241639 at 2023-09-02
   - unicode-tricks # failure in job https://hydra.nixos.org/build/233258238 at 2023-09-02
+  - uniform-shake # failure in job https://hydra.nixos.org/build/325271124 at 2026-04-12
   - unimap # failure in job https://hydra.nixos.org/build/299141969 at 2025-06-23
   - union-find # failure in job https://hydra.nixos.org/build/233245476 at 2023-09-02
   - union-map # failure in job https://hydra.nixos.org/build/233222765 at 2023-09-02
@@ -7039,6 +7047,7 @@ broken-packages:
   - validations # failure in job https://hydra.nixos.org/build/233208976 at 2023-09-02
   - validationt # failure in job https://hydra.nixos.org/build/252739235 at 2024-03-16
   - validators # failure in job https://hydra.nixos.org/build/233235532 at 2023-09-02
+  - valuations # failure in job https://hydra.nixos.org/build/325271192 at 2026-04-12
   - value-supply # failure in job https://hydra.nixos.org/build/233190936 at 2023-09-02
   - ValveValueKeyvalue # failure in job https://hydra.nixos.org/build/252733320 at 2024-03-16
   - vampire # failure in job https://hydra.nixos.org/build/233216179 at 2023-09-02
@@ -7457,6 +7466,7 @@ broken-packages:
   - yesod-tls # failure in job https://hydra.nixos.org/build/233251484 at 2023-09-02
   - yesod-transloadit # failure in job https://hydra.nixos.org/build/233202132 at 2023-09-02
   - yesod-vend # failure in job https://hydra.nixos.org/build/233227545 at 2023-09-02
+  - yesod-vite # failure in job https://hydra.nixos.org/build/326308413 at 2026-04-12
   - YFrob # failure in job https://hydra.nixos.org/build/233197612 at 2023-09-02
   - yggdrasil # failure in job https://hydra.nixos.org/build/233229923 at 2023-09-02
   - yggdrasil-schema # failure in job https://hydra.nixos.org/build/275135174 at 2024-10-21
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 56bb238acddc..300313a58b64 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -26,13 +26,13 @@
 # keep-sorted start skip_lines=1 case=no numeric=yes
 default-package-overrides:
   - chs-cabal == 0.1.1.2 # matches Cabal 3.12 (GHC 9.10)
+  - clash-lib-hedgehog < 1.9 # needs to match clash-lib from Stackage
   # 2026-01-23: dataframe >= 0.3.3.7 uses random-1.3, which breaks dependency coherence on 25.11, whose default version is random-1.2
   # TODO: when (likely in 25.x) Stackage bumps random to 1.3, review
   - dataframe == 0.3.3.6
   # 2025-12-26: Needs to match egison-pattern-src from Stackage LTS
   - egison-pattern-src-th-mode < 0.2.2
   - extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10)
-  - futhark-server == 1.3.0.0 # required by futhark-0.25.36
   # 2026-01-30: Needs to match hasql from Stackage LTS 24
   - hasql-notifications < 0.2.5.0
   # 2026-02-04: as requested by ghcide >= 2.13
@@ -44,6 +44,8 @@ default-package-overrides:
   - hnix-store-remote < 0.7
   # 2025-08-03: need to match stackage version of hosc
   - hsc3 >= 0.21 && < 0.22
+  # 2026-04-19: needs to match tls and crypton-x509-store from Stackage LTS 24
+  - http2-tls < 0.4.6
   # liquidhaskell-boot 0.9.10.1.2 requires this specific version of liquid-fixpoint
   - liquid-fixpoint == 0.9.6.3.2
   # liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10)
@@ -55,6 +57,8 @@ default-package-overrides:
   - lsp-types < 2.4
   # Needs to match microlens == 0.4.* in Stackage LTS 24
   - microlens-pro < 0.2.0.4
+  # 2026-04-06: 4.0.10 merely adjusts to dependencies that are incompatible with our LTS
+  - mighttpd2 < 4.0.10
   # We currently use pandoc-crossref with a patch to revert it to pandoc == 3.7.*,
   # this no longer works with later versions.
   - pandoc-crossref == 0.3.21
@@ -127,6 +131,12 @@ extra-packages:
 
 # keep-sorted start skip_lines=1 case=no
 package-maintainers:
+  Ai-Ya-Ya:
+    - beam-duckdb
+    - duckdb-ffi
+    - duckdb-simple
+    - reanimate
+    - reanimate-svg
   alexfmpe:
     - basic-sop
     - commutative-semigroups
@@ -659,6 +669,7 @@ package-maintainers:
   utdemir:
     - nix-tree
   wolfgangwalther:
+    - hpc-codecov
     - postgres-websockets
     - postgrest
   zowoq:
@@ -821,6 +832,7 @@ supported-platforms:
   htune:                                        [ platforms.linux ] # depends on alsa-pcm
   hw-prim-bits:                                 [ platforms.x86 ] # x86 assembler
   inline-asm:                                   [ platforms.x86 ] # x86 assembler
+  inline-c-win32:                               [ platforms.windows ]
   jsaddle-wkwebview:                            [ platforms.darwin ]
   keid-core:                                    [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
   keid-frp-banana:                              [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
@@ -848,6 +860,7 @@ supported-platforms:
   scat:                                         [ platforms.x86 ] # uses scrypt, which requries x86
   scrypt:                                       [ platforms.x86 ] # https://github.com/informatikr/scrypt/issues/8
   seqalign:                                     [ platforms.x86 ] # x86 intrinsics
+  Southpaw:                                     [ platforms.windows ]
   streamed:                                     [ platforms.linux] # alsa-core only supported on linux
   swisstable:                                   [ platforms.x86_64 ] # Needs AVX2
   systemd-api:                                  [ platforms.linux ]
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 87bbe230daa6..15e36b84d701 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage LTS 24.34
+# Stackage LTS 24.38
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -18,7 +18,7 @@ default-package-overrides:
   - advent-of-code-api ==0.2.11.0
   - aern2-mp ==0.2.16.1
   - aern2-real ==0.2.16.1
-  - aeson ==2.2.3.0
+  - aeson ==2.2.4.1
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.3
   - aeson-casing ==0.2.0.0
@@ -41,7 +41,7 @@ default-package-overrides:
   - agda2lagda ==0.2023.6.9
   - agreeing ==0.2.2.0
   - alarmclock ==0.7.0.7
-  - alex ==3.5.4.0
+  - alex ==3.5.4.2
   - alex-meta ==0.3.0.13
   - alex-tools ==0.6.1
   - alfred-margaret ==2.1.0.2
@@ -81,7 +81,7 @@ default-package-overrides:
   - apportionment ==0.0.0.4
   - approximate ==0.3.5
   - approximate-equality ==1.1.0.2
-  - arithmoi ==0.13.2.0
+  - arithmoi ==0.13.3.0
   - array-chunks ==0.1.4.2
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
@@ -166,11 +166,11 @@ default-package-overrides:
   - bcp47-orphans ==0.1.3.0
   - bcrypt ==0.0.11
   - beam-core ==0.10.4.0
-  - beam-migrate ==0.5.3.2
-  - beam-postgres ==0.5.4.4
-  - beam-sqlite ==0.5.6.0
-  - bech32 ==1.1.10
-  - bech32-th ==1.1.10
+  - beam-migrate ==0.5.4.0
+  - beam-postgres ==0.5.5.0
+  - beam-sqlite ==0.5.7.0
+  - bech32 ==1.1.11
+  - bech32-th ==1.1.11
   - bench ==1.0.13
   - bench-show ==0.3.2
   - benchpress ==0.2.3.0
@@ -191,7 +191,7 @@ default-package-overrides:
   - binary-ieee754 ==0.1.0.0
   - binary-instances ==1.0.6
   - binary-list ==1.1.1.2
-  - binary-orphans ==1.0.5
+  - binary-orphans ==1.0.5.1
   - binary-parser ==0.5.7.7
   - binary-parsers ==0.2.4.0
   - binary-search ==2.0.0
@@ -229,14 +229,14 @@ default-package-overrides:
   - bm ==0.2.0.0
   - bmp ==1.2.6.4
   - bnb-staking-csvs ==0.2.2.0
-  - BNFC ==2.9.6.2
+  - BNFC ==2.9.6.3
   - BNFC-meta ==0.6.1
   - board-games ==0.4.0.1
   - bodhi ==0.1.0
   - boltzmann-samplers ==0.1.1.0
   - Boolean ==0.2.4
   - boolsimplifier ==0.1.8
-  - boomwhacker ==0.0.2
+  - boomwhacker ==0.0.2.1
   - bordacount ==0.1.0.0
   - boring ==0.2.2
   - bound ==2.0.7
@@ -330,7 +330,7 @@ default-package-overrides:
   - cased ==0.1.0.0
   - cases ==0.1.4.4
   - casing ==0.1.4.1
-  - cassava >= 0.5.4.0 && (> 0.5.5.0 || < 0.5.5.0) && < 0.6.0.0
+  - cassava ==0.5.4.1
   - cassava-conduit ==0.6.6
   - cassava-megaparsec ==2.1.1
   - cast ==0.1.0.2
@@ -374,10 +374,10 @@ default-package-overrides:
   - circle-packing ==0.1.0.6
   - circular ==0.4.0.3
   - citeproc ==0.9.0.1
-  - clash-ghc ==1.8.4
-  - clash-lib ==1.8.4
-  - clash-prelude ==1.8.4
-  - clash-prelude-hedgehog ==1.8.4
+  - clash-ghc ==1.8.5
+  - clash-lib ==1.8.5
+  - clash-prelude ==1.8.5
+  - clash-prelude-hedgehog ==1.8.5
   - classy-prelude ==1.5.0.3
   - classy-prelude-conduit ==1.5.0
   - classy-prelude-yesod ==1.5.0
@@ -407,7 +407,7 @@ default-package-overrides:
   - Color ==0.4.1
   - colorful-monoids ==0.2.1.3
   - colorize-haskell ==1.0.1
-  - colour ==2.3.6
+  - colour ==2.3.7
   - colourista ==0.1.0.2
   - columnar ==1.0.0.0
   - combinatorial ==0.1.1
@@ -500,7 +500,7 @@ default-package-overrides:
   - crc32c ==0.2.2
   - crdt-event-fold ==1.8.1.2
   - criterion ==1.6.4.0
-  - criterion-measurement ==0.2.3.0
+  - criterion-measurement ==0.2.4.0
   - cron ==0.7.2
   - crypto-api ==0.13.3
   - crypto-api-tests ==0.3
@@ -610,7 +610,7 @@ default-package-overrides:
   - depq ==0.4.2
   - deque ==0.4.4.2
   - derive-storable ==0.3.1.0
-  - derive-topdown ==0.1.1.0
+  - derive-topdown ==0.1.1.1
   - deriveJsonNoPrefix ==0.1.0.1
   - deriving-aeson ==0.2.10
   - deriving-compat ==0.6.8
@@ -629,7 +629,7 @@ default-package-overrides:
   - diagrams-cairo ==1.5
   - diagrams-canvas ==1.4.2
   - diagrams-contrib ==1.4.6
-  - diagrams-core ==1.5.1.1
+  - diagrams-core ==1.5.1.2
   - diagrams-gtk ==1.4
   - diagrams-lib ==1.5.1
   - diagrams-postscript ==1.5.3
@@ -667,7 +667,7 @@ default-package-overrides:
   - distribution-opensuse ==1.1.4
   - distributive ==0.6.3
   - djinn-lib ==0.0.1.4
-  - djot ==0.1.3
+  - djot ==0.1.4
   - dl-fedora ==2.0.1
   - dlist ==1.0
   - dlist-instances ==0.1.1.1
@@ -704,7 +704,7 @@ default-package-overrides:
   - drifter-postgresql ==0.2.1
   - drifter-sqlite ==0.1.0.0
   - dsp ==0.2.5.2
-  - dual-tree ==0.2.3.1
+  - dual-tree ==0.2.3.4
   - dublincore-xml-conduit ==0.1.0.3
   - dunai ==0.14.1
   - duration ==0.2.0.0
@@ -845,7 +845,7 @@ default-package-overrides:
   - filecache ==0.5.3
   - filelock ==0.1.1.9
   - filemanip ==0.3.6.3
-  - filepath-bytestring ==1.5.2.0.3
+  - filepath-bytestring ==1.5.2.0.5
   - filepattern ==0.1.3
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
@@ -913,7 +913,7 @@ default-package-overrides:
   - functor-combinators ==0.4.1.4
   - functor-products ==0.1.2.2
   - fused-effects ==1.1.2.6
-  - fusion-plugin ==0.2.7
+  - fusion-plugin ==0.2.8
   - fusion-plugin-types ==0.1.0
   - fuzzcheck ==0.1.1
   - fuzzy ==0.1.1.0
@@ -1008,7 +1008,7 @@ default-package-overrides:
   - ghcid ==0.8.9
   - ghcjs-codemirror ==0.0.0.2
   - ghcjs-dom ==0.9.9.2
-  - ghcjs-dom-jsaddle ==0.9.9.0
+  - ghcjs-dom-jsaddle ==0.9.9.1
   - ghcjs-perch ==0.3.3.3
   - ghost-buster ==0.1.1.0
   - ghostscript-parallel ==0.0.1
@@ -1190,7 +1190,7 @@ default-package-overrides:
   - hackage-security-HTTP ==0.1.1.3
   - haddock-library ==1.11.0
   - haha ==0.3.1.1
-  - hakyll ==4.16.7.1
+  - hakyll ==4.16.8.0
   - hakyll-convert ==0.3.0.5
   - hal ==1.1
   - half ==0.3.3
@@ -1242,7 +1242,7 @@ default-package-overrides:
   - HaTeX ==3.23.0.1
   - haveibeenpwned ==0.2.0.3
   - HaXml ==1.25.14
-  - haxr ==3000.11.6
+  - haxr ==3000.11.6.1
   - Hclip ==3.0.0.4
   - HCodecs ==0.5.2
   - hdaemonize ==0.5.7
@@ -1487,7 +1487,7 @@ default-package-overrides:
   - indexed-profunctors ==0.1.1.1
   - indexed-transformers ==0.1.0.4
   - indexed-traversable ==0.1.4
-  - indexed-traversable-instances ==0.1.2
+  - indexed-traversable-instances ==0.1.2.1
   - inf-backprop ==0.1.1.0
   - infer-license ==0.2.0
   - infinite-list ==0.1.3
@@ -1555,9 +1555,9 @@ default-package-overrides:
   - js-dgtable ==0.5.2
   - js-flot ==0.8.3
   - js-jquery ==3.7.1
-  - jsaddle ==0.9.9.3
-  - jsaddle-dom ==0.9.9.2
-  - jsaddle-warp ==0.9.9.5
+  - jsaddle ==0.9.9.4
+  - jsaddle-dom ==0.9.9.3
+  - jsaddle-warp ==0.9.9.6
   - json ==0.11
   - json-feed ==2.0.0.18
   - json-rpc ==1.1.2
@@ -1625,7 +1625,7 @@ default-package-overrides:
   - large-hashable ==0.1.2.0
   - largeword ==1.2.5
   - latex ==0.1.0.4
-  - lattices ==2.2.1
+  - lattices ==2.2.1.1
   - lawful ==0.1.0.0
   - lawful-conversions ==0.1.7
   - lazy-csv ==0.5.1
@@ -1791,7 +1791,7 @@ default-package-overrides:
   - microlens-platform ==0.4.4.1
   - microlens-th ==0.4.3.17
   - microspec ==0.2.1.3
-  - microstache ==1.0.3
+  - microstache ==1.0.3.1
   - midair ==0.2.0.1
   - midi ==0.2.2.4
   - midi-alsa ==0.2.1
@@ -1834,7 +1834,7 @@ default-package-overrides:
   - moffy-samples-events ==0.2.2.5
   - moffy-samples-gtk3 ==0.1.0.0
   - moffy-samples-gtk3-run ==0.1.0.7
-  - monad-chronicle ==1.1
+  - monad-chronicle ==1.1.0.1
   - monad-control ==1.0.3.1
   - monad-control-aligned ==0.0.2.1
   - monad-control-identity ==0.2.0.0
@@ -1867,7 +1867,7 @@ default-package-overrides:
   - mongoDB ==2.7.1.4
   - mono-traversable ==1.0.21.0
   - mono-traversable-instances ==0.1.1.0
-  - monoid-extras ==0.7.0.1
+  - monoid-extras ==0.7.0.2
   - monoid-insertleft ==0.1.0.1
   - monoid-map ==0.2.0.1
   - monoid-subclasses ==1.2.6.1
@@ -1876,9 +1876,9 @@ default-package-overrides:
   - monoidal-functors ==0.2.3.0
   - monoidmap ==0.0.4.4
   - monoidmap-aeson ==0.0.0.6
-  - monoidmap-examples ==0.0.0.1
+  - monoidmap-examples ==0.0.0.2
   - monoidmap-internal ==0.0.0.1
-  - monoidmap-quickcheck ==0.0.0.3
+  - monoidmap-quickcheck ==0.0.0.4
   - more-containers ==0.2.2.2
   - morpheus-graphql-app ==0.28.5
   - morpheus-graphql-client ==0.28.5
@@ -2002,7 +2002,7 @@ default-package-overrides:
   - oblivious-transfer ==0.1.0
   - odbc ==0.3.0
   - ods2csv ==0.1.0.2
-  - oeis ==0.3.10.1
+  - oeis ==0.3.10.2
   - oeis2 ==1.0.9
   - ofx ==0.4.4.0
   - ogma-cli ==1.7.0
@@ -2064,7 +2064,7 @@ default-package-overrides:
   - options ==1.2.1.2
   - optparse-applicative ==0.18.1.0
   - optparse-enum ==1.0.0.0
-  - optparse-generic ==1.5.2
+  - optparse-generic ==1.5.3
   - optparse-simple ==0.1.1.4
   - optparse-text ==0.1.1.0
   - ordered-containers ==0.2.4
@@ -2105,7 +2105,7 @@ default-package-overrides:
   - partial-handler ==1.0.3
   - partial-isomorphisms ==0.2.4.0
   - partialord ==0.1.1
-  - password ==3.1.0.1
+  - password ==3.1.0.2
   - password-instances ==3.0.0.0
   - password-types ==1.0.0.0
   - patch ==0.0.8.4
@@ -2216,7 +2216,7 @@ default-package-overrides:
   - postgresql-migration ==0.2.1.8
   - postgresql-schema ==0.1.14
   - postgresql-simple ==0.7.0.1
-  - postgresql-syntax ==0.4.3
+  - postgresql-syntax ==0.4.3.1
   - postgresql-typed ==0.6.2.5
   - pptable ==0.3.0.0
   - pqueue ==1.5.0.0
@@ -2266,12 +2266,12 @@ default-package-overrides:
   - promises ==0.3
   - prompt-hs ==1.0.3.1
   - prospect ==0.1.0.0
-  - proto-lens ==0.7.1.6
-  - proto-lens-optparse ==0.1.1.13
-  - proto-lens-protobuf-types ==0.7.2.2
-  - proto-lens-protoc ==0.9.0.0
-  - proto-lens-runtime ==0.7.0.7
-  - proto-lens-setup ==0.4.0.9
+  - proto-lens ==0.7.1.7
+  - proto-lens-optparse ==0.1.1.14
+  - proto-lens-protobuf-types ==0.7.2.3
+  - proto-lens-protoc ==0.9.0.1
+  - proto-lens-runtime ==0.7.0.8
+  - proto-lens-setup ==0.4.0.10
   - protobuf ==0.2.1.3
   - protobuf-simple ==0.1.1.1
   - protocol-radius ==0.0.1.2
@@ -2335,7 +2335,7 @@ default-package-overrides:
   - random-fu ==0.3.0.1
   - random-shuffle ==0.0.4
   - random-tree ==0.6.0.5
-  - range ==0.3.0.2
+  - range ==0.3.2.2
   - range-set-list ==0.1.4
   - ranged-list ==0.1.2.3
   - Ranged-sets ==0.5.0
@@ -2442,7 +2442,7 @@ default-package-overrides:
   - richenv ==0.1.0.4
   - rio ==0.1.24.0
   - rio-orphans ==0.1.2.0
-  - rio-prettyprint ==0.1.8.0
+  - rio-prettyprint ==0.1.9.0
   - rng-utils ==0.3.1
   - roc-id ==0.2.0.6
   - rocksdb-haskell ==1.0.1
@@ -2523,7 +2523,7 @@ default-package-overrides:
   - select-rpms ==0.3.1
   - selections ==0.3.0.0
   - selective ==0.7.0.1
-  - semialign ==1.3.1
+  - semialign ==1.3.1.1
   - semigroupoids ==6.0.2
   - semigroups ==0.20.1
   - semiring-simple ==1.0.0.1
@@ -2538,10 +2538,10 @@ default-package-overrides:
   - sequenceTools ==1.6.0.0
   - serialise ==0.2.6.1
   - servant ==0.20.3.0
-  - servant-auth ==0.4.2.0
-  - servant-auth-client ==0.4.2.0
+  - servant-auth ==0.4.9.2
+  - servant-auth-client ==0.4.9.2
   - servant-auth-docs ==0.2.11.0
-  - servant-auth-server ==0.4.9.1
+  - servant-auth-server ==0.4.9.2
   - servant-auth-swagger ==0.2.11.0
   - servant-blaze ==0.9.1
   - servant-checked-exceptions ==2.2.0.1
@@ -2601,7 +2601,7 @@ default-package-overrides:
   - shelly ==1.12.1.1
   - should-not-typecheck ==2.1.0
   - show-combinators ==0.2.0.0
-  - shower ==0.2.0.4
+  - shower ==0.2.0.5
   - siggy-chardust ==1.0.0
   - signal ==0.1.0.4
   - silently ==1.2.5.4
@@ -2673,7 +2673,6 @@ default-package-overrides:
   - sourcemap ==0.1.7
   - sox ==0.2.3.2
   - soxlib ==0.0.3.2
-  - spacecookie ==1.0.0.3
   - spdx ==1.1
   - special-values ==0.1.0.0
   - speculate ==0.4.20
@@ -2694,7 +2693,7 @@ default-package-overrides:
   - sqlite-simple ==0.4.19.0
   - squeather ==0.8.0.0
   - srcloc ==0.6.0.1
-  - srtree ==2.0.1.6
+  - srtree ==2.0.1.8
   - stache ==2.3.4
   - stack-all ==0.7.1
   - stack-clean-old ==0.5.2
@@ -2710,7 +2709,7 @@ default-package-overrides:
   - statistics ==0.16.5.0
   - statistics-linreg ==0.3
   - statsd-rupp ==0.5.0.1
-  - status-notifier-item ==0.3.2.10
+  - status-notifier-item ==0.3.2.13
   - step-function ==0.2.1
   - stitch ==0.6.0.0
   - stm-chans ==3.0.0.11
@@ -2833,7 +2832,7 @@ default-package-overrides:
   - tar ==0.6.4.0
   - tar-conduit ==0.4.1
   - tardis ==0.5.0.1
-  - tasty ==1.5.3
+  - tasty ==1.5.4
   - tasty-ant-xml ==1.1.9
   - tasty-autocollect ==0.4.4
   - tasty-bench ==0.4.1
@@ -2906,7 +2905,7 @@ default-package-overrides:
   - text-display ==1.0.0.0
   - text-encode ==0.2.0.0
   - text-icu ==0.8.0.5
-  - text-iso8601 ==0.1.1
+  - text-iso8601 ==0.1.1.1
   - text-latin1 ==0.3.1
   - text-ldap ==0.1.1.14
   - text-manipulate ==0.3.1.0
@@ -2983,7 +2982,7 @@ default-package-overrides:
   - tlynx ==0.8.0.0
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
-  - tmp-proc ==0.7.2.5
+  - tmp-proc ==0.7.2.6
   - tmp-proc-postgres ==0.7.2.4
   - tmp-proc-rabbitmq ==0.7.2.4
   - tmp-proc-redis ==0.7.2.4
@@ -3073,7 +3072,7 @@ default-package-overrides:
   - unicode-transforms ==0.4.0.1
   - unidecode ==0.1.0.4
   - unification-fd ==0.12.0.3
-  - union ==0.1.3
+  - union ==0.1.3.2
   - union-angle ==0.1.0.1
   - union-color ==0.1.4.0
   - union-find-array ==0.1.0.4
@@ -3092,7 +3091,7 @@ default-package-overrides:
   - universe-dependent-sum ==1.3.1
   - universe-instances-extended ==1.1.4
   - universe-reverse-instances ==1.1.2
-  - universe-some ==1.2.2
+  - universe-some ==1.2.2.1
   - unix-bytestring ==0.4.0.4
   - unix-compat ==0.7.4.1
   - unix-time ==0.4.17
@@ -3116,8 +3115,8 @@ default-package-overrides:
   - utf8-light ==0.4.4.0
   - utf8-string ==1.0.2
   - utility-ht ==0.0.17.2
-  - uuid ==1.3.16
-  - uuid-types ==1.0.6
+  - uuid ==1.3.16.1
+  - uuid-types ==1.0.6.1
   - valida ==1.1.0
   - valida-base ==0.2.0
   - validate-input ==0.5.0.0
@@ -3196,7 +3195,7 @@ default-package-overrides:
   - wai-middleware-caching-lru ==0.1.0.0
   - wai-middleware-caching-redis ==0.2.0.0
   - wai-middleware-clacks ==0.1.0.1
-  - wai-middleware-delegate ==0.2.0.1
+  - wai-middleware-delegate ==0.2.0.2
   - wai-middleware-metrics ==0.2.4
   - wai-middleware-prometheus ==1.0.1.0
   - wai-middleware-static ==0.9.4
@@ -3211,11 +3210,11 @@ default-package-overrides:
   - wai-websockets ==3.0.1.2
   - wakame ==0.1.0.0
   - warp ==3.4.9
-  - warp-tls ==3.4.13
+  - warp-tls ==3.4.14
   - wave ==0.2.1
   - wcwidth ==0.0.2
   - web-cookiejar ==0.1.3.1
-  - web-rep ==0.14.0.1
+  - web-rep ==0.14.1.0
   - web-routes ==0.27.16
   - web-routes-th ==0.22.8.3
   - web-view ==0.7.0
@@ -3251,7 +3250,7 @@ default-package-overrides:
   - wild-bind-x11 ==0.2.0.18
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
-  - witch ==1.3.0.9
+  - witch ==1.3.1.0
   - with-utf8 ==1.1.0.0
   - withdependencies ==0.3.1
   - witherable ==0.5
@@ -3280,7 +3279,7 @@ default-package-overrides:
   - x11-xim ==0.0.9.0
   - Xauth ==0.1
   - xdg-basedir ==0.2.2
-  - xdg-desktop-entry ==0.1.1.3
+  - xdg-desktop-entry ==0.1.1.4
   - xdg-userdirs ==0.1.0.2
   - xeno ==0.6
   - xls ==0.1.3
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 585b490011b6..7b38a8743e96 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -5,6 +5,7 @@
 dont-distribute-packages:
 
  - 4Blocks
+ - a-piece-of-flake
  - a50
  - abcBridge
  - AbortT-monadstf
@@ -12,8 +13,6 @@ dont-distribute-packages:
  - ac-machine-conduit
  - accelerate-arithmetic
  - accelerate-fourier
- - accelerate-llvm
- - accelerate-llvm-native
  - accelerate-typelits
  - access-token-provider
  - acme-circular-containers
@@ -216,7 +215,6 @@ dont-distribute-packages:
  - bbi
  - bdcs
  - bdcs-api
- - beam-duckdb
  - beam-th
  - beautifHOL
  - bech32-th
@@ -331,6 +329,8 @@ dont-distribute-packages:
  - bricks-syntax
  - brillo-examples
  - bronyradiogermany-streaming
+ - brush-strokes
+ - brush-stroking
  - btc-lsp
  - btree
  - buchhaltung
@@ -353,6 +353,7 @@ dont-distribute-packages:
  - cabal2arch
  - cabalmdvrpm
  - cabalrpmdeps
+ - cadence
  - caffegraph
  - cake
  - cakyrespa
@@ -627,6 +628,7 @@ dont-distribute-packages:
  - CSPM-Interpreter
  - CSPM-ToProlog
  - cspmchecker
+ - css-class-bindings
  - csv-enumerator
  - ctpl
  - cube
@@ -725,6 +727,7 @@ dont-distribute-packages:
  - dfinity-radix-tree
  - dhall-lex
  - dhall-secret
+ - dhscanner-kbapi
  - dhscanner-kbgen
  - dia-functions
  - diagrams-html5
@@ -792,7 +795,6 @@ dont-distribute-packages:
  - dsmc-tools
  - DSTM
  - dtd
- - duckdb-simple
  - duoidal-transformers
  - duoids-hedgehog
  - Dust
@@ -878,11 +880,11 @@ dont-distribute-packages:
  - eventium-memory
  - eventium-postgresql
  - eventium-sqlite
- - eventlog-live-otelcol
  - EventSocket
  - eventsource-geteventstore-store
  - eventsource-store-specs
  - eventsource-stub-store
+ - eventsourcing-postgresql
  - eventuo11y-batteries
  - eventuo11y-json
  - eventuo11y-otel
@@ -942,7 +944,6 @@ dont-distribute-packages:
  - fei-modelzoo
  - fei-nn
  - feldspar-compiler
- - feldspar-language
  - FermatsLastMargin
  - festung
  - ffmpeg-tutorials
@@ -987,6 +988,7 @@ dont-distribute-packages:
  - fluid-idl-scotty
  - FM-SBLEX
  - fmt-for-rio
+ - fnotation
  - foldl-transduce-attoparsec
  - follower
  - fontwhich
@@ -1043,6 +1045,7 @@ dont-distribute-packages:
  - ftshell
  - funbot
  - funbot-git-hook
+ - funcons-intgen
  - funcons-lambda-cbv-mp
  - funcons-simple
  - function-combine
@@ -1051,7 +1054,6 @@ dont-distribute-packages:
  - functor-monad
  - funflow
  - funflow-nix
- - fungll-combinators
  - funion
  - funsat
  - fwgl-glfw
@@ -1187,8 +1189,6 @@ dont-distribute-packages:
  - grapefruit-records
  - grapefruit-ui
  - grapefruit-ui-gtk
- - grapesy
- - grapesy-etcd
  - graph-rewriting-cl
  - graph-rewriting-gl
  - graph-rewriting-lambdascope
@@ -1242,6 +1242,7 @@ dont-distribute-packages:
  - GuiHaskell
  - GuiTV
  - h3spec
+ - haal-models
  - habit
  - hablo
  - Hach
@@ -1301,7 +1302,6 @@ dont-distribute-packages:
  - happstack-state
  - happybara-webkit
  - haquil
- - hardware-edsl
  - HaRe
  - hark
  - harmony
@@ -1379,14 +1379,9 @@ dont-distribute-packages:
  - haskgame
  - hasklepias
  - haskoin-bitcoind
- - haskoin-core
  - haskoin-crypto
- - haskoin-node
  - haskoin-protocol
  - haskoin-script
- - haskoin-store
- - haskoin-store-data
- - haskoin-wallet
  - haskoon
  - haskoon-httpspec
  - haskoon-salvia
@@ -1652,6 +1647,7 @@ dont-distribute-packages:
  - HSHHelpers
  - hsinspect-lsp
  - hslogstash
+ - hsmrc-marc8
  - HSoundFile
  - HsParrot
  - hspec-dirstream
@@ -1690,6 +1686,7 @@ dont-distribute-packages:
  - http-client-rustls
  - http-enumerator
  - http-response-decoder
+ - http-tower-hs
  - http2-client-grpc
  - http2-grpc-proto-lens
  - http2-grpc-proto3-wire
@@ -1764,8 +1761,23 @@ dont-distribute-packages:
  - iException
  - ige-mac-integration
  - igrf
+ - ihaskell-inline-r
  - ihaskell-rlangqq
  - ihaskell-symtegration
+ - ihp
+ - ihp-datasync
+ - ihp-datasync-typescript
+ - ihp-graphql
+ - ihp-hspec
+ - ihp-ide
+ - ihp-job-dashboard
+ - ihp-mail
+ - ihp-schema-compiler
+ - ihp-sitemap
+ - ihp-ssc
+ - ihp-typed-sql
+ - ihp-welcome
+ - ihp-zip
  - ihttp
  - imap
  - imbib
@@ -1776,8 +1788,6 @@ dont-distribute-packages:
  - imj-measure-stdout
  - immutaball-core
  - imparse
- - imperative-edsl
- - imperative-edsl-vhdl
  - importify
  - imprevu-happstack
  - improve
@@ -1914,7 +1924,6 @@ dont-distribute-packages:
  - karakuri
  - katip-rollbar
  - keelung
- - keera-hails-i18n
  - keera-hails-mvc-environment-gtk
  - keera-hails-mvc-model-lightmodel
  - keera-hails-mvc-model-protectedmodel
@@ -1955,6 +1964,7 @@ dont-distribute-packages:
  - koji-tool
  - korfu
  - ks-test
+ - ktx-font
  - kubernetes-client
  - kure-your-boilerplate
  - kurita
@@ -2195,7 +2205,6 @@ dont-distribute-packages:
  - mellon-web
  - memcache-conduit
  - memory-cd
- - memory-hexstring
  - merkle-patricia-db
  - message-db-temp
  - meta-par-accelerate
@@ -2218,8 +2227,6 @@ dont-distribute-packages:
  - microformats2-types
  - MicrosoftTranslator
  - midimory
- - mig-rio
- - mig-server
  - mighttpd
  - minecraft-data
  - minesweeper
@@ -2475,7 +2482,6 @@ dont-distribute-packages:
  - oops-examples
  - opc-xml-da-client
  - open-adt-tutorial
- - open-typerep
  - OpenAFP-Utils
  - OpenGLCheck
  - openpgp-Crypto
@@ -2528,6 +2534,7 @@ dont-distribute-packages:
  - parco-attoparsec
  - parco-parsec
  - parconc-examples
+ - parquet-haskell
  - parquet-hs
  - parse-help
  - parsestar
@@ -2680,14 +2687,11 @@ dont-distribute-packages:
  - postgresql-common-persistent
  - postgresql-pure
  - postgresql-simple-ltree
- - postgresql-simple-postgresql-types
  - postgresql-simple-queue
  - postgresql-simple-typed
  - postgresql-tx-query
  - postgresql-tx-squeal
  - postgresql-tx-squeal-compat-simple
- - postgresql-types
- - postgresql-types-algebra
  - postmark
  - potoki
  - potoki-cereal
@@ -2698,10 +2702,16 @@ dont-distribute-packages:
  - ppad-base58
  - ppad-bip32
  - ppad-bip39
+ - ppad-bolt3
+ - ppad-bolt4
+ - ppad-bolt5
+ - ppad-bolt7
+ - ppad-bolt8
  - ppad-hkdf
  - ppad-hmac-drbg
  - ppad-pbkdf
  - ppad-secp256k1
+ - ppad-tx
  - pqueue-mtl
  - practice-room
  - pred-trie
@@ -2764,7 +2774,6 @@ dont-distribute-packages:
  - qhull
  - qnap-decrypt
  - qr-repa
- - qrcode-juicypixels
  - qtah-cpp-qt5
  - qtah-cpp-qt6
  - qtah-examples
@@ -2848,7 +2857,6 @@ dont-distribute-packages:
  - reactor
  - readline-in-other-words
  - readpyc
- - reanimate
  - record-aeson
  - record-gl
  - record-preprocessor
@@ -2861,7 +2869,6 @@ dont-distribute-packages:
  - refh
  - reflex-animation
  - reflex-backend-wai
- - reflex-classhss
  - reflex-gloss-scene
  - reflex-libtelnet
  - reflex-localize
@@ -2900,7 +2907,6 @@ dont-distribute-packages:
  - repr
  - representable-tries
  - reserve
- - resin
  - resource-pool-catchio
  - resource-simple
  - rest-client
@@ -2962,9 +2968,6 @@ dont-distribute-packages:
  - rollbar-wai
  - rollbar-yesod
  - RollingDirectory
- - ron-rdt
- - ron-schema
- - ron-storage
  - rose-trie
  - roshask
  - rosmsg-bin
@@ -3109,6 +3112,7 @@ dont-distribute-packages:
  - servant-streaming-docs
  - servant-streaming-server
  - servant-swagger-tags
+ - servant-tower-hs
  - servant-util-beam-pg
  - servant-waargonaut
  - servant-zeppelin-client
@@ -3136,6 +3140,7 @@ dont-distribute-packages:
  - Shellac-haskeline
  - Shellac-readline
  - shellmate-extras
+ - shibuya-kafka-adapter
  - shibuya-metrics
  - shibuya-pgmq-adapter
  - shine-varying
@@ -3357,7 +3362,6 @@ dont-distribute-packages:
  - sv-svfactor
  - SVG2Q
  - svg2q
- - svgone
  - swapper
  - switch
  - syb-with-class-instances-text
@@ -3516,6 +3520,7 @@ dont-distribute-packages:
  - trurl
  - tsession-happstack
  - tsweb
+ - tui-launcher
  - tuntap-simple
  - tup-functor
  - tuple-gen
@@ -3695,14 +3700,6 @@ dont-distribute-packages:
  - web-routes-regular
  - web-routing
  - web-view-colonnade
- - web3
- - web3-bignum
- - web3-crypto
- - web3-ethereum
- - web3-polkadot
- - web3-provider
- - web3-solidity
- - web3-tools
  - WebBits-Html
  - WebBits-multiplate
  - WebCont
diff --git a/pkgs/development/haskell-modules/configuration-microhs.nix b/pkgs/development/haskell-modules/configuration-microhs.nix
index 182394c829f5..09a8ec8aaf11 100644
--- a/pkgs/development/haskell-modules/configuration-microhs.nix
+++ b/pkgs/development/haskell-modules/configuration-microhs.nix
@@ -43,6 +43,7 @@ self: super: {
   ghc-boot = null;
   ghc-boot-th = null;
   ghc-compact = null;
+  ghc-experimental = null;
   ghc-heap = null;
   ghc-internal = null;
   ghc-platform = null;
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 25dd807fab28..feee4403b436 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -185,9 +185,23 @@ builtins.intersectAttrs super {
     }) super.threadscope
   );
 
+  # Test suite loops forever by design (?!)
+  # https://hackage-content.haskell.org/package/lager-1.0.0.0/src/test/Main.hs
+  lager = dontCheck super.lager;
+
   # Binary may be used separately for e.g. editor integrations
   cabal-cargs = enableSeparateBinOutput super.cabal-cargs;
 
+  # Needs pginit to function and pgrep to verify.
+  tmp-postgres = overrideCabal (drv: {
+    preCheck = ''
+      export HOME="$TMPDIR"
+    ''
+    + (drv.preCheck or "");
+    libraryToolDepends = drv.libraryToolDepends or [ ] ++ [ pkgs.buildPackages.postgresql ];
+    testToolDepends = drv.testToolDepends or [ ] ++ [ pkgs.procps ];
+  }) super.tmp-postgres;
+
   # Use the default version of mysql to build this package (which is actually mariadb).
   # test phase requires networking
   mysql = dontCheck super.mysql;
@@ -204,6 +218,18 @@ builtins.intersectAttrs super {
     '';
   }) super.cuda;
 
+  # Compiles some C or C++ source which requires these headers
+  VulkanMemoryAllocator = addExtraLibrary pkgs.vulkan-headers super.VulkanMemoryAllocator;
+  vulkan-utils = addExtraLibrary pkgs.vulkan-headers super.vulkan-utils;
+
+  # Requires wrapQtAppsHook
+  qtah-cpp-qt5 = overrideCabal (drv: {
+    buildDepends = [ pkgs.qt5.wrapQtAppsHook ];
+  }) super.qtah-cpp-qt5;
+
+  # https://github.com/evanrinehart/mikmod/issues/1
+  mikmod = addExtraLibrary pkgs.libmikmod super.mikmod;
+
   nvvm = overrideCabal (drv: {
     preConfigure = ''
       export CUDA_PATH=${pkgs.cudatoolkit}
@@ -265,11 +291,13 @@ builtins.intersectAttrs super {
   # jni needs help finding libjvm.so because it's in a weird location.
   jni = overrideCabal (drv: {
     preConfigure = ''
-      local libdir=( "${pkgs.jdk}/lib/openjdk/jre/lib/"*"/server" )
-      appendToVar configureFlags "--extra-lib-dir=''${libdir[0]}"
+      local libdir=( "${lib.getLib pkgs.jdk}/lib/openjdk/lib/server" )
+      appendToVar configureFlags "--extra-lib-dirs=''${libdir[0]}"
     '';
   }) super.jni;
 
+  inline-java = addBuildDepend pkgs.jdk super.inline-java;
+
   # Won't find it's header files without help.
   sfml-audio = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.sfml-audio;
 
@@ -372,6 +400,9 @@ builtins.intersectAttrs super {
     addBuildDepends [ pkgs.double-conversion ] super.double-conversion
   );
 
+  # library dependency declaration hidden behind conditional
+  bindings-levmar = addExtraLibrary pkgs.blas super.bindings-levmar;
+
   # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
   gio = lib.pipe super.gio [
     (disableHardening [ "fortify" ])
@@ -511,6 +542,10 @@ builtins.intersectAttrs super {
   # Wants to execute cabal-install
   ghci-quickfix = dontCheck super.ghci-quickfix;
 
+  # * doctests don't work without cabal-install
+  #   https://github.com/noinia/hgeometry/issues/132 krank:ignore-line
+  hgeometry-combinatorial = dontCheck super.hgeometry-combinatorial;
+
   # These packages try to access the network.
   amqp = dontCheck super.amqp;
   amqp-conduit = dontCheck super.amqp-conduit;
@@ -553,6 +588,21 @@ builtins.intersectAttrs super {
   mustache = dontCheck super.mustache;
   arch-web = dontCheck super.arch-web;
 
+  # https://github.com/NixOS/nixpkgs/issues/6350 krank:ignore-line
+  paypal-adaptive-hoops = overrideCabal (drv: {
+    testTargets = [ "local" ];
+  }) super.paypal-adaptive-hoops;
+
+  # Wrap the generated binaries to include their run-time dependencies in $PATH.
+  cryptol = overrideCabal (drv: {
+    buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
+    postInstall = drv.postInstall or "" + ''
+      for b in $out/bin/cryptol $out/bin/cryptol-html; do
+        wrapProgram $b --prefix 'PATH' ':' "${lib.getBin pkgs.z3}/bin"
+      done
+    '';
+  }) super.cryptol;
+
   # Some test cases require network access
   hpack_0_39_1 = doDistribute (
     overrideCabal (drv: {
@@ -591,6 +641,9 @@ builtins.intersectAttrs super {
   # Package does not declare tool dependency hspec-discover
   unliftio = addTestToolDepends [ self.hspec-discover ] super.unliftio;
 
+  # Package does not declare tool dependency hspec-discover
+  text-zipper = addTestToolDepends [ self.hspec-discover ] super.text-zipper;
+
   # Package does not declare tool dependency hspec-discover
   word8 = addTestToolDepends [ self.hspec-discover ] super.word8;
 
@@ -952,6 +1005,24 @@ builtins.intersectAttrs super {
   # https://github.com/plow-technologies/servant-streaming/issues/12
   servant-streaming-server = dontCheck super.servant-streaming-server;
 
+  reanimate = overrideCabal (drv: {
+    buildTools = (drv.buildTools or [ ]) ++ [
+      # needed for testsuite
+      pkgs.ffmpeg
+      pkgs.librsvg
+      pkgs.texliveFull
+    ];
+  }) super.reanimate;
+
+  reanimate-svg = overrideCabal (drv: {
+    buildTools = (drv.buildTools or [ ]) ++ [
+      # needed for testsuite
+      pkgs.freefont_ttf
+      pkgs.librsvg
+      pkgs.pango
+    ];
+  }) super.reanimate-svg;
+
   # https://github.com/haskell-servant/servant/pull/1238
   servant-client-core =
     if (pkgs.lib.getVersion super.servant-client-core) == "0.16" then
@@ -1476,6 +1547,12 @@ builtins.intersectAttrs super {
     (dontCheckIf (!pkgs.postgresql.doInstallCheck || !self.testcontainers.doCheck))
   ];
 
+  # integration-tests suite needs docker/testcontainers; run only unit-tests.
+  postgresql-types = overrideCabal { testTargets = [ "unit-tests" ]; } super.postgresql-types;
+
+  # only test suite is testcontainers/docker-based
+  postgresql-simple-postgresql-types = dontCheck super.postgresql-simple-postgresql-types;
+
   users-postgresql-simple = lib.pipe super.users-postgresql-simple [
     (addTestToolDepends [
       pkgs.postgresql
@@ -2250,20 +2327,20 @@ builtins.intersectAttrs super {
 
   botan-bindings = super.botan-bindings.override { botan = pkgs.botan3; };
 
-  # Avoids a cycle by disabling use of the external interpreter for the packages that are dependencies of iserv-proxy.
-  # These in particular can't rely on template haskell for cross-compilation anyway as they can't rely on iserv-proxy.
-  inherit
-    (
-      let
-        noExternalInterpreter = overrideCabal {
-          enableExternalInterpreter = false;
-        };
-      in
-      lib.mapAttrs (_: noExternalInterpreter) { inherit (super) iserv-proxy network; }
-    )
-    iserv-proxy
-    network
-    ;
+  iserv-proxy =
+    let
+      # Avoid a cycle by disabling tests and the external interpreter for packages that are dependencies of iserv-proxy.
+      # These in particular can't rely on template haskell for cross-compilation anyway as they can't rely on iserv-proxy.
+      # Also disable tests during iserv-proxy bootstrap since test packages tend to rely on TH for discovering test cases
+      breakExternalInterpreterBootstrapCycle = overrideCabal {
+        doCheck = false;
+        enableExternalInterpreter = false;
+      };
+      overlay = lib.mapAttrs (
+        _: pkg: if (pkg ? isHaskellLibrary) then breakExternalInterpreterBootstrapCycle pkg else pkg
+      );
+    in
+    super.iserv-proxy.overrideScope (_: overlay);
 
   # Workaround for flaky test: https://github.com/basvandijk/threads/issues/10
   threads = appendPatch ./patches/threads-flaky-test.patch super.threads;
diff --git a/pkgs/development/haskell-modules/configuration-windows.nix b/pkgs/development/haskell-modules/configuration-windows.nix
index 5489c415f09c..735a55ca4068 100644
--- a/pkgs/development/haskell-modules/configuration-windows.nix
+++ b/pkgs/development/haskell-modules/configuration-windows.nix
@@ -37,21 +37,4 @@ with haskellLib;
   # Root cause seems to be undefined references to libffi as shown by linking errors if we instead use "-Wl,--disable-auto-import"
   # See https://github.com/rust-lang/rust/issues/132226#issuecomment-2445100058
   iserv-proxy = appendConfigureFlag "--ghc-option=-optl=-Wl,--disable-runtime-pseudo-reloc" super.iserv-proxy;
-
-  # Avoids a cycle by disabling use of the external interpreter for the packages that are dependencies of iserv-proxy.
-  # See configuration-nix.nix, where iserv-proxy and network are handled.
-  # On Windows, network depends on temporary (see above), which depends on random, which depends on splitmix.
-  inherit
-    (
-      let
-        noExternalInterpreter = overrideCabal {
-          enableExternalInterpreter = false;
-        };
-      in
-      lib.mapAttrs (_: noExternalInterpreter) { inherit (super) random splitmix temporary; }
-    )
-    random
-    splitmix
-    temporary
-    ;
 })
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index e8d85a3e120b..4d12e580a9c5 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -26,8 +26,9 @@ let
     needsExternalInterpreterSetup = !stdenv.hostPlatform.isGhcjs; # JS backend already handles this
 
     canProxyTH =
-      # iserv-proxy currently does not build on GHC 9.6
-      lib.versionAtLeast ghc.version "9.8" && stdenv.hostPlatform.emulatorAvailable buildPackages;
+      # Using iserv-proxy with 9.4 yields
+      #   no location info>: error: Dynamic loading not supported
+      lib.versionAtLeast ghc.version "9.6" && stdenv.hostPlatform.emulatorAvailable buildPackages;
 
     iservWrapper =
       let
@@ -45,14 +46,8 @@ let
           in
           buildPackages.writeShellScriptBin ("iserv-wrapper" + lib.optionalString enableProfiling "-prof") ''
             set -euo pipefail
-            PORT=$((5000 + $RANDOM % 5000))
             ${lib.optionalString stdenv.hostPlatform.isWindows "export WINEDEBUG=-all WINEPREFIX=$TMP"}
-            (>&2 echo "---> Starting interpreter on port $PORT")
-            ${emulator} ${hostProxy} tmp $PORT &
-            RISERV_PID="$!"
-            trap "kill $RISERV_PID" EXIT # Needs cleanup when building without sandbox
-            ${buildProxy} $@ 127.0.0.1 "$PORT"
-            (>&2 echo "---> killing interpreter...")
+            ${buildProxy} $@ --pipe ${emulator} ${hostProxy} tmp --stdio
           '';
 
         # GHC will add `-prof` to the external interpreter when doing a profiled build.
@@ -261,8 +256,7 @@ in
   __onlyPropagateKnownPkgConfigModules ? false,
   enableExternalInterpreter ?
     isCross && crossSupport.canProxyTH && crossSupport.needsExternalInterpreterSetup,
-  # iserv-proxy needs local network access
-  __darwinAllowLocalNetworking ? stdenv.hostPlatform.isDarwin && enableExternalInterpreter,
+  __darwinAllowLocalNetworking ? false,
 }@args:
 
 assert editedCabalFile != null -> revision != null;
@@ -1140,8 +1134,8 @@ lib.fix (
     // optionalAttrs (disallowedRequisites != [ ] || disallowGhcReference) {
       disallowedRequisites = disallowedRequisites ++ (if disallowGhcReference then [ ghc ] else [ ]);
     }
-    // optionalAttrs (__darwinAllowLocalNetworking || args ? __darwinLocalNetworking) {
-      __darwinAllowLocalNetworking = true;
+    // optionalAttrs (__darwinAllowLocalNetworking || args ? __darwinAllowLocalNetworking) {
+      inherit __darwinAllowLocalNetworking;
     }
   )
 )
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 957f39e6a76c..e74f9f728f4e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -144,8 +144,8 @@ self: {
     }:
     mkDerivation {
       pname = "A-gent";
-      version = "0.11.0.5";
-      sha256 = "0ydrdqya81nxv4zxqflciihl4khidm4ipqqhh1x3bbwyqmayhv5x";
+      version = "0.11.0.11";
+      sha256 = "1br5yd6xv7v95i1m1jm95xyfwsy0ik7g6v7j9h6zih8rc6bvmqb3";
       libraryHaskellDepends = [
         base
         containers
@@ -154,8 +154,6 @@ self: {
       ];
       description = "Polite & well educated LLM agent with excellent manners that always behaves well";
       license = "(SSPL-1.0 OR AGPL-3.0-only)";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -1564,8 +1562,8 @@ self: {
       pname = "Agda";
       version = "2.8.0";
       sha256 = "184vjq260zf5w9c8nz11nbhpsvq3a1yxp7mhaz7synlaww3ik146";
-      revision = "2";
-      editedCabalFile = "1a011g959hv8s5slz68a37ppmjyfa84l842g0wll83b5hmk1nfxp";
+      revision = "3";
+      editedCabalFile = "0c839h8x7lbwhmsi8yjkvrl9rhb0a57va7rs4lsh0l4gbx2g5rk9";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -2083,26 +2081,57 @@ self: {
   Aoide = callPackage (
     {
       mkDerivation,
+      barbies,
       base,
       bytestring,
+      containers,
+      directory,
+      filepath,
+      generic-lens,
+      Kawaii-Parser,
+      lens,
       mtl,
       process,
-      template-haskell,
+      transformers,
     }:
     mkDerivation {
       pname = "Aoide";
-      version = "0.1.0.2";
-      sha256 = "1nldvg8fwgbvn50prar3vs1nh704s1603fikyg2lhpz754yp0qbc";
+      version = "1.0.0.0";
+      sha256 = "0xrdagpyzp0pxvbir1fipyn5kwsb3qkrwiriyaakj0kjwjs79x7y";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [
+        barbies
         base
         bytestring
+        containers
+        directory
+        filepath
+        generic-lens
+        Kawaii-Parser
+        lens
         mtl
         process
-        template-haskell
+        transformers
       ];
-      description = "A simple music library with the capability of generating .ly and .mid files.";
-      license = lib.licenses.bsd3;
+      executableHaskellDepends = [
+        barbies
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        generic-lens
+        Kawaii-Parser
+        lens
+        mtl
+        process
+        transformers
+      ];
+      description = "A simple music library that can generate Lilypond and MIDI files";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
+      mainProgram = "Aoide";
       broken = true;
     }
   ) { };
@@ -2576,8 +2605,8 @@ self: {
     }:
     mkDerivation {
       pname = "BNFC";
-      version = "2.9.6.2";
-      sha256 = "12cap3xqsa06bkhq46qazaqvpcckh0p7cnyacr4p1klr1nvlxkcr";
+      version = "2.9.6.3";
+      sha256 = "1iln92nxs90257ssi5gk0yqidg7yfhxyx3xag0kv28xhcmig1vln";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -6020,8 +6049,6 @@ self: {
       ];
       description = "API for the Hooks build-type";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -6210,6 +6237,8 @@ self: {
       pname = "Cabal-syntax";
       version = "3.14.2.0";
       sha256 = "11armvlq5ygzrsn1k4vld8fr5li1vh9gd1l4al31kz7zvbm3jpwx";
+      revision = "1";
+      editedCabalFile = "1c4p88kcnrna0d31zdps3cy74mic56ip4f92a88z0in3c1ciflv6";
       libraryHaskellDepends = [
         array
         base
@@ -6256,6 +6285,8 @@ self: {
       pname = "Cabal-syntax";
       version = "3.16.1.0";
       sha256 = "19xx6q5va5hv2c6khf5khgyv1l84nm6a65vfi6jar5jdkd263mbb";
+      revision = "1";
+      editedCabalFile = "1jh16xcdzbhwhdracim2b234nqg0irdvki1czphg30blgg91hvsj";
       libraryHaskellDepends = [
         array
         base
@@ -6391,8 +6422,6 @@ self: {
       ];
       description = "An implementation and DSL for the Carneades argumentation model";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -7279,8 +7308,6 @@ self: {
       ];
       description = "Typified Tailwind for Rapid Development";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -26722,8 +26749,8 @@ self: {
     }:
     mkDerivation {
       pname = "Kawaii-Parser";
-      version = "4.0.0";
-      sha256 = "1m4mpvgp3kx8wabklxj73i0gh1zhqk5al16s41qbnsz14da3d3nx";
+      version = "5.0.0";
+      sha256 = "0731dihnjxi9fmwadgz7r3200zsbx28xzkl5sardh80snkjgsjsb";
       libraryHaskellDepends = [
         base
         containers
@@ -35443,8 +35470,8 @@ self: {
     }:
     mkDerivation {
       pname = "PenroseKiteDart";
-      version = "1.6.1";
-      sha256 = "1250m14qlq43gv3k1xydab08vhfl44cyrcalkjpm9b3fk3p9vncq";
+      version = "1.7";
+      sha256 = "1gfgqs9v2yrhpppfikh9v9mgr0drp4r0w087h9cja13zmdk25pga";
       libraryHaskellDepends = [
         base
         containers
@@ -42438,6 +42465,7 @@ self: {
       ];
       description = "Assorted utility modules";
       license = lib.licenses.mit;
+      platforms = lib.platforms.windows;
     }
   ) { };
 
@@ -49318,6 +49346,171 @@ self: {
     }
   ) { };
 
+  a-piece-of-flake = callPackage (
+    {
+      mkDerivation,
+      acid-state,
+      add-dependent-file,
+      aeson,
+      aeson-pretty,
+      base,
+      binary,
+      blaze-markup,
+      bytestring,
+      cryptohash-sha1,
+      deepseq,
+      either,
+      exceptions,
+      file-embed,
+      filepath,
+      full-text-search,
+      generics-sop,
+      hostname,
+      http-types,
+      lens,
+      list-t,
+      lrucaching,
+      memory,
+      monad-logger,
+      mtl,
+      network,
+      non-empty,
+      non-negative-time-diff,
+      optparse-applicative,
+      prettyprinter,
+      process,
+      psqueues,
+      QuickCheck,
+      ref-tf,
+      refined,
+      regex-tdfa,
+      relude,
+      req,
+      retry,
+      ring-buffer,
+      safecopy,
+      sop-core,
+      statistics,
+      stm,
+      stm-containers,
+      tagged,
+      tar,
+      tasty,
+      tasty-discover,
+      tasty-hunit,
+      tasty-quickcheck,
+      template-haskell,
+      text-zipper,
+      time,
+      time-units,
+      tokenize,
+      trace-embrace,
+      unliftio,
+      vector,
+      wai,
+      wai-extra,
+      warp,
+      warp-tls,
+      wl-pprint-text,
+      yesod-core,
+    }:
+    mkDerivation {
+      pname = "a-piece-of-flake";
+      version = "0.0.1";
+      sha256 = "00cfnpd1wxlm8csggv4i5r9cxyqrw24hnyq4jylkck943gz0r0ic";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        acid-state
+        add-dependent-file
+        aeson
+        aeson-pretty
+        base
+        binary
+        blaze-markup
+        bytestring
+        cryptohash-sha1
+        deepseq
+        either
+        exceptions
+        file-embed
+        filepath
+        full-text-search
+        generics-sop
+        hostname
+        http-types
+        lens
+        list-t
+        lrucaching
+        memory
+        monad-logger
+        mtl
+        network
+        non-empty
+        non-negative-time-diff
+        optparse-applicative
+        prettyprinter
+        process
+        psqueues
+        ref-tf
+        refined
+        regex-tdfa
+        relude
+        req
+        retry
+        ring-buffer
+        safecopy
+        sop-core
+        statistics
+        stm
+        stm-containers
+        tagged
+        tar
+        template-haskell
+        text-zipper
+        time
+        time-units
+        tokenize
+        trace-embrace
+        unliftio
+        vector
+        wai
+        wai-extra
+        warp
+        warp-tls
+        wl-pprint-text
+        yesod-core
+      ];
+      executableHaskellDepends = [
+        base
+        optparse-applicative
+        relude
+        tagged
+        unliftio
+        yesod-core
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        optparse-applicative
+        QuickCheck
+        relude
+        tagged
+        tasty
+        tasty-discover
+        tasty-hunit
+        tasty-quickcheck
+        unliftio
+        yesod-core
+      ];
+      testToolDepends = [ tasty-discover ];
+      description = "Nix flake repository for everyone";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "a-piece-of-flake";
+    }
+  ) { };
+
   a50 = callPackage (
     {
       mkDerivation,
@@ -49822,8 +50015,8 @@ self: {
     }:
     mkDerivation {
       pname = "ac-library-hs";
-      version = "1.5.3.1";
-      sha256 = "1iifgwy2m6dqk61lp7jd9qvcdk6j6bmmp9y5bscvmyb2n95lvwp5";
+      version = "1.5.3.2";
+      sha256 = "1l4z88ad3qfiy5apq22py24kxq3db9aavdk0y1986j7xyf5ynjjx";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -49992,18 +50185,19 @@ self: {
       Cabal,
       cabal-doctest,
       containers,
-      cryptonite,
       deepseq,
       directory,
       doctest,
+      double-conversion,
       exceptions,
       filepath,
+      formatting,
       ghc-prim,
       half,
       hashable,
       hashtables,
       hedgehog,
-      lens,
+      microlens,
       mtl,
       prettyprinter,
       prettyprinter-ansi-terminal,
@@ -50020,12 +50214,16 @@ self: {
     }:
     mkDerivation {
       pname = "accelerate";
-      version = "1.3.0.0";
-      sha256 = "14md9fbxckgwpbkm7hdj95ny11w5b5cj103r8razg0aw2hgid5sb";
+      version = "1.4.0.0";
+      sha256 = "055r9dcznm5gic9dn924sxbcywjjjf353aw89ml4fzknfwl5kamr";
+      isLibrary = true;
+      isExecutable = true;
       setupHaskellDepends = [
         base
         Cabal
         cabal-doctest
+        directory
+        filepath
       ];
       libraryHaskellDepends = [
         ansi-terminal
@@ -50033,17 +50231,18 @@ self: {
         base-orphans
         bytestring
         containers
-        cryptonite
         deepseq
         directory
+        double-conversion
         exceptions
         filepath
+        formatting
         ghc-prim
         half
         hashable
         hashtables
         hedgehog
-        lens
+        microlens
         mtl
         prettyprinter
         prettyprinter-ansi-terminal
@@ -50063,7 +50262,7 @@ self: {
         doctest
       ];
       description = "An embedded language for accelerated array processing";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -50984,18 +51183,27 @@ self: {
       dlist,
       exceptions,
       filepath,
-      llvm-hs,
-      llvm-hs-pure,
+      formatting,
+      hashable,
+      microlens,
+      microlens-th,
+      monadLib,
       mtl,
+      parsec,
+      pretty,
       primitive,
+      process,
+      syb,
       template-haskell,
+      text,
+      th-abstraction,
       unordered-containers,
       vector,
     }:
     mkDerivation {
       pname = "accelerate-llvm";
-      version = "1.3.0.0";
-      sha256 = "1fjjfjav11s6grwl6ihqdrzx738bwki0l25qlp4zzz2hi2440qbp";
+      version = "1.4.0.0";
+      sha256 = "0j101nmc1iirx5xrdgf8l6572vjfqnfryy6g3s1rxriy323drz04";
       libraryHaskellDepends = [
         accelerate
         base
@@ -51008,17 +51216,26 @@ self: {
         dlist
         exceptions
         filepath
-        llvm-hs
-        llvm-hs-pure
+        formatting
+        hashable
+        microlens
+        microlens-th
+        monadLib
         mtl
+        parsec
+        pretty
         primitive
+        process
+        syb
         template-haskell
+        text
+        th-abstraction
         unordered-containers
         vector
       ];
+      doHaddock = false;
       description = "Accelerate backend component generating LLVM IR";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -51029,64 +51246,75 @@ self: {
       accelerate-llvm,
       base,
       bytestring,
-      c2hs,
-      cereal,
+      Cabal,
       containers,
       deepseq,
       directory,
       dlist,
       filepath,
+      formatting,
       ghc,
-      ghc-prim,
       hashable,
       libffi,
-      llvm-hs,
-      llvm-hs-pure,
       lockfree-queue,
       mtl,
+      pretty,
+      process,
+      tasty,
+      tasty-hunit,
       template-haskell,
+      text,
+      th-lift-instances,
       unique,
       unix,
+      unordered-containers,
       vector,
     }:
     mkDerivation {
       pname = "accelerate-llvm-native";
-      version = "1.3.0.0";
-      sha256 = "1x4wfbp83ppzknd98k2ad160a8kdqh96qqmyfzdqyvy44iskxcn6";
-      revision = "1";
-      editedCabalFile = "1w98zxyg5zr9xbx6wzglh1agc7pf25qlxbblvvvizf9niq84bw56";
+      version = "1.4.0.0";
+      sha256 = "1bl4br298vn6gl5dfqy0bc0kh3vxbhfmpbds9xcby2qyq6mjk60q";
+      setupHaskellDepends = [
+        base
+        Cabal
+        filepath
+      ];
       libraryHaskellDepends = [
         accelerate
         accelerate-llvm
         base
         bytestring
-        cereal
         containers
         deepseq
         directory
         dlist
         filepath
+        formatting
         ghc
-        ghc-prim
         hashable
         libffi
-        llvm-hs
-        llvm-hs-pure
         lockfree-queue
         mtl
+        pretty
+        process
         template-haskell
+        text
+        th-lift-instances
         unique
         unix
+        unordered-containers
         vector
       ];
-      libraryToolDepends = [ c2hs ];
       testHaskellDepends = [
         accelerate
         base
+        tasty
+        tasty-hunit
       ];
       description = "Accelerate backend for multicore CPUs";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -51104,21 +51332,24 @@ self: {
       dlist,
       file-embed,
       filepath,
+      formatting,
       ghc-heap,
       hashable,
-      llvm-hs,
-      llvm-hs-pure,
       mtl,
-      nvvm,
       pretty,
+      prettyprinter,
+      primitive,
       process,
+      tasty,
+      tasty-hunit,
       template-haskell,
+      text,
       unordered-containers,
     }:
     mkDerivation {
       pname = "accelerate-llvm-ptx";
-      version = "1.3.0.0";
-      sha256 = "0bb7p67dv5csbblnaxbm7hkq8y2qknz0yd1f0rav29igsv3a9rfx";
+      version = "1.4.0.0";
+      sha256 = "0f70p2nnwwaw1h18wg6i9n1alwl4437vsnsw0r5s0b7f2s741bx5";
       libraryHaskellDepends = [
         accelerate
         accelerate-llvm
@@ -51131,23 +51362,26 @@ self: {
         dlist
         file-embed
         filepath
+        formatting
         ghc-heap
         hashable
-        llvm-hs
-        llvm-hs-pure
         mtl
-        nvvm
         pretty
+        prettyprinter
+        primitive
         process
         template-haskell
+        text
         unordered-containers
       ];
       testHaskellDepends = [
         accelerate
         base
+        tasty
+        tasty-hunit
       ];
       description = "Accelerate backend for NVIDIA GPUs";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -52801,6 +53035,38 @@ self: {
     }
   ) { };
 
+  active_0_2_1_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      lens,
+      linear,
+      QuickCheck,
+      semigroupoids,
+      vector,
+    }:
+    mkDerivation {
+      pname = "active";
+      version = "0.2.1.1";
+      sha256 = "0q5hq0cyrhi9vnq8hrmv53dl2vdglj8c6jli18yl9kzadhbqai2s";
+      libraryHaskellDepends = [
+        base
+        lens
+        linear
+        semigroupoids
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        linear
+        QuickCheck
+      ];
+      description = "Abstractions for animation";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   activehs = callPackage (
     {
       mkDerivation,
@@ -53242,8 +53508,8 @@ self: {
     }:
     mkDerivation {
       pname = "add-dependent-file";
-      version = "0.0.1";
-      sha256 = "1rsfvgrlyd76vpdsrq6qcl4zm3g361lj7g4r63r2jwdrv5ayzrg8";
+      version = "0.0.2";
+      sha256 = "1ri0sf07w8qb6217c8ny5lrv9wmnb1s06z6x4a8cn6qm490n6iky";
       libraryHaskellDepends = [
         base
         bytestring
@@ -54096,7 +54362,6 @@ self: {
       filepath,
       generic-deriving,
       generically,
-      ghc-prim,
       hashable,
       indexed-traversable,
       integer-conversion,
@@ -54129,10 +54394,8 @@ self: {
     }:
     mkDerivation {
       pname = "aeson";
-      version = "2.2.3.0";
-      sha256 = "1akbrh8iz47f0ai30yabg1n4vcf1fx0a9gzj45fx0si553s5r8ns";
-      revision = "4";
-      editedCabalFile = "0yw5kahz82kls4svn0qssckvx143k73h5nqg0z1d4s7ibqww4j3x";
+      version = "2.2.4.1";
+      sha256 = "0q7s09y0nqnf2rb06jwr2i0p9cjpplpys93xi34fdyzlgjmg2wa0";
       libraryHaskellDepends = [
         base
         bytestring
@@ -54142,8 +54405,6 @@ self: {
         deepseq
         dlist
         exceptions
-        generically
-        ghc-prim
         hashable
         indexed-traversable
         integer-conversion
@@ -54177,20 +54438,17 @@ self: {
         bytestring
         containers
         data-fix
-        deepseq
         Diff
         directory
         dlist
         filepath
         generic-deriving
         generically
-        ghc-prim
         hashable
         indexed-traversable
         integer-logarithms
         network-uri
         OneTuple
-        primitive
         QuickCheck
         quickcheck-instances
         scientific
@@ -54200,7 +54458,6 @@ self: {
         tasty-golden
         tasty-hunit
         tasty-quickcheck
-        template-haskell
         text
         text-short
         these
@@ -55481,8 +55738,8 @@ self: {
     }:
     mkDerivation {
       pname = "aeson-match-qq";
-      version = "1.8.0";
-      sha256 = "1jzkxpy7qgln68sz5r9j5n963pnwxnclqav8qfc583yv9zszl0dp";
+      version = "1.9.0";
+      sha256 = "1naxb6ymg5f8dmj3xbcim5q09g10b7a1n5dmzc4wp6pwjaqxw2vv";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -56548,6 +56805,49 @@ self: {
     }
   ) { };
 
+  aeson-value-qq = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      attoparsec-aeson,
+      base,
+      bytestring,
+      ghc-hs-meta,
+      hspec,
+      scientific,
+      template-haskell,
+      text,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "aeson-value-qq";
+      version = "1.0.0";
+      sha256 = "0gw92qy5ih3z55afz0xkc8jigx1cqaajjcnhkg45bw1q44xsiy4n";
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        attoparsec-aeson
+        base
+        bytestring
+        ghc-hs-meta
+        scientific
+        template-haskell
+        text
+        unordered-containers
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        hspec
+      ];
+      description = "QuasiQuoter for Aeson.Value";
+      license = lib.licenses.bsd2;
+    }
+  ) { };
+
   aeson-via = callPackage (
     {
       mkDerivation,
@@ -58808,8 +59108,8 @@ self: {
     }:
     mkDerivation {
       pname = "alex";
-      version = "3.5.4.0";
-      sha256 = "1plasa0h85dfcga2h4yd1bqfi8smx4ghscyg299nh3lhqkr71sm9";
+      version = "3.5.4.2";
+      sha256 = "06248zzh03ijyaj98a54p1rqgvyl3w1kawsz74q9mig2c34isj6z";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -59010,6 +59310,66 @@ self: {
     }
   ) { };
 
+  alfred-margaret_2_1_1_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      containers,
+      criterion,
+      deepseq,
+      hashable,
+      hspec,
+      hspec-expectations,
+      primitive,
+      QuickCheck,
+      quickcheck-instances,
+      text,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "alfred-margaret";
+      version = "2.1.1.0";
+      sha256 = "1n6ks3a2m7pjwm2xln45g34vf81mb5d9xwz9963qryn8i53h5ncj";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        containers
+        deepseq
+        hashable
+        primitive
+        text
+        unordered-containers
+        vector
+      ];
+      executableHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        deepseq
+        hspec
+        hspec-expectations
+        primitive
+        QuickCheck
+        quickcheck-instances
+        text
+      ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        deepseq
+        text
+        vector
+      ];
+      description = "Fast Aho-Corasick string searching";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "dump-automaton";
+    }
+  ) { };
+
   alg = callPackage (
     {
       mkDerivation,
@@ -59411,6 +59771,41 @@ self: {
     }
   ) { };
 
+  algebraic-edge-graphs = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      containers,
+      criterion,
+      extra,
+      QuickCheck,
+    }:
+    mkDerivation {
+      pname = "algebraic-edge-graphs";
+      version = "0.1.0";
+      sha256 = "1wx149smpf4v0ksspgzxj46pb3ar24kw0kcynapgyg33hc85gli8";
+      libraryHaskellDepends = [
+        array
+        base
+        containers
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        extra
+        QuickCheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        containers
+        criterion
+      ];
+      description = "A library for algebraic edge-graph construction and transformation";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   algebraic-graph-duoids = callPackage (
     {
       mkDerivation,
@@ -78811,8 +79206,8 @@ self: {
     }:
     mkDerivation {
       pname = "aop-prelude";
-      version = "0.5.0.0";
-      sha256 = "121z6ikqcpyfb3caja40vdcc6g903akxbg7ybs1si95g8yqi5h0i";
+      version = "0.6.0.0";
+      sha256 = "0zdma9h36f896b17n17n3pagw5h26zvjagc66y4vdgznz2hjjvhq";
       libraryHaskellDepends = [
         base
         ghc-prim
@@ -79078,6 +79473,8 @@ self: {
       pname = "apecs";
       version = "0.9.6";
       sha256 = "1dppc03ck68mhkc95435bgmm0lfz8q3d20yw0nhywrx1x7y83z6d";
+      revision = "2";
+      editedCabalFile = "039yayc6iycfxxqr9b0afpfjq0vz1lw7hdwjxzmbqdvm06xmnkhr";
       libraryHaskellDepends = [
         array
         base
@@ -79112,23 +79509,34 @@ self: {
       apecs-physics,
       base,
       brillo,
+      brillo-rendering,
       containers,
       linear,
     }:
     mkDerivation {
       pname = "apecs-brillo";
-      version = "0.1.0";
-      sha256 = "0a0j74m6p6fnzagh5knlg9fn522ahr0ag4pgnssbl0lz4x2kwh13";
+      version = "0.1.1";
+      sha256 = "1lbkim53ra5jf74l9xglzfh3i5x13ji6vxp85xwl4479vv402k66";
       libraryHaskellDepends = [
         apecs
         apecs-physics
         base
         brillo
+        brillo-rendering
         containers
         linear
       ];
-      description = "Simple brillo renderer for apecs";
-      license = lib.licenses.bsd3;
+      testHaskellDepends = [
+        apecs
+        apecs-physics
+        base
+        brillo
+        brillo-rendering
+        containers
+        linear
+      ];
+      description = "Apecs' gloss package, but adapted for brillo";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -81415,8 +81823,8 @@ self: {
       pname = "apply-merge";
       version = "0.1.1.0";
       sha256 = "1snm9m35r3px9vgn64ygcqq37ay6jvwc5jsi3s62rxrh8biy8ir8";
-      revision = "7";
-      editedCabalFile = "0c1yc3g62gd5z2wnp74pzi7y1cbj3l4r09hp961699d99c7d22nb";
+      revision = "8";
+      editedCabalFile = "1g4py7vxnfylym3wq7dccfkhjcb60izsncyq5ii9wj9sp13cf84s";
       libraryHaskellDepends = [
         base
         containers
@@ -83938,93 +84346,6 @@ self: {
   ) { };
 
   arithmoi = callPackage (
-    {
-      mkDerivation,
-      base,
-      bitvec,
-      chimera,
-      constraints,
-      containers,
-      deepseq,
-      exact-pi,
-      ghc-bignum,
-      infinite-list,
-      integer-logarithms,
-      integer-roots,
-      mod,
-      QuickCheck,
-      quickcheck-classes,
-      random,
-      semirings,
-      smallcheck,
-      tasty,
-      tasty-bench,
-      tasty-hunit,
-      tasty-quickcheck,
-      tasty-rerun,
-      tasty-smallcheck,
-      transformers,
-      vector,
-    }:
-    mkDerivation {
-      pname = "arithmoi";
-      version = "0.13.2.0";
-      sha256 = "0kb7x4nh21vhiqy2l08k4dg49ffp022bj86vkpy9icgsaskh7b4i";
-      configureFlags = [ "-f-llvm" ];
-      libraryHaskellDepends = [
-        base
-        bitvec
-        chimera
-        constraints
-        containers
-        deepseq
-        exact-pi
-        ghc-bignum
-        infinite-list
-        integer-logarithms
-        integer-roots
-        mod
-        random
-        semirings
-        transformers
-        vector
-      ];
-      testHaskellDepends = [
-        base
-        containers
-        exact-pi
-        infinite-list
-        integer-roots
-        mod
-        QuickCheck
-        quickcheck-classes
-        semirings
-        smallcheck
-        tasty
-        tasty-hunit
-        tasty-quickcheck
-        tasty-rerun
-        tasty-smallcheck
-        vector
-      ];
-      benchmarkHaskellDepends = [
-        base
-        constraints
-        containers
-        infinite-list
-        integer-logarithms
-        mod
-        random
-        semirings
-        tasty-bench
-        vector
-      ];
-      description = "Efficient basic number-theoretic functions";
-      license = lib.licenses.mit;
-    }
-  ) { };
-
-  arithmoi_0_13_3_0 = callPackage (
     {
       mkDerivation,
       array,
@@ -84110,7 +84431,6 @@ self: {
       ];
       description = "Efficient basic number-theoretic functions";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -85960,8 +86280,8 @@ self: {
     }:
     mkDerivation {
       pname = "asciidoc";
-      version = "0.1.0.1";
-      sha256 = "1wf0xvvx47myw41nc3dlm83rzw9pibzl6154zc7yll4cc0cfy5br";
+      version = "0.1.0.2";
+      sha256 = "0djdvr06xs77c5gp57s13r96zpgbdglb6ay53ql4mlm4120d1v4p";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -86976,6 +87296,50 @@ self: {
     }
   ) { };
 
+  associative = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      doctest,
+      hashable,
+      lens,
+      mtl,
+      process,
+      profunctors,
+      selective,
+      semigroupoids,
+      unordered-containers,
+      witherable,
+    }:
+    mkDerivation {
+      pname = "associative";
+      version = "0.0.4";
+      sha256 = "126f2fm2jfr82ji1wgkz75s9q5n2z0vgbrwkqx539l7sz04pvz7d";
+      libraryHaskellDepends = [
+        base
+        containers
+        hashable
+        lens
+        mtl
+        profunctors
+        selective
+        semigroupoids
+        unordered-containers
+        witherable
+      ];
+      testHaskellDepends = [
+        base
+        process
+      ];
+      testToolDepends = [ doctest ];
+      description = "Partial Semigroup and Semigroup operations";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   assumpta = callPackage (
     {
       mkDerivation,
@@ -97658,10 +98022,8 @@ self: {
     }:
     mkDerivation {
       pname = "ban-instance";
-      version = "0.1.0.1";
-      sha256 = "0504qsjbqbrdf9avfrhs290baszc9dickx7wknbyxwrzpzzbpggk";
-      revision = "5";
-      editedCabalFile = "1a0xh0kfdpqgppaisb0hlm4k40gssbxh5jjz2j2l8xn2bnmv95cb";
+      version = "0.1.1.0";
+      sha256 = "174srwcxcfvf8h7v2k9pk3a8gqi29h2pwm7c1qx3xpmad6d32b5y";
       libraryHaskellDepends = [
         base
         template-haskell
@@ -99019,8 +99381,8 @@ self: {
       pname = "base64";
       version = "1.0";
       sha256 = "1dmjy4pkz66s3wa99lkc0wc4bdjkdkr57a8rsgb5z50432gj6hkr";
-      revision = "2";
-      editedCabalFile = "1jp2pc5r4w0vmd2piidzh0h308gx7gdl1xxk9mndc381c8bvkj0m";
+      revision = "3";
+      editedCabalFile = "1902pbk7bj7kxncpxp9zdxssyi0n409k7dds3as938bgiqkc34kz";
       libraryHaskellDepends = [
         base
         bytestring
@@ -99527,8 +99889,8 @@ self: {
     }:
     mkDerivation {
       pname = "basesystems";
-      version = "1.0.0.0";
-      sha256 = "1904s9ii1nxpxcg6ah2192k7j193s8i1lnci2d6r4jb15s30b61d";
+      version = "1.0.0.1";
+      sha256 = "0hh804vpm38z0mwsv6vcihfrhwcwpmlj47pngspclm9m9lvmvwsn";
       libraryHaskellDepends = [
         array
         base
@@ -101451,6 +101813,67 @@ self: {
     }
   ) { };
 
+  beam-core_0_10_5_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      dlist,
+      free,
+      ghc-prim,
+      hashable,
+      microlens,
+      mtl,
+      network-uri,
+      scientific,
+      tagged,
+      tasty,
+      tasty-hunit,
+      text,
+      time,
+      vector,
+      vector-sized,
+    }:
+    mkDerivation {
+      pname = "beam-core";
+      version = "0.10.5.0";
+      sha256 = "10kv4nc6v9w93dgnlx3nqpaxr3z5z41pzhps4m14g9bgp08xmwdc";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        dlist
+        free
+        ghc-prim
+        hashable
+        microlens
+        mtl
+        network-uri
+        scientific
+        tagged
+        text
+        time
+        vector
+        vector-sized
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        microlens
+        tasty
+        tasty-hunit
+        text
+        time
+      ];
+      description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   beam-duckdb = callPackage (
     {
       mkDerivation,
@@ -101475,8 +101898,8 @@ self: {
       pname = "beam-duckdb";
       version = "0.2.0.0";
       sha256 = "0n41x3jd2qilf7h6vnq6il8b03n41mlpp7lycmk0120388vylk3i";
-      revision = "2";
-      editedCabalFile = "098aqsxyls0cj9xs5lzw5ks3j725ycay2f1i3mccvx90l1fay188";
+      revision = "3";
+      editedCabalFile = "174x6pi6yczn5h6ax1y0i3w377743hwg6c2p7zy5d19q2sxdq870";
       libraryHaskellDepends = [
         base
         beam-core
@@ -101504,7 +101927,7 @@ self: {
       ];
       description = "DuckDB backend for Beam";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.Ai-Ya-Ya ];
     }
   ) { };
 
@@ -101584,10 +102007,10 @@ self: {
     }:
     mkDerivation {
       pname = "beam-migrate";
-      version = "0.5.3.2";
-      sha256 = "05cz2gh9r00dr6knigq9v7zcdmpk2b19z0pg79wimkcxa2fblb5z";
-      revision = "4";
-      editedCabalFile = "1xafh4qb225w32ls2c89cdk13fvfjn69052ja9fm43vgvhxrjjbs";
+      version = "0.5.4.0";
+      sha256 = "1rmax5zj75gi90b02gz9rx7gzz08nf7s7bj8lchwxcib17ycq4x8";
+      revision = "1";
+      editedCabalFile = "01dhnhjf6hfk3fn4kaawjp49a4dpkz28kawlxffc0zp7fdfyx8qf";
       libraryHaskellDepends = [
         aeson
         base
@@ -101617,6 +102040,66 @@ self: {
     }
   ) { };
 
+  beam-migrate_0_5_5_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      beam-core,
+      bytestring,
+      containers,
+      deepseq,
+      dependent-map,
+      dependent-sum,
+      free,
+      hashable,
+      haskell-src-exts,
+      microlens,
+      mtl,
+      parallel,
+      pqueue,
+      pretty,
+      scientific,
+      text,
+      time,
+      unordered-containers,
+      uuid-types,
+      vector,
+    }:
+    mkDerivation {
+      pname = "beam-migrate";
+      version = "0.5.5.0";
+      sha256 = "18sfymsxylj59vi6i4di671lmiwh0mgjqyang0jncmcb3s7qlv33";
+      libraryHaskellDepends = [
+        aeson
+        base
+        beam-core
+        bytestring
+        containers
+        deepseq
+        dependent-map
+        dependent-sum
+        free
+        hashable
+        haskell-src-exts
+        microlens
+        mtl
+        parallel
+        pqueue
+        pretty
+        scientific
+        text
+        time
+        unordered-containers
+        uuid-types
+        vector
+      ];
+      description = "SQL DDL support and migrations support library for Beam";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   beam-mysql = callPackage (
     {
       mkDerivation,
@@ -101724,8 +102207,8 @@ self: {
     }:
     mkDerivation {
       pname = "beam-postgres";
-      version = "0.5.4.4";
-      sha256 = "03llbfl1rlpghl0adf9ynd4wx4jbl707ll7cn3bcq16za2sc20fd";
+      version = "0.5.5.0";
+      sha256 = "1zxmy1g6z315il0vqi20pxv18jhvzzbrqfz0mdry3s27zza1ykfq";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -101772,6 +102255,90 @@ self: {
     }
   ) { };
 
+  beam-postgres_0_5_6_1 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      base,
+      beam-core,
+      beam-migrate,
+      bytestring,
+      case-insensitive,
+      conduit,
+      free,
+      hashable,
+      hedgehog,
+      lifted-base,
+      monad-control,
+      mtl,
+      network-uri,
+      postgresql-libpq,
+      postgresql-simple,
+      scientific,
+      tagged,
+      tasty,
+      tasty-hunit,
+      testcontainers,
+      text,
+      time,
+      transformers-base,
+      unordered-containers,
+      uuid,
+      uuid-types,
+      vector,
+    }:
+    mkDerivation {
+      pname = "beam-postgres";
+      version = "0.5.6.1";
+      sha256 = "08f51xq3236v56106rpnfnqd78pb566c1v1nh1kfqbjhmlvb25a7";
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        beam-core
+        beam-migrate
+        bytestring
+        case-insensitive
+        conduit
+        free
+        hashable
+        lifted-base
+        monad-control
+        mtl
+        network-uri
+        postgresql-libpq
+        postgresql-simple
+        scientific
+        tagged
+        text
+        time
+        transformers-base
+        unordered-containers
+        uuid-types
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        beam-core
+        beam-migrate
+        bytestring
+        hedgehog
+        postgresql-simple
+        tasty
+        tasty-hunit
+        testcontainers
+        text
+        uuid
+        vector
+      ];
+      description = "Connection layer between beam and postgres";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   beam-sqlite = callPackage (
     {
       mkDerivation,
@@ -101800,8 +102367,8 @@ self: {
     }:
     mkDerivation {
       pname = "beam-sqlite";
-      version = "0.5.6.0";
-      sha256 = "0iv94115aw1imbbcy6lbiqsr699215x15j1snyzypzbkqca0khi6";
+      version = "0.5.7.0";
+      sha256 = "0s27d3vwf4f7y1awdghjpp6dsciy9vwn3rfrb7gxhgn9cfsdz80r";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -101839,6 +102406,74 @@ self: {
     }
   ) { };
 
+  beam-sqlite_0_6_0_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      base,
+      beam-core,
+      beam-migrate,
+      bytestring,
+      containers,
+      direct-sqlite,
+      dlist,
+      free,
+      hashable,
+      monad-control,
+      mtl,
+      network-uri,
+      scientific,
+      sqlite-simple,
+      tasty,
+      tasty-expected-failure,
+      tasty-hunit,
+      text,
+      time,
+      transformers-base,
+    }:
+    mkDerivation {
+      pname = "beam-sqlite";
+      version = "0.6.0.0";
+      sha256 = "0mra98w9990simv8s9zspacbysyagnh1lldmmgal3fr9ifgwxxr0";
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        beam-core
+        beam-migrate
+        bytestring
+        containers
+        direct-sqlite
+        dlist
+        free
+        hashable
+        monad-control
+        mtl
+        network-uri
+        scientific
+        sqlite-simple
+        text
+        time
+        transformers-base
+      ];
+      testHaskellDepends = [
+        base
+        beam-core
+        beam-migrate
+        sqlite-simple
+        tasty
+        tasty-expected-failure
+        tasty-hunit
+        text
+        time
+      ];
+      description = "Beam driver for SQLite";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   beam-th = callPackage (
     {
       mkDerivation,
@@ -102068,8 +102703,8 @@ self: {
     }:
     mkDerivation {
       pname = "bech32";
-      version = "1.1.10";
-      sha256 = "0zrld26c0075dsl6v3gdiy0fimyaz5dlvfm0g2rldgg7qvi45q9a";
+      version = "1.1.11";
+      sha256 = "1ghm364wshdjsj8dq8lm4a1zdh3v0gkcrd7zbkgf6bavz94pihr0";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -102126,8 +102761,8 @@ self: {
     }:
     mkDerivation {
       pname = "bech32-th";
-      version = "1.1.10";
-      sha256 = "0xnnnbm7mjx5syyvx7qrmkk4carzj9cc004xdzdivgs1n8726frg";
+      version = "1.1.11";
+      sha256 = "1nwba26m2wm9av3ykhapwf5jk5z378wwdc7m8aabwp5b66y1aah7";
       libraryHaskellDepends = [
         base
         bech32
@@ -102590,8 +103225,8 @@ self: {
       pname = "bench-show";
       version = "0.3.2";
       sha256 = "1f0zx572d54dyyjifv4p550ci90gdr4mrifhwww4z6p87fbdi32j";
-      revision = "2";
-      editedCabalFile = "0cr695fg7cppfv84ji5dgz591ha757882xxyyr72q59cjcy5cllf";
+      revision = "3";
+      editedCabalFile = "1w9mrarmf1wwi7w5dyfixizgy0qnz8rjnb2ingdiicvn164nbry1";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -103501,8 +104136,8 @@ self: {
       pname = "bhoogle";
       version = "0.1.4.4";
       sha256 = "1z19h0jgnipj16rqbrflcjnqaslafq9bvwkyg8q0il76q7s4wyxa";
-      revision = "6";
-      editedCabalFile = "1k302sip83cq06b82hv7sxy4vv2wjap8f07rqg7nnswl40gwkv8r";
+      revision = "8";
+      editedCabalFile = "0g3a948ks1mdlybmih6g9msszmyjrvp6gfgjjvg3y80szm9yl594";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -104993,19 +105628,15 @@ self: {
       mkDerivation,
       base,
       binary,
-      OneTuple,
       QuickCheck,
       quickcheck-instances,
-      tagged,
       tasty,
       tasty-quickcheck,
     }:
     mkDerivation {
       pname = "binary-orphans";
-      version = "1.0.5";
-      sha256 = "13a08if69wdmc8hb7jynhllgh8jh7qbk9spygb096l9aijgaxyrr";
-      revision = "1";
-      editedCabalFile = "0pqzv84g0jkx2329p6qv10kd4nbms9ic704ljw4jsrxfg9bdy5qj";
+      version = "1.0.5.1";
+      sha256 = "17vbzrbb0xzy1lgbvlvydby5k0qna0rw27nc5jhr7jp1cx1pwh4p";
       libraryHaskellDepends = [
         base
         binary
@@ -105013,10 +105644,8 @@ self: {
       testHaskellDepends = [
         base
         binary
-        OneTuple
         QuickCheck
         quickcheck-instances
-        tagged
         tasty
         tasty-quickcheck
       ];
@@ -108204,8 +108833,8 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "birds-of-paradise";
-      version = "0.2.1.2";
-      sha256 = "1wx04hsgdd7xlswwq2fnhc441hs2w61f4nbm4pb8ky971qnsnali";
+      version = "0.2.2.0";
+      sha256 = "0fwkqgiifkdkj4wq3y0rz6b7xn2i03sq03mprnnnwbwkcnarij95";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Birds of Paradise";
@@ -111038,21 +111667,21 @@ self: {
     {
       mkDerivation,
       base,
-      memory,
+      ram,
       tasty,
       tasty-hunit,
     }:
     mkDerivation {
       pname = "blake3";
-      version = "0.3";
-      sha256 = "12hm7bd4jqxw0gqmczb9vxn99lbwawr09xwp6y7xb0fzrr97ysls";
+      version = "0.3.1";
+      sha256 = "1fi4dwdj9yzlq0lm3nf1l0y73sqf0vbwfqwhikr3cd3bmgf6d5hl";
       libraryHaskellDepends = [
         base
-        memory
+        ram
       ];
       testHaskellDepends = [
         base
-        memory
+        ram
         tasty
         tasty-hunit
       ];
@@ -112427,10 +113056,10 @@ self: {
       blockfrost-client-core,
       bytestring,
       data-default,
-      directory,
       filepath,
       hspec,
       mtl,
+      retry,
       servant,
       servant-client,
       servant-client-core,
@@ -112442,8 +113071,8 @@ self: {
     }:
     mkDerivation {
       pname = "blockfrost-client";
-      version = "0.12.0.0";
-      sha256 = "0ar5vxbppmc36rk22wsak8dq3n7ndq5iq2cpipiasbpm5xg7bssh";
+      version = "0.13.0.0";
+      sha256 = "1k0jz4pqz7q9i49flh2jxfcw1j5whipb9craq8bvy6scrwzxqvdr";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -112452,9 +113081,9 @@ self: {
         blockfrost-client-core
         bytestring
         data-default
-        directory
         filepath
         mtl
+        retry
         servant
         servant-client
         servant-client-core
@@ -112488,6 +113117,7 @@ self: {
       http-client,
       http-client-tls,
       http-types,
+      retry,
       servant,
       servant-client,
       servant-client-core,
@@ -112497,8 +113127,8 @@ self: {
     }:
     mkDerivation {
       pname = "blockfrost-client-core";
-      version = "0.7.0.0";
-      sha256 = "05cla205zmxiq16x0a0y37b17hqplzifhanddpdmrgzfasjzx9qf";
+      version = "0.8.0.0";
+      sha256 = "14c6j1lr7sb1c4c4sncrbkphypbzx5xbh18x2bh78c84vl6bkqid";
       libraryHaskellDepends = [
         aeson
         base
@@ -112511,6 +113141,7 @@ self: {
         http-client
         http-client-tls
         http-types
+        retry
         servant
         servant-client
         servant-client-core
@@ -112638,8 +113269,8 @@ self: {
     }:
     mkDerivation {
       pname = "blockio";
-      version = "0.1.1.1";
-      sha256 = "1w6b3gf9k5vkg92bx5kh85z4y9j74rcdalg22f3hifdhxycrfyyz";
+      version = "0.1.1.2";
+      sha256 = "1pgwrkf78f6wdcqq00f00gwrr659hgvkgyl4pgaxawkf73whgbfh";
       libraryHaskellDepends = [
         base
         blockio-uring
@@ -113544,12 +114175,12 @@ self: {
     }
   ) { };
 
-  bluefin_0_4_1_0 = callPackage (
+  bluefin_0_5_1_0 = callPackage (
     { mkDerivation, bluefin-internal }:
     mkDerivation {
       pname = "bluefin";
-      version = "0.4.1.0";
-      sha256 = "18k1iqfjggwv6l6fllchzhv8rhhy24q05knzzsgzyjw4z8gp38kf";
+      version = "0.5.1.0";
+      sha256 = "1a9rp4l4sws6miq0hlfw383inka2yj303c96srvnyq1liadxa7yd";
       libraryHaskellDepends = [ bluefin-internal ];
       description = "The Bluefin effect system";
       license = lib.meta.getLicenseFromSpdxId "MIT";
@@ -113572,8 +114203,8 @@ self: {
       pname = "bluefin-algae";
       version = "0.1.0.2";
       sha256 = "02g513vqn052qd41zm9brw8lf1ic4135mi8kr3s4w0721vm4nkhh";
-      revision = "4";
-      editedCabalFile = "02hx8g5kyx26znb145d55w6wm50lyjb5cx0y6d9dxnf11b2i21dj";
+      revision = "5";
+      editedCabalFile = "1wj4f5bd3vbrv2gxhspp3zs0c147m9k0kxm7z7jy1h7g59ckvpaz";
       libraryHaskellDepends = [
         base
         bluefin
@@ -113603,10 +114234,10 @@ self: {
     }:
     mkDerivation {
       pname = "bluefin-contrib";
-      version = "0.2.0.0";
-      sha256 = "0fqv8gjgxaa1jkfhvbcdwq18r1yhf0l8clr0w77vfizwj0425nqm";
+      version = "0.2.1.0";
+      sha256 = "0iniw62zcw97fwz94dv1rakhy59irw2hjcnwklmmap1gka843wcx";
       revision = "1";
-      editedCabalFile = "0lkryncx38hpra2lc3a2djd5mj0n7yg73cgahhmvyc916vglw3lf";
+      editedCabalFile = "1ky487alnlj5zpdv8y7lr6vprg89d55i6yywgall1hfap5vcfwki";
       libraryHaskellDepends = [
         base
         bluefin
@@ -113646,24 +114277,26 @@ self: {
     }
   ) { };
 
-  bluefin-internal_0_4_1_0 = callPackage (
+  bluefin-internal_0_5_1_0 = callPackage (
     {
       mkDerivation,
       async,
       base,
       monad-control,
+      primitive,
       transformers,
       transformers-base,
       unliftio-core,
     }:
     mkDerivation {
       pname = "bluefin-internal";
-      version = "0.4.1.0";
-      sha256 = "03qyjjkphqf1z242vfz4pa9pdha602vmmsqd97z18p01m5yqd01f";
+      version = "0.5.1.0";
+      sha256 = "035dw13rw0sjcfb8d88ab66j4kcdj5prhiw9cr1l2p7smjv3rvnx";
       libraryHaskellDepends = [
         async
         base
         monad-control
+        primitive
         transformers
         transformers-base
         unliftio-core
@@ -113742,8 +114375,8 @@ self: {
       pname = "bluefin-random";
       version = "0.2.0.0";
       sha256 = "1kvhcz84gdpv0x4jmqi75i2l85kfkmsyp8vqpl39hgxwy1d8fmyf";
-      revision = "2";
-      editedCabalFile = "0b10d9af349q7pj4qs0q05f9xc34mlfbvpdy4vqm4jfw1kg0ddg7";
+      revision = "3";
+      editedCabalFile = "01hkawxx5pl0i7qf5dypq6xvxf28skf8vasjsp217wvy61ag3ihn";
       libraryHaskellDepends = [
         base
         bluefin
@@ -114506,6 +115139,7 @@ self: {
       mkDerivation,
       aeson,
       base,
+      base64-bytestring,
       bytestring,
       crypton-connection,
       data-default,
@@ -114514,6 +115148,7 @@ self: {
       network,
       packstream-bolt,
       persist,
+      QuickCheck,
       resource-pool,
       sandwich,
       scientific,
@@ -114529,11 +115164,12 @@ self: {
     }:
     mkDerivation {
       pname = "bolty";
-      version = "0.1.0.2";
-      sha256 = "1d5ic68akkjd3w352rdnk1vp3b4dx3mv2w5irar4ykvg0iy87i0v";
+      version = "0.1.1.0";
+      sha256 = "1gczh6rlfcg1hcyyf26n1jsr559bh412m4c1wrlfd1qa3hsd8fz3";
       libraryHaskellDepends = [
         aeson
         base
+        base64-bytestring
         bytestring
         crypton-connection
         data-default
@@ -114555,6 +115191,7 @@ self: {
         word8
       ];
       testHaskellDepends = [
+        aeson
         base
         bytestring
         crypton-connection
@@ -114564,6 +115201,7 @@ self: {
         network
         packstream-bolt
         persist
+        QuickCheck
         sandwich
         split
         text
@@ -114595,8 +115233,8 @@ self: {
     }:
     mkDerivation {
       pname = "bolty-streamly";
-      version = "0.1.0.0";
-      sha256 = "11wjapwlsi4mc2h0j5fiqyd3nnzd52sagkrlmc3fgl46q4198mx6";
+      version = "0.1.0.1";
+      sha256 = "0n9njqzjkvxak075x1cjj1q419q8n3hgjj9myhbm0naiqs4s7zfv";
       libraryHaskellDepends = [
         base
         bolty
@@ -115509,10 +116147,8 @@ self: {
     }:
     mkDerivation {
       pname = "boomwhacker";
-      version = "0.0.2";
-      sha256 = "0q5cq5j7dy1qm5jqpcl1imwiqqm0h21yvqwnvabsjnfrvfvryqg2";
-      revision = "3";
-      editedCabalFile = "0hvx832kd293jp4j91kw0dbh4x7bcbszb8pvjx6sdg36a8ynpnan";
+      version = "0.0.2.1";
+      sha256 = "16057myaadccm16lbdp8rrrcq9c0qswdj49l5xvs64w705cp7pjw";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -116117,8 +116753,8 @@ self: {
     }:
     mkDerivation {
       pname = "botan-bindings";
-      version = "0.2.0.0";
-      sha256 = "13wh1m0znwj8waz2m9indwlrmg53a9ibb0pz72aig8vbnpgwrsdc";
+      version = "0.3.0.0";
+      sha256 = "1315xxzrk9qy3jba85sfzzcqwq9x0qbzp695h67l4wfbrlhspimn";
       libraryHaskellDepends = [ base ];
       libraryPkgconfigDepends = [ botan ];
       description = "Raw Botan bindings";
@@ -116146,8 +116782,8 @@ self: {
     }:
     mkDerivation {
       pname = "botan-low";
-      version = "0.1.0.0";
-      sha256 = "0qvy7md3k4mql3zbjbfni8ff7maq93br17p66d7av0av6lggp6im";
+      version = "0.2.0.0";
+      sha256 = "1wqzaz983aa2drfh76kcicln2d8iq6cpxy866a5yhwza6gl2y92h";
       libraryHaskellDepends = [
         base
         botan-bindings
@@ -117407,7 +118043,7 @@ self: {
     }
   ) { };
 
-  brick_2_10 = callPackage (
+  brick_2_12 = callPackage (
     {
       mkDerivation,
       base,
@@ -117440,10 +118076,8 @@ self: {
     }:
     mkDerivation {
       pname = "brick";
-      version = "2.10";
-      sha256 = "08byr2w0697bdlnpycnb73f33v2as6sy7q9w9r8a2nhilv49yhmq";
-      revision = "1";
-      editedCabalFile = "0676jxx939xwhaqzf8zjz9vdl5jsx2zqvpclg34b3435n142hy2d";
+      version = "2.12";
+      sha256 = "1kzlig7xpfjba4xvagclqln6qnlaykq85fws5n60d8fqjl75jxs8";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -118122,8 +118756,6 @@ self: {
       ];
       description = "Data structures and algorithms for working with 2D graphics";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -118952,6 +119584,160 @@ self: {
     }
   ) { };
 
+  brush-strokes = callPackage (
+    {
+      mkDerivation,
+      acts,
+      base,
+      bifunctors,
+      code-page,
+      containers,
+      deepseq,
+      directory,
+      eigen,
+      falsify,
+      filepath,
+      fp-ieee,
+      generic-lens,
+      ghc-prim,
+      groups,
+      groups-generic,
+      hspray,
+      optparse-applicative,
+      parallel,
+      primitive,
+      rounded-hw,
+      system-cxx-std-lib,
+      tasty,
+      template-haskell,
+      time,
+      transformers,
+      tree-view,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "brush-strokes";
+      version = "0.1.0.0";
+      sha256 = "0qbdg64iy3z15ynzz1w2lpmi8lia6kmclg4152v4m0lcm9xxqigs";
+      revision = "1";
+      editedCabalFile = "1spniyqxr693m6pkqpcg0d1w639p0nc5prh5w68aly2z0a4a5s55";
+      libraryHaskellDepends = [
+        acts
+        base
+        bifunctors
+        code-page
+        containers
+        deepseq
+        directory
+        eigen
+        filepath
+        fp-ieee
+        generic-lens
+        ghc-prim
+        groups
+        groups-generic
+        parallel
+        primitive
+        rounded-hw
+        system-cxx-std-lib
+        template-haskell
+        time
+        transformers
+        tree-view
+      ];
+      testHaskellDepends = [
+        base
+        code-page
+        containers
+        deepseq
+        falsify
+        hspray
+        optparse-applicative
+        parallel
+        primitive
+        tasty
+        tree-view
+        unordered-containers
+      ];
+      benchmarkHaskellDepends = [
+        base
+        code-page
+        containers
+        deepseq
+        primitive
+        tree-view
+      ];
+      doHaddock = false;
+      description = "Toolkit for Bézier curves and brush stroking";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  brush-stroking = callPackage (
+    {
+      mkDerivation,
+      acts,
+      aeson,
+      aeson-pretty,
+      atomic-file-ops,
+      base,
+      brush-strokes,
+      bytestring,
+      containers,
+      deepseq,
+      directory,
+      filepath,
+      generic-lens,
+      gi-cairo-connector,
+      gi-cairo-render,
+      groups,
+      hashable,
+      hermes-json,
+      lens,
+      mtl,
+      scientific,
+      stm,
+      text,
+      transformers,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "brush-stroking";
+      version = "0.1.0.0";
+      sha256 = "1zm67c1689vg3iqdiri3sc50j5jaaym7m023ibs7zyxm5v7wadhh";
+      libraryHaskellDepends = [
+        acts
+        aeson
+        aeson-pretty
+        atomic-file-ops
+        base
+        brush-strokes
+        bytestring
+        containers
+        deepseq
+        directory
+        filepath
+        generic-lens
+        gi-cairo-connector
+        gi-cairo-render
+        groups
+        hashable
+        hermes-json
+        lens
+        mtl
+        scientific
+        stm
+        text
+        transformers
+        unordered-containers
+      ];
+      description = "Brush strokes document model and renderer";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   bsb-http-chunked = callPackage (
     {
       mkDerivation,
@@ -120380,8 +121166,8 @@ self: {
       pname = "bugzilla-redhat";
       version = "1.0.1.1";
       sha256 = "0ka3dh5gqimwny7s3qalkynlyarkmnwd5pcy92b4g4vaqk7k3pvr";
-      revision = "5";
-      editedCabalFile = "0b3ha32s6965swgyy07q0ga1i95qykimhf73wwd1lscn2bx8xk4c";
+      revision = "6";
+      editedCabalFile = "1006p8iabxhwmjlr9h7x0j9722gq927q4i62zrf3lmc1mzn0qa2m";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -122628,6 +123414,8 @@ self: {
       pname = "bytesmith";
       version = "0.3.14.0";
       sha256 = "1i7vksz1g497hrn2kf7gk8vjxnd511b1xw1jg085xx0k33pcik6w";
+      revision = "1";
+      editedCabalFile = "119aznaijiawsn8qxwj8jga4mglhahjws5dlgmq4bgdy0qggzwfs";
       libraryHaskellDepends = [
         base
         byteslice
@@ -125546,13 +126334,18 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-detailed-quickcheck";
-      version = "0.2.0.1";
-      sha256 = "0z82ira6g3mkqj9cw050s4m4nk2n5d4zx6gqlrcgszypd80h03f2";
+      version = "0.3.0.0";
+      sha256 = "0jbzjqjwzwxdn2fpmlxqh6jjs2j6q82ldmq4ap1x6ffbhqizqmqs";
       libraryHaskellDepends = [
         base
         Cabal
         QuickCheck
       ];
+      testHaskellDepends = [
+        base
+        Cabal
+        QuickCheck
+      ];
       description = "QuickCheck for Cabal tests";
       license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
@@ -126113,7 +126906,7 @@ self: {
     }
   ) { };
 
-  cabal-gild_1_7_0_2 = callPackage (
+  cabal-gild_1_8_4_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -126133,8 +126926,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-gild";
-      version = "1.7.0.2";
-      sha256 = "18a8p7imdsi4yix6qh0qwpi5knw17gj8nj3zzlpd9s88ydl6yq75";
+      version = "1.8.4.1";
+      sha256 = "07axmqsdm2sgpwbz52y2cy281xxk0fhp3vnsw7fyp7ndn0786h8q";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -127488,6 +128281,8 @@ self: {
       pname = "cabal-rpm";
       version = "2.3.2";
       sha256 = "1sn44smpwihp0w7jml95b78ylgca3wbdzj4m8hyx8wq2qcpwva1q";
+      revision = "1";
+      editedCabalFile = "0kbymm4qv9rh05083rgkfqvsgqxspq0zjicmqbr9mqj2nsvlabz9";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -128284,8 +129079,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal2nix";
-      version = "2.21.2";
-      sha256 = "05janvispyh5sq77klzyhkwzqix4x2bf0mn7bvxb1qwsd02ygzxv";
+      version = "2.21.3";
+      sha256 = "0f7d2z0bd8ziswikhjrvbn4rlpigs3w1g4pvvv5cfnp2b7gwh37h";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -129121,8 +129916,8 @@ self: {
     }:
     mkDerivation {
       pname = "cachix";
-      version = "1.10.0";
-      sha256 = "1q2cbi8sfld1rjx7m4mlb064xvmrydr4sfglrw5sjvs9zj8ladjk";
+      version = "1.11.0";
+      sha256 = "1savyqj4azfhg33qj7fqbyyn1bld1jjdf6fw9cjbgcgr59p7azn2";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -129285,8 +130080,8 @@ self: {
     }:
     mkDerivation {
       pname = "cachix-api";
-      version = "1.10.0";
-      sha256 = "1zw2l23phxm292zl6xjppdv1mx1skk0zhif9rchcghk82m0rz0d4";
+      version = "1.11.0";
+      sha256 = "1fplakyrkm40m5ii964agbmaxvm108dg7yjkma59sa7k2f9aay68";
       libraryHaskellDepends = [
         aeson
         async
@@ -129393,6 +130188,86 @@ self: {
     }
   ) { };
 
+  cadence = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      apecs,
+      base,
+      bytestring,
+      containers,
+      exceptions,
+      hspec,
+      hspec-contrib,
+      HUnit,
+      linear,
+      QuickCheck,
+      random,
+      random-shuffle,
+      sdl2,
+      sdl2-image,
+      sdl2-ttf,
+      template-haskell,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "cadence";
+      version = "0.1.0.0";
+      sha256 = "128qsl0ymmjircxrpyfb7cg02nfv9z7l7y6yrxrbjka4c49lydv6";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        apecs
+        base
+        containers
+        linear
+        sdl2
+        sdl2-image
+        sdl2-ttf
+        template-haskell
+        text
+        vector
+      ];
+      executableHaskellDepends = [
+        aeson
+        apecs
+        base
+        bytestring
+        containers
+        linear
+        random
+        random-shuffle
+        sdl2
+        sdl2-image
+        sdl2-ttf
+        template-haskell
+        text
+        vector
+      ];
+      testHaskellDepends = [
+        apecs
+        base
+        containers
+        exceptions
+        hspec
+        hspec-contrib
+        HUnit
+        linear
+        QuickCheck
+        sdl2
+        sdl2-image
+        sdl2-ttf
+        template-haskell
+        text
+        vector
+      ];
+      description = "An ECS-based 2D game framework";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   caerbannog = callPackage (
     {
       mkDerivation,
@@ -130874,8 +131749,8 @@ self: {
     }:
     mkDerivation {
       pname = "canadian-income-tax";
-      version = "2025.0";
-      sha256 = "0k0v57dksww0c770jcp5wl1hl68w4vqilcw0sxjavcc43a228w9y";
+      version = "2025.1";
+      sha256 = "194h7csmxgdi2k5aaz02ykzidfx8ip3vw2kpbf9x1xnpaygs9k7x";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -134783,8 +135658,6 @@ self: {
       ];
       description = "Highbrow approach to type-safe printf format specifications";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -136965,8 +137838,8 @@ self: {
     }:
     mkDerivation {
       pname = "cfuture";
-      version = "1.0";
-      sha256 = "1ifi3bj254b0g8klyjqw7lhmvpmq7ws2sl19ndyvq7f6iq3sk33a";
+      version = "2.0";
+      sha256 = "1w4cnvz1cr87s41fdrhacf07c52k10igkqnl6xwpvj43zsksgws3";
       libraryHaskellDepends = [
         base
         base-prelude
@@ -136975,7 +137848,7 @@ self: {
         base
         base-prelude
       ];
-      description = "A Future type that is easy to represent and handle in C/C++";
+      description = "A Future type that is interruptible anytime and exportable to C/C++";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -137211,8 +138084,8 @@ self: {
     }:
     mkDerivation {
       pname = "cgrep";
-      version = "9.1.0";
-      sha256 = "1zzccmjhnlvf1q7n1zcmym1m62fkwd9a39rq2fjj457jzh9cgk8b";
+      version = "9.2.1";
+      sha256 = "0mzsxr280i3g6dj0wpm0j4c3qi2hp7qsqchfd2nmlna2syqpjqq6";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -137261,9 +138134,7 @@ self: {
       ];
       description = "Command line tool";
       license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "cgrep";
-      broken = true;
     }
   ) { };
 
@@ -137850,8 +138721,8 @@ self: {
     }:
     mkDerivation {
       pname = "changeset";
-      version = "0.1.1";
-      sha256 = "1mp5g0y1rbhfp5js3g2szpr7cfywpqjnh7ps01l1pxrvirxkdbbr";
+      version = "0.2";
+      sha256 = "010r452dbj4x93g2msdazaahs19q58cnzmskjfdgw7f8b7690ajg";
       libraryHaskellDepends = [
         base
         containers
@@ -137886,24 +138757,32 @@ self: {
       base,
       changeset,
       containers,
+      data-default,
+      falsify,
+      indexed-traversable,
       monoid-extras,
       tasty,
       tasty-hunit,
+      transformers,
     }:
     mkDerivation {
       pname = "changeset-containers";
-      version = "0.1.1";
-      sha256 = "0dyxhpbhwbqpbjmyhdqbdy82fbx76163az6m9lrcq8p5026n0ndc";
+      version = "0.2";
+      sha256 = "0xk88k3ywrdc1gxnnd07c2rxqln7f6204fkb8365iffnafcw09m5";
       libraryHaskellDepends = [
         base
         changeset
         containers
+        indexed-traversable
         monoid-extras
+        transformers
       ];
       testHaskellDepends = [
         base
         changeset
         containers
+        data-default
+        falsify
         monoid-extras
         tasty
         tasty-hunit
@@ -137931,8 +138810,8 @@ self: {
     }:
     mkDerivation {
       pname = "changeset-lens";
-      version = "0.1.1";
-      sha256 = "0fi3yjb689mvl8scmi3yz29fx4f1z2idclij4jn1mqavaaz4wzgd";
+      version = "0.2";
+      sha256 = "00wyd04d103g08p1n33qaqx234rpwz81rps2rm1bdaq4axzpl9pk";
       libraryHaskellDepends = [
         base
         changeset
@@ -137972,8 +138851,8 @@ self: {
     }:
     mkDerivation {
       pname = "changeset-reflex";
-      version = "0.1.1";
-      sha256 = "0jad77lp542y7kw0dbq4spdkpv38ygg7hlmbik7a5wikf90dfvz7";
+      version = "0.2";
+      sha256 = "1ilcn0qd5hhsvbv5194z0p04h7fb0bqb9k09fw9xs0v9drxyrnx1";
       libraryHaskellDepends = [
         base
         changeset
@@ -139279,6 +140158,60 @@ self: {
     }
   ) { };
 
+  checked-literals = callPackage (
+    {
+      mkDerivation,
+      base,
+      directory,
+      filepath,
+      ghc,
+      ghc-typelits-extra,
+      ghc-typelits-knownnat,
+      ghc-typelits-natnormalise,
+      mtl,
+      process,
+      string-interpolate,
+      syb,
+      tasty,
+      tasty-hunit,
+      template-haskell,
+      temporary,
+    }:
+    mkDerivation {
+      pname = "checked-literals";
+      version = "0.1.0.0";
+      sha256 = "1dwiwr92hsw4c3yx1h6n5bb3fsf9zx6k3qq8fgq0in1h7jzkmkrw";
+      libraryHaskellDepends = [
+        base
+        ghc
+        ghc-typelits-extra
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        mtl
+        syb
+        template-haskell
+      ];
+      testHaskellDepends = [
+        base
+        directory
+        filepath
+        ghc-typelits-extra
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        process
+        string-interpolate
+        tasty
+        tasty-hunit
+        temporary
+      ];
+      doHaddock = false;
+      description = "GHC plugin for checked numeric literals";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   checkers = callPackage (
     {
       mkDerivation,
@@ -139915,8 +140848,8 @@ self: {
     }:
     mkDerivation {
       pname = "chiasma";
-      version = "0.10.1.0";
-      sha256 = "09nsi5lksmbwqxy76h122kzp23632gvfbngs1vilmqhcf6zrbbg5";
+      version = "0.12.2.0";
+      sha256 = "01srs9xs31f7gi3l0d7k1xwm9lvpldh1p8jq8342n97b2w04whxx";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -139980,8 +140913,8 @@ self: {
     }:
     mkDerivation {
       pname = "chiasma-test";
-      version = "0.10.1.0";
-      sha256 = "0gyr4im2f8x335q3svvyr7lrf5z6ypln764spz986qf5ibg4arrb";
+      version = "0.12.2.0";
+      sha256 = "0zxb9m4q5kx2lz0lvbhl5f396pl324xn1qy4h7iqghvncvsds779";
       libraryHaskellDepends = [
         base
         bytestring
@@ -140012,6 +140945,7 @@ self: {
         polysemy
         polysemy-chronos
         polysemy-plugin
+        polysemy-process
         polysemy-test
         prelate
         tasty
@@ -142140,8 +143074,8 @@ self: {
     }:
     mkDerivation {
       pname = "circuit-notation";
-      version = "0.1.0.0";
-      sha256 = "10xzaa2xxyy0d2zlg712k8xyi4p7r6wsfmcfa6ssby22q36sr0xs";
+      version = "0.2.0.0";
+      sha256 = "05wppxiyp3ws040nd3gdpy4fhawypgq64b8sk9fg2sh5m75v1vp3";
       libraryHaskellDepends = [
         base
         clash-prelude
@@ -142161,8 +143095,8 @@ self: {
         base
         clash-prelude
       ];
-      description = "A source plugin for manipulating circuits in clash with a arrow notation";
-      license = lib.licenses.bsd3;
+      description = "Source plugin for manipulating circuits in Clash using arrow notation";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -143538,10 +144472,8 @@ self: {
     }:
     mkDerivation {
       pname = "clash-ghc";
-      version = "1.8.4";
-      sha256 = "1dgmqy5nm8fn55lmgd05akpkal46cydvbk0w6ian2z3979q4w4gb";
-      revision = "1";
-      editedCabalFile = "0pq4j5v7z94mr2v5gnivmcm03jr3z7xg16cz0hjqkrk2z2awrr2s";
+      version = "1.8.5";
+      sha256 = "0b8h9gnhl7c87bc120n0385jxip6hyji28qkk9hxj7pgh724ws7d";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -143591,6 +144523,103 @@ self: {
     }
   ) { };
 
+  clash-ghc_1_10_0 = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      bytestring,
+      Cabal,
+      clash-lib,
+      clash-prelude,
+      containers,
+      data-binary-ieee754,
+      deepseq,
+      directory,
+      exceptions,
+      extra,
+      filepath,
+      ghc,
+      ghc-bignum,
+      ghc-boot,
+      ghc-prim,
+      ghc-typelits-extra,
+      ghc-typelits-knownnat,
+      ghc-typelits-natnormalise,
+      ghci,
+      hashable,
+      haskeline,
+      lens,
+      mtl,
+      primitive,
+      process,
+      reflection,
+      split,
+      string-interpolate,
+      template-haskell,
+      text,
+      time,
+      transformers,
+      uniplate,
+      unix,
+      unordered-containers,
+      utf8-string,
+      vector,
+    }:
+    mkDerivation {
+      pname = "clash-ghc";
+      version = "1.10.0";
+      sha256 = "0wxhky62a6ldqv8an19gzklwm7n2x728rhb3nzls3af7pa1bzq7l";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        array
+        base
+        bytestring
+        Cabal
+        clash-lib
+        clash-prelude
+        containers
+        data-binary-ieee754
+        deepseq
+        directory
+        exceptions
+        extra
+        filepath
+        ghc
+        ghc-bignum
+        ghc-boot
+        ghc-prim
+        ghc-typelits-extra
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        ghci
+        hashable
+        haskeline
+        lens
+        mtl
+        primitive
+        process
+        reflection
+        split
+        string-interpolate
+        template-haskell
+        text
+        time
+        transformers
+        uniplate
+        unix
+        unordered-containers
+        utf8-string
+        vector
+      ];
+      executableHaskellDepends = [ base ];
+      description = "Clash: a functional hardware description language - GHC frontend";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   clash-lib = callPackage (
     {
       mkDerivation,
@@ -143655,10 +144684,8 @@ self: {
     }:
     mkDerivation {
       pname = "clash-lib";
-      version = "1.8.4";
-      sha256 = "1pria81l325zdh8ccpkig5sp9lv4k819sk7pgkjf1s8hjknlsv9x";
-      revision = "1";
-      editedCabalFile = "0iif62zqbzxkmvgfbqmagxkrx5k6y97p1qamrcnqa544gxcrj4c0";
+      version = "1.8.5";
+      sha256 = "001pqzyvfbyw0p61b6m9ym5mxmjvq3wfjicv485n9lxlrbvnllh5";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -143759,6 +144786,175 @@ self: {
     }
   ) { };
 
+  clash-lib_1_10_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      ansi-terminal,
+      array,
+      async,
+      attoparsec,
+      attoparsec-aeson,
+      base,
+      base16-bytestring,
+      binary,
+      bytestring,
+      clash-prelude,
+      containers,
+      cryptohash-sha256,
+      data-binary-ieee754,
+      data-default,
+      deepseq,
+      directory,
+      dlist,
+      doctest-parallel,
+      exceptions,
+      extra,
+      filepath,
+      ghc,
+      ghc-bignum,
+      ghc-boot,
+      ghc-boot-th,
+      ghc-prim,
+      ghc-typelits-knownnat,
+      Glob,
+      hashable,
+      haskell-src-exts,
+      haskell-src-meta,
+      hint,
+      infinite-list,
+      lens,
+      mtl,
+      ordered-containers,
+      pretty-show,
+      prettyprinter,
+      prettyprinter-interp,
+      primitive,
+      quickcheck-text,
+      string-interpolate,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      tasty-th,
+      template-haskell,
+      temporary,
+      terminal-size,
+      text,
+      time,
+      transformers,
+      trifecta,
+      unordered-containers,
+      vector,
+      vector-binary-instances,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "clash-lib";
+      version = "1.10.0";
+      sha256 = "0slanl0vz5qbh1y111j2fs41nzm9ccmd7ci9wfwnm7rznh33wrcc";
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        aeson
+        aeson-pretty
+        ansi-terminal
+        array
+        async
+        attoparsec
+        attoparsec-aeson
+        base
+        base16-bytestring
+        binary
+        bytestring
+        clash-prelude
+        containers
+        cryptohash-sha256
+        data-binary-ieee754
+        data-default
+        deepseq
+        directory
+        dlist
+        exceptions
+        extra
+        filepath
+        ghc
+        ghc-bignum
+        ghc-boot
+        ghc-boot-th
+        ghc-prim
+        hashable
+        haskell-src-meta
+        hint
+        infinite-list
+        lens
+        mtl
+        ordered-containers
+        pretty-show
+        prettyprinter
+        prettyprinter-interp
+        primitive
+        string-interpolate
+        template-haskell
+        temporary
+        terminal-size
+        text
+        time
+        transformers
+        trifecta
+        unordered-containers
+        vector
+        vector-binary-instances
+        yaml
+      ];
+      executableHaskellDepends = [
+        aeson
+        attoparsec-aeson
+        base
+        bytestring
+        containers
+        deepseq
+        directory
+        Glob
+        text
+        yaml
+      ];
+      testHaskellDepends = [
+        aeson
+        aeson-pretty
+        attoparsec-aeson
+        base
+        base16-bytestring
+        bytestring
+        clash-prelude
+        containers
+        data-default
+        deepseq
+        doctest-parallel
+        filepath
+        ghc
+        ghc-typelits-knownnat
+        haskell-src-exts
+        lens
+        pretty-show
+        quickcheck-text
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        tasty-th
+        template-haskell
+        text
+        transformers
+        unordered-containers
+      ];
+      description = "Clash: a functional hardware description language - As a library";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "v16-upgrade-primitives";
+    }
+  ) { };
+
   clash-lib-hedgehog = callPackage (
     {
       mkDerivation,
@@ -143781,8 +144977,8 @@ self: {
     }:
     mkDerivation {
       pname = "clash-lib-hedgehog";
-      version = "1.8.4";
-      sha256 = "1nl085y83vgljdh1pmgckvy5v5g6dafvmkjajc7m72s8ijj7g717";
+      version = "1.8.5";
+      sha256 = "01zf26hglas4v1hxg6amsv4ckbp09zl6jfw28v65dpwsjzzwwv5g";
       libraryHaskellDepends = [
         base
         clash-lib
@@ -143806,6 +145002,54 @@ self: {
     }
   ) { };
 
+  clash-lib-hedgehog_1_10_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      clash-lib,
+      containers,
+      data-binary-ieee754,
+      fakedata,
+      ghc,
+      ghc-typelits-knownnat,
+      ghc-typelits-natnormalise,
+      hedgehog,
+      hedgehog-fakedata,
+      mmorph,
+      mtl,
+      pretty-show,
+      primitive,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "clash-lib-hedgehog";
+      version = "1.10.0";
+      sha256 = "077crqkblfswk3r6qndw3grnfr63j136dfsfwz4c0q12phmclzlf";
+      libraryHaskellDepends = [
+        base
+        clash-lib
+        containers
+        data-binary-ieee754
+        fakedata
+        ghc
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        hedgehog
+        hedgehog-fakedata
+        mmorph
+        mtl
+        pretty-show
+        primitive
+        text
+        transformers
+      ];
+      description = "Hedgehog Generators for clash-lib";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   clash-multisignal = callPackage (
     {
       mkDerivation,
@@ -143861,6 +145105,7 @@ self: {
       hint,
       infinite-list,
       lens,
+      mmorph,
       mtl,
       QuickCheck,
       quickcheck-classes-base,
@@ -143887,10 +145132,8 @@ self: {
     }:
     mkDerivation {
       pname = "clash-prelude";
-      version = "1.8.4";
-      sha256 = "0vc9vcqbh0i8xkm833nwxfmwxi47kzcajrh8nywymal2nsid1gby";
-      revision = "2";
-      editedCabalFile = "0y3czgr1rvnbrnh8y15wga0qpjbh8dih55qq376x6qm8pij9a78q";
+      version = "1.8.5";
+      sha256 = "0a1w9yn710bi0hxdrx5g34wnr57dqxz2a797d78v9105vprhj1li";
       libraryHaskellDepends = [
         array
         arrows
@@ -143932,7 +145175,9 @@ self: {
       ];
       testHaskellDepends = [
         base
+        binary
         bytestring
+        containers
         deepseq
         doctest-parallel
         filepath
@@ -143941,6 +145186,7 @@ self: {
         ghc-typelits-natnormalise
         hedgehog
         hint
+        mmorph
         quickcheck-classes-base
         tasty
         tasty-hedgehog
@@ -143948,6 +145194,7 @@ self: {
         tasty-quickcheck
         tasty-th
         template-haskell
+        text
       ];
       benchmarkHaskellDepends = [
         base
@@ -143961,6 +145208,143 @@ self: {
     }
   ) { };
 
+  clash-prelude_1_10_0 = callPackage (
+    {
+      mkDerivation,
+      adjunctions,
+      array,
+      arrows,
+      base,
+      binary,
+      bytestring,
+      constraints,
+      containers,
+      criterion,
+      data-binary-ieee754,
+      data-default,
+      deepseq,
+      directory,
+      distributive,
+      doctest-parallel,
+      extra,
+      filepath,
+      ghc-bignum,
+      ghc-prim,
+      ghc-typelits-extra,
+      ghc-typelits-knownnat,
+      ghc-typelits-natnormalise,
+      half,
+      hashable,
+      hedgehog,
+      hint,
+      infinite-list,
+      lens,
+      mmorph,
+      mtl,
+      QuickCheck,
+      quickcheck-classes-base,
+      recursion-schemes,
+      reflection,
+      singletons,
+      string-interpolate,
+      tagged,
+      tasty,
+      tasty-hedgehog,
+      tasty-hunit,
+      tasty-quickcheck,
+      tasty-th,
+      template-haskell,
+      text,
+      th-abstraction,
+      th-lift,
+      th-orphans,
+      time,
+      transformers,
+      type-errors,
+      uniplate,
+      vector,
+    }:
+    mkDerivation {
+      pname = "clash-prelude";
+      version = "1.10.0";
+      sha256 = "06ghz3r7j1xmigbzl7vjbhr9vcgzls24gbzbckhm1mwp1k59ikik";
+      libraryHaskellDepends = [
+        adjunctions
+        array
+        arrows
+        base
+        binary
+        bytestring
+        constraints
+        containers
+        data-binary-ieee754
+        data-default
+        deepseq
+        distributive
+        extra
+        ghc-bignum
+        ghc-prim
+        ghc-typelits-extra
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        half
+        hashable
+        infinite-list
+        lens
+        mtl
+        QuickCheck
+        recursion-schemes
+        reflection
+        singletons
+        string-interpolate
+        tagged
+        template-haskell
+        text
+        th-abstraction
+        th-lift
+        th-orphans
+        time
+        transformers
+        type-errors
+        uniplate
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        binary
+        bytestring
+        containers
+        deepseq
+        doctest-parallel
+        filepath
+        ghc-typelits-extra
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        hedgehog
+        hint
+        mmorph
+        quickcheck-classes-base
+        tasty
+        tasty-hedgehog
+        tasty-hunit
+        tasty-quickcheck
+        tasty-th
+        template-haskell
+        text
+      ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        deepseq
+        directory
+        template-haskell
+      ];
+      description = "Clash: a functional hardware description language - Prelude library";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   clash-prelude-hedgehog = callPackage (
     {
       mkDerivation,
@@ -143973,8 +145357,8 @@ self: {
     }:
     mkDerivation {
       pname = "clash-prelude-hedgehog";
-      version = "1.8.4";
-      sha256 = "15jf4vr1p42s5pvs417y917j82m69df4prlgs3jl3l2h43psh3y5";
+      version = "1.8.5";
+      sha256 = "1swy13hg5yvmlj61is91jrv8yqjlp4r79a21clwi7d88yx9nnpm1";
       libraryHaskellDepends = [
         base
         clash-prelude
@@ -143988,6 +145372,36 @@ self: {
     }
   ) { };
 
+  clash-prelude-hedgehog_1_10_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      clash-prelude,
+      ghc-typelits-knownnat,
+      ghc-typelits-natnormalise,
+      hedgehog,
+      string-interpolate,
+      text,
+    }:
+    mkDerivation {
+      pname = "clash-prelude-hedgehog";
+      version = "1.10.0";
+      sha256 = "00fsvc4pj48blqnrr51jybydvxn09pygxgas2lziz9d402cmc7pf";
+      libraryHaskellDepends = [
+        base
+        clash-prelude
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        hedgehog
+        string-interpolate
+        text
+      ];
+      description = "Hedgehog Generators for clash-prelude";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   clash-prelude-quickcheck = callPackage (
     {
       mkDerivation,
@@ -144051,6 +145465,91 @@ self: {
     }
   ) { };
 
+  clash-shockwaves = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      binary,
+      bytestring,
+      Cabal,
+      clash-prelude,
+      colour,
+      containers,
+      data-default,
+      deepseq,
+      directory,
+      extra,
+      filepath,
+      ghc-typelits-extra,
+      ghc-typelits-knownnat,
+      ghc-typelits-natnormalise,
+      integer-logarithms,
+      split,
+      tasty,
+      tasty-hunit,
+      tasty-th,
+      template-haskell,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "clash-shockwaves";
+      version = "1.0.0";
+      sha256 = "0a6k3ngrhkzhdgsc2aa1r1g5kr3s3ckq2yq3wn8ij805snzq5i8v";
+      libraryHaskellDepends = [
+        aeson
+        base
+        binary
+        bytestring
+        Cabal
+        clash-prelude
+        colour
+        containers
+        data-default
+        deepseq
+        extra
+        filepath
+        ghc-typelits-extra
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        integer-logarithms
+        split
+        template-haskell
+        text
+        time
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        binary
+        bytestring
+        Cabal
+        clash-prelude
+        colour
+        containers
+        data-default
+        deepseq
+        directory
+        extra
+        filepath
+        ghc-typelits-extra
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        integer-logarithms
+        split
+        tasty
+        tasty-hunit
+        tasty-th
+        template-haskell
+        text
+        time
+      ];
+      description = "Typed waveforms for Clash using the Surfer waveform viewer";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
+    }
+  ) { };
+
   clash-systemverilog = callPackage (
     {
       mkDerivation,
@@ -149957,6 +151456,35 @@ self: {
     }
   ) { RNA = null; };
 
+  coco = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      text,
+      utf8-string,
+      utility-ht,
+      uuid,
+      vector,
+    }:
+    mkDerivation {
+      pname = "coco";
+      version = "1.0.0.0";
+      sha256 = "1x1xxda7s7jzp8ijz9slxan3wiha2rfcgjfk78yf869m6mbx2v9n";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        text
+        utf8-string
+        utility-ht
+        uuid
+        vector
+      ];
+      description = "cozy conversions";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   code-builder = callPackage (
     {
       mkDerivation,
@@ -152344,22 +153872,26 @@ self: {
     {
       mkDerivation,
       base,
+      HUnit,
       QuickCheck,
       random,
       test-framework,
+      test-framework-hunit,
       test-framework-quickcheck2,
     }:
     mkDerivation {
       pname = "colour";
-      version = "2.3.6";
-      sha256 = "0wgqj64mh2y2zk77kv59k3xb3dk4wmgfp988y74sp9a4d76mvlrc";
+      version = "2.3.7";
+      sha256 = "104nprq14qajna16q7qsybyjvfdrgazwj340c8rlxgjscxai0fqz";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
+        HUnit
         QuickCheck
         random
         test-framework
+        test-framework-hunit
         test-framework-quickcheck2
       ];
       description = "A model for human colour/color perception";
@@ -153909,8 +155441,8 @@ self: {
     }:
     mkDerivation {
       pname = "commonmark-initial";
-      version = "0.1.0.0";
-      sha256 = "1vgi2yhcs8g5bylmwfkib3b83cq7vw6hacxf1xn0mmyzrdjgmg7c";
+      version = "0.1.0.1";
+      sha256 = "0b45llijhkip9v72rci76nk62610i509bj9j9kdx462wxdkdxhk6";
       libraryHaskellDepends = [
         base
         commonmark
@@ -154218,8 +155750,8 @@ self: {
     }:
     mkDerivation {
       pname = "comonad-coactions";
-      version = "0.1.0.0";
-      sha256 = "1y7svy4sggpm1ycvr62iih0ix23k360gj6qis5f6z7w3qp3ivgrq";
+      version = "0.1.0.1";
+      sha256 = "0xg2q49qr9c4q9pii8mid15i83l3n7ymrhn9allv6q4pr7w3if5n";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -154240,7 +155772,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Coactions of comonads on functors";
-      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.0-or-later";
     }
   ) { };
 
@@ -163336,9 +164868,10 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "contra-tracer";
-      version = "0.2.0.0";
-      sha256 = "1rb2fal2rn02qnp28dsvq3r94b72jkqrp2s1lryhmrdj23jc3swy";
+      version = "0.2.1.0";
+      sha256 = "06c08m3s9r920y4zhrwfld2mxa18m4qyh21rkf80xsk493dq5s5z";
       libraryHaskellDepends = [ base ];
+      testHaskellDepends = [ base ];
       description = "Arrow and contravariant tracers";
       license = lib.licenses.asl20;
     }
@@ -165922,6 +167455,31 @@ self: {
     }
   ) { };
 
+  core-of-name = callPackage (
+    {
+      mkDerivation,
+      base,
+      ghc,
+      template-haskell,
+    }:
+    mkDerivation {
+      pname = "core-of-name";
+      version = "0.1.0.0";
+      sha256 = "0asdg62bn1bvjls3f2fwvngcq7x3bfy2dq854pjh7dvz1znjc5mw";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        ghc
+        template-haskell
+      ];
+      executableHaskellDepends = [ base ];
+      description = "Print the Core representation of a binding with a GHC plugin";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "core-of-name";
+    }
+  ) { };
+
   core-program = callPackage (
     {
       mkDerivation,
@@ -166966,8 +168524,8 @@ self: {
     }:
     mkDerivation {
       pname = "countable-inflections";
-      version = "0.3.0";
-      sha256 = "1imi7csng0q6qmwz2ii4j33nwcmiyzi072nvgh36a3lgi0ja6q9x";
+      version = "0.3.2";
+      sha256 = "1rv4gxvrh0v6ar2zijqkfhn870hymzdf7xm6wskjxl3w8y3ksrg9";
       libraryHaskellDepends = [
         base
         bytestring
@@ -167939,8 +169497,8 @@ self: {
     }:
     mkDerivation {
       pname = "cpsa";
-      version = "4.4.7";
-      sha256 = "131ri7wj5lsbsqm9rvcmrsdgb9mls24nf1rjcz9bylxxaizchm39";
+      version = "4.4.8";
+      sha256 = "0w26rhfs35b2ihhj9k1a2h0x709qqfr9vgcyr22wmlmkpzic73lb";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -169760,21 +171318,27 @@ self: {
     {
       mkDerivation,
       base,
+      Cabal,
       doctest-parallel,
+      ghc,
       hspec,
       hspec-discover,
+      machines,
+      nothunks,
       profunctors,
       singletons-base,
       text,
     }:
     mkDerivation {
       pname = "crem";
-      version = "0.1.0.0";
-      sha256 = "1wy7bpg874l9q6fn4pf6pfcslj664nid3lhxq65gycna18avsvbm";
+      version = "0.1.1.0";
+      sha256 = "1kqhss6l1jqvkw76bsv4pvjgb31x5pxlcdcavn8f5zp0bx930yz4";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
+        machines
+        nothunks
         profunctors
         singletons-base
         text
@@ -169785,8 +171349,11 @@ self: {
       ];
       testHaskellDepends = [
         base
+        Cabal
         doctest-parallel
+        ghc
         hspec
+        machines
         profunctors
         singletons-base
       ];
@@ -170182,7 +171749,7 @@ self: {
     }
   ) { };
 
-  criterion_1_6_4_1 = callPackage (
+  criterion_1_6_5_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -170207,7 +171774,6 @@ self: {
       mtl,
       mwc-random,
       optparse-applicative,
-      parsec,
       prettyprinter,
       prettyprinter-ansi-terminal,
       QuickCheck,
@@ -170216,18 +171782,14 @@ self: {
       tasty-hunit,
       tasty-quickcheck,
       text,
-      time,
       transformers,
       transformers-compat,
       vector,
-      vector-algorithms,
     }:
     mkDerivation {
       pname = "criterion";
-      version = "1.6.4.1";
-      sha256 = "03danwzqimrnw39s91pxmya3jrb4wxvx0ijm3qr5mik8axn6z9af";
-      revision = "1";
-      editedCabalFile = "02sbckvbz107n369crcpb31jq4x6jw4kqvrkh3m03i8wn9bxbkis";
+      version = "1.6.5.0";
+      sha256 = "0f7011j1bz9p6b88aj6s4yp3m9vwn95irqby1glmh05lj46dh4yn";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -170252,16 +171814,13 @@ self: {
         mtl
         mwc-random
         optparse-applicative
-        parsec
         prettyprinter
         prettyprinter-ansi-terminal
         statistics
         text
-        time
         transformers
         transformers-compat
         vector
-        vector-algorithms
       ];
       executableHaskellDepends = [
         base
@@ -170395,8 +171954,8 @@ self: {
     }:
     mkDerivation {
       pname = "criterion-measurement";
-      version = "0.2.3.0";
-      sha256 = "1qnzgkmjlv3m6zr8l3dfnc1b5jy2fyjxb7s1qzhdcww4bsixqxfc";
+      version = "0.2.4.0";
+      sha256 = "18zr0z9fa2x61bynzvhh7g8r7mshsz6l4dd7bl8k9mwy0icy0hm3";
       libraryHaskellDepends = [
         aeson
         base
@@ -171027,6 +172586,8 @@ self: {
       pname = "crucible-debug";
       version = "0.1.2.0";
       sha256 = "0i3bbk28sihyb8nirjcz72mrhz6m08k3iz1jz2rx5jn7nwskxzba";
+      revision = "1";
+      editedCabalFile = "17x1lwjfwh97lm9r9halx3jx447gvqjfynxfvv6ndy1brp0xq2px";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -171247,6 +172808,8 @@ self: {
       pname = "crucible-syntax";
       version = "0.5.0.0";
       sha256 = "08b027d6m8c1wsfn21kjywg1gqw4s4nanzj1q4kqp65n4gmaai5b";
+      revision = "1";
+      editedCabalFile = "141mjylrq9j2k6qpaa01g4ngdidd57cmwy70d016d7wxckb3n3hs";
       libraryHaskellDepends = [
         base
         bv-sized
@@ -171608,8 +173171,6 @@ self: {
       testSystemDepends = [ libxcrypt ];
       description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { inherit (pkgs) libxcrypt; };
 
@@ -173249,7 +174810,7 @@ self: {
     }
   ) { };
 
-  crypton_1_1_1 = callPackage (
+  crypton_1_1_2 = callPackage (
     {
       mkDerivation,
       base,
@@ -173269,8 +174830,8 @@ self: {
     }:
     mkDerivation {
       pname = "crypton";
-      version = "1.1.1";
-      sha256 = "04200abr2wavnkq73kch9wwnl5lcnd4n69jdfzg6mngz6pzby0sf";
+      version = "1.1.2";
+      sha256 = "17ndb7zi05gbkkf153xdwxznlqq14masaj9acv4n44hcgzdamk41";
       libraryHaskellDepends = [
         base
         base16
@@ -173437,6 +174998,8 @@ self: {
       pname = "crypton-conduit";
       version = "0.2.3";
       sha256 = "1kkizzapdv1lnkijmygpr3jdh2wiszcjhbi9byjzjphinpwlaply";
+      revision = "1";
+      editedCabalFile = "0czvkgb8lr7w23fyz1skajz7dcwh0xylnw4cvgs4ixpz96f109y8";
       libraryHaskellDepends = [
         base
         bytestring
@@ -173464,6 +175027,55 @@ self: {
     }
   ) { };
 
+  crypton-conduit_0_3_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      conduit,
+      conduit-combinators,
+      conduit-extra,
+      crypton,
+      exceptions,
+      ram,
+      resourcet,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "crypton-conduit";
+      version = "0.3.0";
+      sha256 = "0gi70jasy95khp7d133ymipqlyqf37sg0p17w1s6bagjqkpk7qnq";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        conduit
+        conduit-extra
+        crypton
+        exceptions
+        ram
+        resourcet
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        conduit
+        conduit-combinators
+        crypton
+        ram
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      description = "crypton conduit";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   crypton-connection = callPackage (
     {
       mkDerivation,
@@ -173516,6 +175128,8 @@ self: {
       pname = "crypton-connection";
       version = "0.4.6";
       sha256 = "0d20qp4jim89s6psi0iyjwjzgbi4piw9pxyyr15qrshpb22vg1nn";
+      revision = "1";
+      editedCabalFile = "0bnjm3rdk4wv9p743fp324wzq08lxaxrw04hyplv2hwzvr24lxm3";
       libraryHaskellDepends = [
         base
         bytestring
@@ -174897,6 +176511,51 @@ self: {
     }
   ) { };
 
+  css-class-bindings = callPackage (
+    {
+      mkDerivation,
+      add-dependent-file,
+      base,
+      containers,
+      css-syntax,
+      filepath,
+      QuickCheck,
+      tasty,
+      tasty-discover,
+      tasty-hunit,
+      tasty-quickcheck,
+      template-haskell,
+      text,
+    }:
+    mkDerivation {
+      pname = "css-class-bindings";
+      version = "0.0.4";
+      sha256 = "00gkpp5vs2dx41aw6pizb4vlkk64yrd4h90glw2har70dhij1k63";
+      libraryHaskellDepends = [
+        add-dependent-file
+        base
+        containers
+        css-syntax
+        filepath
+        template-haskell
+        text
+      ];
+      testHaskellDepends = [
+        base
+        QuickCheck
+        tasty
+        tasty-discover
+        tasty-hunit
+        tasty-quickcheck
+        template-haskell
+      ];
+      testToolDepends = [ tasty-discover ];
+      description = "generates Haskell bindings for CSS classes";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   css-easings = callPackage (
     {
       mkDerivation,
@@ -175852,8 +177511,8 @@ self: {
     }:
     mkDerivation {
       pname = "cuda";
-      version = "0.12.8.0";
-      sha256 = "06sc7jkg24742frz7q8jimw8szvsva20zy4jn35dj585mibnljcr";
+      version = "0.13.0.0";
+      sha256 = "03xvkzylbfrbhh4ds37cj900w9kh5ikxynscrng3z6avvsg0nc1j";
       isLibrary = true;
       isExecutable = true;
       setupHaskellDepends = [
@@ -175875,7 +177534,7 @@ self: {
         base
         pretty
       ];
-      description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
+      description = "FFI binding to the CUDA driver interface for programming NVIDIA GPUs";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "nvidia-device-query";
@@ -175955,8 +177614,8 @@ self: {
     }:
     mkDerivation {
       pname = "cuddle";
-      version = "1.2.0.0";
-      sha256 = "0638jvj6wkczrxfswlcbzkci20s79s1yf4v22fz5gdmv34l21gvm";
+      version = "1.6.0.0";
+      sha256 = "16r8yk16zw6jki83y0plb6nim5n0jz7r6b1a8n5fyzk7v0f0l8np";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -175972,6 +177631,7 @@ self: {
         data-default-class
         foldable1-classes-compat
         generic-optics
+        generic-random
         half
         hashable
         megaparsec
@@ -176025,6 +177685,7 @@ self: {
         prettyprinter
         prettyprinter-ansi-terminal
         QuickCheck
+        quickcheck-transformer
         random
         string-qq
         text
@@ -178791,8 +180452,8 @@ self: {
     }:
     mkDerivation {
       pname = "dap";
-      version = "0.4.0.0";
-      sha256 = "0nrk7r417706hgcfkh1a7v9bljwp4mkdq19nr27ixhbckj1qz6np";
+      version = "0.5.0.0";
+      sha256 = "1184ij0g5vrz0r7pxhyard1jdz64410h9pr0v99hx0lfcp9p3fz8";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -181304,10 +182965,8 @@ self: {
     }:
     mkDerivation {
       pname = "data-elevator";
-      version = "0.2";
-      sha256 = "0fvj6bd86vdxmfwq36pcj810mbl3wc0lipw50ddzdcypsixr21gq";
-      revision = "1";
-      editedCabalFile = "1227s0fy6xg2z8awllig60csj824fw4wy3gky3vadpf1srwwq3lj";
+      version = "0.3";
+      sha256 = "1j3668di14kjdn3ax2abn66i5nrvw3gv7b46skc97azs010gxjrz";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -183124,7 +184783,7 @@ self: {
     }
   ) { };
 
-  data-sketches_0_4_0_0 = callPackage (
+  data-sketches_0_4_0_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -183134,9 +184793,6 @@ self: {
       ghc-prim,
       hedgehog,
       hspec,
-      hspec-junit-formatter,
-      mtl,
-      mwc-random,
       pretty-show,
       primitive,
       process,
@@ -183144,21 +184800,17 @@ self: {
       statistics,
       temporary,
       vector,
-      vector-algorithms,
     }:
     mkDerivation {
       pname = "data-sketches";
-      version = "0.4.0.0";
-      sha256 = "1k36j8biixgkkvfl6s52ywh5f06i59azv1if1zmidbnq0kkmadkh";
+      version = "0.4.0.1";
+      sha256 = "0pi69alh54yl2x4hvagq1pjs6gwb5c24if4wj2q20x7ny2nf4rfz";
       libraryHaskellDepends = [
         base
         data-sketches-core
         ghc-prim
-        mtl
-        mwc-random
         primitive
         vector
-        vector-algorithms
       ];
       testHaskellDepends = [
         base
@@ -183167,9 +184819,6 @@ self: {
         ghc-prim
         hedgehog
         hspec
-        hspec-junit-formatter
-        mtl
-        mwc-random
         pretty-show
         primitive
         process
@@ -183177,18 +184826,14 @@ self: {
         statistics
         temporary
         vector
-        vector-algorithms
       ];
       benchmarkHaskellDepends = [
         base
         criterion
         data-sketches-core
         ghc-prim
-        mtl
-        mwc-random
         primitive
         vector
-        vector-algorithms
       ];
       description = "Stochastic streaming algorithms for approximate computation on large datasets. Includes KLL, HLL, Theta, Count-Min, and REQ sketches.";
       license = lib.licenses.asl20;
@@ -183233,38 +184878,32 @@ self: {
     }
   ) { };
 
-  data-sketches-core_0_2_0_1 = callPackage (
+  data-sketches-core_0_3_0_0 = callPackage (
     {
       mkDerivation,
       base,
       deepseq,
       ghc-prim,
-      mwc-random,
       primitive,
       vector,
-      vector-algorithms,
     }:
     mkDerivation {
       pname = "data-sketches-core";
-      version = "0.2.0.1";
-      sha256 = "1zccphcsrzdx16wcf45nps6j8vdhdzp2jkknnqfshs90kq2pbc64";
+      version = "0.3.0.0";
+      sha256 = "1sywk3b0bsdzwbmqfcdq7s9w8lldh2gqqkllbk1l42jnx0sah8lm";
       libraryHaskellDepends = [
         base
         deepseq
         ghc-prim
-        mwc-random
         primitive
         vector
-        vector-algorithms
       ];
       testHaskellDepends = [
         base
         deepseq
         ghc-prim
-        mwc-random
         primitive
         vector
-        vector-algorithms
       ];
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
@@ -184513,7 +186152,7 @@ self: {
     }
   ) { };
 
-  dataframe_0_7_0_0 = callPackage (
+  dataframe_1_1_2_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -184531,9 +186170,8 @@ self: {
       Glob,
       granite,
       hashable,
+      http-conduit,
       HUnit,
-      mmap,
-      parallel,
       process,
       QuickCheck,
       random,
@@ -184542,6 +186180,8 @@ self: {
       scientific,
       snappy-hs,
       stm,
+      streamly-bytestring,
+      streamly-core,
       template-haskell,
       text,
       these,
@@ -184555,8 +186195,8 @@ self: {
     }:
     mkDerivation {
       pname = "dataframe";
-      version = "0.7.0.0";
-      sha256 = "1khnk687vz4n0m9v0p6dw5x45g9n5yjx6x21i0cx3lkv00wm2fbj";
+      version = "1.1.2.1";
+      sha256 = "1m6f4rdp4cwpi47yrkrcfyj2axjv7vz76ziqp0fjahjv5hp4h6wb";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -184574,14 +186214,15 @@ self: {
         Glob
         granite
         hashable
-        mmap
-        parallel
+        http-conduit
         process
         random
         regex-tdfa
         scientific
         snappy-hs
         stm
+        streamly-bytestring
+        streamly-core
         template-haskell
         text
         these
@@ -184609,7 +186250,6 @@ self: {
         base
         bytestring
         containers
-        directory
         HUnit
         QuickCheck
         random
@@ -184631,6 +186271,54 @@ self: {
     }
   ) { };
 
+  dataframe-fastcsv = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      bytestring,
+      containers,
+      dataframe,
+      directory,
+      HUnit,
+      mmap,
+      parallel,
+      QuickCheck,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "dataframe-fastcsv";
+      version = "1.0.0.0";
+      sha256 = "0ddchisr1b2wdyacz85ff882qjfj807bhcch9w8w43s675x64kgq";
+      libraryHaskellDepends = [
+        array
+        base
+        bytestring
+        containers
+        dataframe
+        mmap
+        parallel
+        text
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        dataframe
+        directory
+        HUnit
+        QuickCheck
+        text
+        vector
+      ];
+      description = "SIMD-accelerated CSV reader for the dataframe library";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   dataframe-hasktorch = callPackage (
     {
       mkDerivation,
@@ -184986,8 +186674,8 @@ self: {
     }:
     mkDerivation {
       pname = "datastar-hs";
-      version = "0.1.0.2";
-      sha256 = "13nbnyfp40grrn04m9yzbf3h2wi94ccp6jk3ip4a5ldfaxzwbf2v";
+      version = "1.0.0.0";
+      sha256 = "0x80ky0q5j1mymy768h58z18aj9g7gvb38vqpwvqgq9n5n9ypmcq";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -190345,10 +192033,8 @@ self: {
     }:
     mkDerivation {
       pname = "dependent-enummap";
-      version = "0.1.0.0";
-      sha256 = "1i0p0yipihjm9p6mpag9zw1r8gfl7lwcg35w97gqfy4lbbx2rp4n";
-      revision = "1";
-      editedCabalFile = "1a8dxvlqk52l5qx3ybbcjm2m4py4ywnrlwpggxdbg98a1x188wxg";
+      version = "0.2.0.0";
+      sha256 = "0j1wijrxmxrrz0jvg9qrg3g4iza6vvpmzhq3c0a2ixkiygrydbfv";
       libraryHaskellDepends = [
         base
         containers
@@ -190892,6 +192578,40 @@ self: {
     }
   ) { };
 
+  deque_0_4_4_4 = callPackage (
+    {
+      mkDerivation,
+      base,
+      deepseq,
+      hashable,
+      mtl,
+      rerebase,
+      strict-list,
+      tasty,
+      tasty-quickcheck,
+    }:
+    mkDerivation {
+      pname = "deque";
+      version = "0.4.4.4";
+      sha256 = "09c3cld56k0frl1kvhrrb1kz8i3w9n3qycr7qvf0ihjw6kg5b0za";
+      libraryHaskellDepends = [
+        base
+        deepseq
+        hashable
+        mtl
+        strict-list
+      ];
+      testHaskellDepends = [
+        rerebase
+        tasty
+        tasty-quickcheck
+      ];
+      description = "Double-ended queues";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   dequeue = callPackage (
     {
       mkDerivation,
@@ -191308,6 +193028,7 @@ self: {
       containers,
       ghc,
       haskell-src,
+      haskell-src-exts,
       HUnit,
       mtl,
       primitive,
@@ -191319,8 +193040,8 @@ self: {
     }:
     mkDerivation {
       pname = "derive-topdown";
-      version = "0.1.1.0";
-      sha256 = "1ixgy4bmcmkp00cn28kikgkg9ln6pl5wyibrbk8hckf2wpamy0c3";
+      version = "0.1.1.1";
+      sha256 = "1diagpj0218ciqhrbf6blvip8pwkbwd9hxb0w6a8dyjpyfjwwllq";
       libraryHaskellDepends = [
         base
         containers
@@ -191339,6 +193060,7 @@ self: {
         containers
         ghc
         haskell-src
+        haskell-src-exts
         HUnit
         mtl
         primitive
@@ -191568,6 +193290,46 @@ self: {
     }
   ) { };
 
+  deriving-trans_0_11_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      exceptions,
+      logict,
+      monad-control,
+      monad-control-identity,
+      monad-logger,
+      mtl,
+      primitive,
+      resourcet,
+      transformers,
+      transformers-base,
+      unliftio-core,
+    }:
+    mkDerivation {
+      pname = "deriving-trans";
+      version = "0.11.0.0";
+      sha256 = "00i7aln2aqlakka49lkfml28s4h56ssw23lzhfb28ngyl52zc5n2";
+      libraryHaskellDepends = [
+        base
+        exceptions
+        logict
+        monad-control
+        monad-control-identity
+        monad-logger
+        mtl
+        primitive
+        resourcet
+        transformers
+        transformers-base
+        unliftio-core
+      ];
+      description = "Derive instances for monad transformer stacks";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   deriving-via-fun = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -194286,8 +196048,8 @@ self: {
     }:
     mkDerivation {
       pname = "dhscanner-ast";
-      version = "1.1.4";
-      sha256 = "021gwh23vndd88av6f0daycnvx83pbacwrnavyd46f9mrjnygqwm";
+      version = "1.1.5";
+      sha256 = "1bgil53any94bhy3cwiakai5vs445mkv7x3sr98lzv24791yhxzs";
       libraryHaskellDepends = [
         aeson
         base
@@ -194317,8 +196079,8 @@ self: {
     }:
     mkDerivation {
       pname = "dhscanner-bitcode";
-      version = "1.0.15";
-      sha256 = "0pwb89rxm3pfyy1cq4zd5m8wwk5afjpj60zmp7443q7fwpygx8b4";
+      version = "1.0.16";
+      sha256 = "1khjwdmnih5vn9pxi8mjf5faq0g1kd5pfzk54i3gw2alw2g8266m";
       libraryHaskellDepends = [
         aeson
         base
@@ -194339,25 +196101,77 @@ self: {
     }
   ) { };
 
-  dhscanner-kbgen = callPackage (
+  dhscanner-kbapi = callPackage (
     {
       mkDerivation,
       aeson,
+      aeson-pretty,
       base,
+      bytestring,
       containers,
       dhscanner-ast,
-      dhscanner-bitcode,
+      openapi3,
     }:
     mkDerivation {
-      pname = "dhscanner-kbgen";
-      version = "1.0.25";
-      sha256 = "066jr09bhlbaqbg72049wn09464j6vr1jk866pjbwipcl3yk6bzb";
+      pname = "dhscanner-kbapi";
+      version = "1.0.3";
+      sha256 = "1wid31pkh3miwfxivk0svslj5zwwhk3bkdygincfl6d6f4r58388";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [
         aeson
         base
         containers
         dhscanner-ast
+      ];
+      executableHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        bytestring
+        dhscanner-ast
+        openapi3
+      ];
+      description = "query language api for dhscanner knowledge base";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "json-schema-creator";
+    }
+  ) { };
+
+  dhscanner-kbgen = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      base,
+      containers,
+      dhscanner-ast,
+      dhscanner-bitcode,
+      filepath,
+      hspec,
+      QuickCheck,
+      text,
+    }:
+    mkDerivation {
+      pname = "dhscanner-kbgen";
+      version = "1.0.35";
+      sha256 = "0drjxci95281bm08fjl33pdkxx8y53w2l7vni0m8lcg6jskzmpl8";
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        containers
+        dhscanner-ast
         dhscanner-bitcode
+        filepath
+        text
+      ];
+      testHaskellDepends = [
+        base
+        dhscanner-ast
+        hspec
+        QuickCheck
       ];
       description = "knowledge base predicates for static code analysis";
       license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
@@ -194707,6 +196521,36 @@ self: {
     }
   ) { };
 
+  diagnostician = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      prettyprinter,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "diagnostician";
+      version = "0.1.1.0";
+      sha256 = "12ixzfvg7qji0swiry22clm5nkv4i9vvb6gc7q3shfm4fx79d2g6";
+      libraryHaskellDepends = [
+        base
+        containers
+        prettyprinter
+        text
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        containers
+      ];
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   diagrams = callPackage (
     {
       mkDerivation,
@@ -195086,15 +196930,12 @@ self: {
       monoid-extras,
       mtl,
       profunctors,
-      semigroups,
       unordered-containers,
     }:
     mkDerivation {
       pname = "diagrams-core";
-      version = "1.5.1.1";
-      sha256 = "168kjikw3x21pjgfy3lmxmrm89g9zlhbypkmzdg5xz9rl7acn7rc";
-      revision = "4";
-      editedCabalFile = "0lq4hs7h7ja9x8wz05z21fi9b507r8capxwknmadrxznrh892kky";
+      version = "1.5.1.2";
+      sha256 = "0nbnqmg49yqmfhwgavjyxd9nhxhvwac4051ylrajrgsx4pdsygai";
       libraryHaskellDepends = [
         adjunctions
         base
@@ -195106,7 +196947,6 @@ self: {
         monoid-extras
         mtl
         profunctors
-        semigroups
         unordered-containers
       ];
       description = "Core libraries for diagrams EDSL";
@@ -195432,8 +197272,8 @@ self: {
     }:
     mkDerivation {
       pname = "diagrams-input";
-      version = "0.1.5";
-      sha256 = "011kvcx3py8dwjx10ddd0z6pm5k76lb2y4mzkfp1nbcy0imkkfyq";
+      version = "0.1.5.1";
+      sha256 = "1fy6fp9w3z6xn8s21xfq31qd67g5931bik5iv8r2z38ajbhpwm68";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -199733,8 +201573,8 @@ self: {
       pname = "discrimination";
       version = "0.5";
       sha256 = "1qq7fs1dsfqgf4969gksqcp3swcx0wbzdh66a89fv78k6y94g0pc";
-      revision = "5";
-      editedCabalFile = "1pbnj7jzxxrd7s7nqmwmmxhw4pyrwxnsdx7xpw63240jb9f1cg8f";
+      revision = "6";
+      editedCabalFile = "0bncwrlxh0sr2r7c6fw6yk570km5hddvba2jz0g4rrywv74qw7n9";
       libraryHaskellDepends = [
         array
         base
@@ -201630,9 +203470,11 @@ self: {
       doctest,
       hspec,
       lens,
+      megaparsec,
       MemoTrie,
       mtl,
       profunctors,
+      QuickCheck,
       tagged,
       template-haskell,
       text,
@@ -201642,8 +203484,8 @@ self: {
     }:
     mkDerivation {
       pname = "distributors";
-      version = "0.3.0.0";
-      sha256 = "0c0nvlwb7dm4179bdkavh96xzjdija94xvv13ayils0b72xzifdq";
+      version = "0.5.0.0";
+      sha256 = "0f6dqanc8kvlf2659rfxsrz2594ih78gv2n20k7smdpgmyp9wylq";
       libraryHaskellDepends = [
         adjunctions
         base
@@ -201674,9 +203516,11 @@ self: {
         doctest
         hspec
         lens
+        megaparsec
         MemoTrie
         mtl
         profunctors
+        QuickCheck
         tagged
         template-haskell
         text
@@ -202066,8 +203910,8 @@ self: {
     }:
     mkDerivation {
       pname = "djot";
-      version = "0.1.3";
-      sha256 = "1066rgzb9lf2fa9bi3i7rdln9yn7kkjwx31gfhljqsryxqqr9prn";
+      version = "0.1.4";
+      sha256 = "03qlk8r62j6nsjbbyp8510gn29vg3i2s4vq0p0qyr2679y5i6v8h";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -204999,8 +206843,6 @@ self: {
       ];
       description = "Simple monadic DOM parser";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -208406,25 +210248,20 @@ self: {
       base,
       monoid-extras,
       QuickCheck,
-      semigroups,
       testing-feat,
     }:
     mkDerivation {
       pname = "dual-tree";
-      version = "0.2.3.1";
-      sha256 = "19nm34d166fhlkk7npx0iq9kbx7300a82bg75q1sx98jqfa4nffh";
-      revision = "5";
-      editedCabalFile = "0ihx1l9s864z4pvqkahy0ch6k4fqrz4yzb0dqwrnagsa2akbz9c4";
+      version = "0.2.3.4";
+      sha256 = "0rwmrpascc9impqiv9y4pf9ip0k77sdb5zllr3ygkdss8w6wspbm";
       libraryHaskellDepends = [
         base
         monoid-extras
-        semigroups
       ];
       testHaskellDepends = [
         base
         monoid-extras
         QuickCheck
-        semigroups
         testing-feat
       ];
       description = "Rose trees with cached and accumulating monoidal annotations";
@@ -208575,8 +210412,7 @@ self: {
       ];
       description = "Haskell FFI bindings for DuckDB";
       license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      maintainers = [ lib.maintainers.Ai-Ya-Ya ];
     }
   ) { inherit (pkgs) duckdb; };
 
@@ -208633,8 +210469,8 @@ self: {
     }:
     mkDerivation {
       pname = "duckdb-simple";
-      version = "0.1.5.0";
-      sha256 = "1smmznxzimvpxj45wbw6916wgvw5q5gndp16x4vikiy56j6hwlq8";
+      version = "0.1.5.1";
+      sha256 = "0nzzny1xqrkcmn3nqcg37pg51z1pjci02r7yy7jyshmpmccjv2y6";
       libraryHaskellDepends = [
         array
         base
@@ -208664,7 +210500,7 @@ self: {
       ];
       description = "Haskell FFI bindings for DuckDB";
       license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
-      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.Ai-Ya-Ya ];
     }
   ) { };
 
@@ -213488,6 +215324,33 @@ self: {
     }
   ) { };
 
+  effectful-plugin_2_1_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      effectful-core,
+      ghc,
+    }:
+    mkDerivation {
+      pname = "effectful-plugin";
+      version = "2.1.0.0";
+      sha256 = "11kdrx4axrc6lbgra8r4bvnyphdhqrps9ggrlx3wrrr7csdv0a7s";
+      libraryHaskellDepends = [
+        base
+        containers
+        ghc
+      ];
+      testHaskellDepends = [
+        base
+        effectful-core
+      ];
+      description = "A GHC plugin for improving disambiguation of effects";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   effectful-poolboy = callPackage (
     {
       mkDerivation,
@@ -215092,8 +216955,8 @@ self: {
       pname = "ekg-json";
       version = "0.1.1.1";
       sha256 = "1mngxy3zhrgfpzi060l4v6x65la7vplbd5z04cvna2m759cn5q2i";
-      revision = "1";
-      editedCabalFile = "1ibdws48pirdl8asvizylz9vnz3yrfkqsximxsmb7ivbbindd75x";
+      revision = "2";
+      editedCabalFile = "1dqzi9gaiqn10p7fanr3jkvpsfc1rps8hyfa1v2lszcrj657saz7";
       libraryHaskellDepends = [
         aeson
         base
@@ -220233,6 +222096,8 @@ self: {
       pname = "env-guard";
       version = "0.2.1";
       sha256 = "0xm9638nkikfy62abims10jmmr9y3rm2vb22aqh4qmjcj4r37ibq";
+      revision = "1";
+      editedCabalFile = "0q1dsk4mc5mqd90ya67yjl2himwkwj24vzc4l3njfs9cwkank69v";
       libraryHaskellDepends = [ base ];
       description = "Conditionally running IO actions based on environment variables";
       license = lib.meta.getLicenseFromSpdxId "MIT";
@@ -221374,8 +223239,8 @@ self: {
     }:
     mkDerivation {
       pname = "erebos";
-      version = "0.2.0";
-      sha256 = "1mqkr4znvbv6wyr14ajzkamj7c5v3qfzfnsigznvz4jjq9hsp8qs";
+      version = "0.2.1";
+      sha256 = "05h1vlgvspfk0pwb6l5fj7zqv8pixhqyjqhbk3yvabhmfwhw5p25";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -225391,8 +227256,8 @@ self: {
     }:
     mkDerivation {
       pname = "eventium-core";
-      version = "0.2.1";
-      sha256 = "0w9hbwzp40i2f7cp74cicj4l23sc023s6saz20n8c47j7iy51854";
+      version = "0.3.1";
+      sha256 = "186mwhbxbk78ligbndahb2fh57gg27ms8bda5am5b5c2r9l2vbj3";
       libraryHaskellDepends = [
         aeson
         base
@@ -225440,11 +227305,12 @@ self: {
       mtl,
       safe,
       stm,
+      time,
     }:
     mkDerivation {
       pname = "eventium-memory";
-      version = "0.2.1";
-      sha256 = "0xx4mv3zb0jycmjrvz6xxlmb9ka2xkpl54j11h26vp65fc10mj8w";
+      version = "0.3.1";
+      sha256 = "0s5n0gjh4gl6axhg3q3j8l1qr47vfri0qznim7cd6kcm1fr0c4qc";
       libraryHaskellDepends = [
         base
         containers
@@ -225463,6 +227329,7 @@ self: {
         mtl
         safe
         stm
+        time
       ];
       testToolDepends = [ hspec-discover ];
       description = "In-memory implementations for eventium";
@@ -225491,8 +227358,8 @@ self: {
     }:
     mkDerivation {
       pname = "eventium-postgresql";
-      version = "0.2.1";
-      sha256 = "01wdp5i8a7nkw95n1wb3hnrclc3pqkx7k7j3ir67zyzzc7a6y1in";
+      version = "0.3.1";
+      sha256 = "1wmgdw0ldrl9f93nm5rr5jkdshm5m4r80sqjddrbiaaxlcpxc47q";
       libraryHaskellDepends = [
         aeson
         base
@@ -225540,8 +227407,8 @@ self: {
     }:
     mkDerivation {
       pname = "eventium-sql-common";
-      version = "0.2.1";
-      sha256 = "1qs6jjjza04wqn25xdgkxfw2k1mhw81cmcfac75q7hr5wd0kxlr6";
+      version = "0.3.1";
+      sha256 = "0x2h8fis785k978vaffy6iirxdjh2lwdsqdd71hzvqgd3pykkf0j";
       libraryHaskellDepends = [
         aeson
         base
@@ -225578,8 +227445,8 @@ self: {
     }:
     mkDerivation {
       pname = "eventium-sqlite";
-      version = "0.2.1";
-      sha256 = "0wbkwpbfphp9lh3lgw14jqd86ywsnbdzb0ydxzs3xs1aq3x3gnvb";
+      version = "0.3.1";
+      sha256 = "1cl7v6ph8x0d3qq16ja721j0mk2s8nf15i7np653ny857rb8mgkb";
       libraryHaskellDepends = [
         aeson
         base
@@ -225659,8 +227526,8 @@ self: {
     }:
     mkDerivation {
       pname = "eventium-testkit";
-      version = "0.2.1";
-      sha256 = "00ssl4gy8aiwj7r4x4a6d41ydvhdz4mw967d9nlgfc0ii7h5py7n";
+      version = "0.3.1";
+      sha256 = "0riljm36j1wpbdyr3w00yajq4565fky13ybypk5wnk8f0spdyfnn";
       libraryHaskellDepends = [
         aeson
         base
@@ -225820,7 +227687,6 @@ self: {
       ];
       description = "Stream eventlog data to the OpenTelemetry Collector";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "eventlog-live-otelcol";
     }
   ) { };
@@ -225829,8 +227695,8 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "eventlog-socket";
-      version = "0.1.1.0";
-      sha256 = "1y3hji0xcqqkkr5drm4nss3q3wvqlmcq870y6ggx3j0kz2sd2w32";
+      version = "0.1.3.0";
+      sha256 = "0xn4vga5vl47xm4r3w09krfxdj0clhxxrmmcfxcry7ihc1082g65";
       libraryHaskellDepends = [ base ];
       description = "Stream GHC eventlog events to external processes";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
@@ -225847,8 +227713,8 @@ self: {
     }:
     mkDerivation {
       pname = "eventlog-socket-control";
-      version = "0.1.0.0";
-      sha256 = "0zk897dhykrgj0i750cq558bm39vn1frgq9asxq58zwf4jbfqdmr";
+      version = "0.1.1.0";
+      sha256 = "0ad9zvyn0i9r5qs59cr7lgkayjk6jbrpj4j58l7yrq86kl4q1d3g";
       libraryHaskellDepends = [
         base
         binary
@@ -226260,6 +228126,8 @@ self: {
       ];
       description = "CQRS/ES library";
       license = lib.licenses.isc;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -226293,6 +228161,7 @@ self: {
       ];
       description = "PostgreSQL adaptor for eventsourcing";
       license = lib.licenses.isc;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -227254,6 +229123,8 @@ self: {
       pname = "exception-transformers";
       version = "0.4.0.12";
       sha256 = "11qlr78hlp1ivsx2l06sac56wj900l6diwh6dv7jfzgary8dax4k";
+      revision = "1";
+      editedCabalFile = "1xr67h3grrxgyl9zblafxrf186kqqdrz4nannalhrjxb8j0lz9z3";
       libraryHaskellDepends = [
         base
         fail
@@ -233792,7 +235663,7 @@ self: {
     }
   ) { };
 
-  fbrnch_1_8 = callPackage (
+  fbrnch_1_8_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -233802,6 +235673,7 @@ self: {
       bugzilla-redhat,
       bytestring,
       config-ini,
+      containers,
       copr-api,
       directory,
       either,
@@ -233835,8 +235707,8 @@ self: {
     }:
     mkDerivation {
       pname = "fbrnch";
-      version = "1.8";
-      sha256 = "0zl0b8h9mnk86fjq4dbdr5xjgav6ikx9whayvw3cmqdhrx29dw1y";
+      version = "1.8.1";
+      sha256 = "01sxsyb1xwcgk306hzchvkzmhvcws3dr14pvglaiw7xj6y8915pd";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -233847,6 +235719,7 @@ self: {
         bugzilla-redhat
         bytestring
         config-ini
+        containers
         copr-api
         directory
         either
@@ -236165,6 +238038,7 @@ self: {
       description = "A functional embedded language for DSP and parallelism";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -237956,8 +239830,8 @@ self: {
     }:
     mkDerivation {
       pname = "filepath-bytestring";
-      version = "1.5.2.0.3";
-      sha256 = "0jz6mpr6fvxijvkib9500x25np7j836wrvy8jd23l16r4rhnhmxy";
+      version = "1.5.2.0.5";
+      sha256 = "0n4rx896xagr4g1akn2zgnb2m99xgcy6zkknv7fjc3348h8a3p4q";
       libraryHaskellDepends = [
         base
         bytestring
@@ -238917,10 +240791,8 @@ self: {
     }:
     mkDerivation {
       pname = "finitary";
-      version = "2.2.0.0";
-      sha256 = "035pbixg74z7xbjw33y50xxgkhml5l3y93izmlilgd8dil8biwl3";
-      revision = "1";
-      editedCabalFile = "0inj6lnh71mlilkdgvpfpp2rmc9494gsf44bd9qg5jz26j4v8ss8";
+      version = "2.2.0.1";
+      sha256 = "1kggpxwwqzra8gwbmkjwjcrhzzgh9149q6xl3vvw8pyqmnwqgysg";
       libraryHaskellDepends = [
         base
         bitvec
@@ -239288,8 +241160,8 @@ self: {
       pname = "finite-typelits";
       version = "0.2.1.0";
       sha256 = "0i786r2l3k9fxkpyy6rsi8my6kkar7y8yxk7h9gncm0z6kmvrnvk";
-      revision = "1";
-      editedCabalFile = "1967xzvdhlk92ifn980pm05jxjnmra32wlfzx7l2p2gn1cydzlhv";
+      revision = "2";
+      editedCabalFile = "0hffbfd0kbxg6w2fgxfsr3q6b54pgwjs12q4ajqjmblfha02pgqk";
       libraryHaskellDepends = [
         base
         deepseq
@@ -239427,13 +241299,13 @@ self: {
       mkDerivation,
       aeson,
       base,
+      base64-bytestring,
       bytestring,
       containers,
+      crypton,
       http-client,
       http-client-tls,
       http-types,
-      jose,
-      lens,
       stm,
       text,
       time,
@@ -239441,18 +241313,18 @@ self: {
     }:
     mkDerivation {
       pname = "firebase-hs";
-      version = "0.1.1.0";
-      sha256 = "0fkf42m9higfyqm3cjyhz1mscw768rplsc9ma2c5xj42n890n28d";
+      version = "0.2.0.0";
+      sha256 = "1496r4pm6k04vmlff9kf3klz6vxdjabgsfhb5j261ijkh966bh0j";
       libraryHaskellDepends = [
         aeson
         base
+        base64-bytestring
         bytestring
         containers
+        crypton
         http-client
         http-client-tls
         http-types
-        jose
-        lens
         stm
         text
         time
@@ -239463,12 +241335,13 @@ self: {
         base
         bytestring
         containers
+        http-client
         http-types
         text
         time
       ];
       description = "Firebase Auth, Firestore, and Servant integration for Haskell";
-      license = lib.meta.getLicenseFromSpdxId "MIT";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -242430,8 +244303,8 @@ self: {
       pname = "float128";
       version = "0.1";
       sha256 = "0f4nrj5qy6j6d9ll22zjkbgvw2rx0x2w7nllhl929zdbmhxrjk73";
-      revision = "1";
-      editedCabalFile = "0s13mg9gagmvvqdisdm9r8nps6bavw4va18bsq93q080znwg2dw3";
+      revision = "2";
+      editedCabalFile = "0g664yc3h8rg09hglzga1njv1zlpmv6fg0mqbiba8jr4xsjvq7yi";
       libraryHaskellDepends = [
         base
         integer-gmp
@@ -244007,6 +245880,55 @@ self: {
     }
   ) { };
 
+  fnotation = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      diagnostician,
+      filepath,
+      hashable,
+      prettyprinter,
+      tasty,
+      tasty-golden,
+      temporary,
+      text,
+      vector,
+      vector-hashtables,
+    }:
+    mkDerivation {
+      pname = "fnotation";
+      version = "0.1.1.0";
+      sha256 = "0ff4jk5q9frqpabcnnmm31q9nd0wliyk0z1p7by71l5czbs0izbx";
+      libraryHaskellDepends = [
+        base
+        containers
+        diagnostician
+        hashable
+        prettyprinter
+        text
+        vector
+        vector-hashtables
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        containers
+        diagnostician
+        filepath
+        prettyprinter
+        tasty
+        tasty-golden
+        temporary
+        text
+        vector
+      ];
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   focus = callPackage (
     {
       mkDerivation,
@@ -245058,8 +246980,8 @@ self: {
     }:
     mkDerivation {
       pname = "fontwhich";
-      version = "0.2";
-      sha256 = "0784d0i55wnrqr8ajd7lpw5cdw67gni430g3vhp45mx3ic9srm7c";
+      version = "0.3";
+      sha256 = "12g1qh6lrhbh6rx2xk1r3zn9iqqrrwdb9mglz1iw2mfld8yqfrjj";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -247494,6 +249416,67 @@ self: {
     }
   ) { };
 
+  fractal-layer = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      hashable,
+      hspec,
+      hspec-discover,
+      mtl,
+      profunctors,
+      QuickCheck,
+      resourcet,
+      selective,
+      text,
+      time,
+      transformers,
+      unliftio,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "fractal-layer";
+      version = "0.1.0.0";
+      sha256 = "0b6d36mdsg4xm3x2dvix2hh91ca3jhnfa51id5b4wrdqdmrzvbzx";
+      libraryHaskellDepends = [
+        aeson
+        base
+        containers
+        hashable
+        mtl
+        profunctors
+        resourcet
+        selective
+        text
+        time
+        transformers
+        unliftio
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        hspec
+        mtl
+        profunctors
+        QuickCheck
+        resourcet
+        selective
+        text
+        time
+        unliftio
+        unordered-containers
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Composable resource management and dependency injection";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   fractals = callPackage (
     {
       mkDerivation,
@@ -248223,8 +250206,8 @@ self: {
     }:
     mkDerivation {
       pname = "freckle-http";
-      version = "0.3.1.0";
-      sha256 = "0y6qbl0hb6nwcb843l0q0j7nvzdgpc5l5fq9xgdjgyxnnzbjkm6k";
+      version = "0.4.0.0";
+      sha256 = "1lha52l01yk2jldmkz9ka3icb4n7y5pf6b4792w2100fvgk8spr0";
       libraryHaskellDepends = [
         aeson
         annotated-exception
@@ -248363,8 +250346,8 @@ self: {
     }:
     mkDerivation {
       pname = "freckle-memcached";
-      version = "0.0.0.2";
-      sha256 = "1qqjribjzmpfqqygvl4frxy447sjqs5fin22y9aq075yfvgjq75a";
+      version = "0.0.0.3";
+      sha256 = "1nsi3iq4k3qgz287qf0pn3akg871sh21prrx5zcjkb7kmrqnvkmq";
       libraryHaskellDepends = [
         aeson
         annotated-exception
@@ -248404,7 +250387,7 @@ self: {
         text
         unliftio
       ];
-      description = "..";
+      description = "Some extensions to the memcache library";
       license = lib.licenses.mit;
       hydraPlatforms = lib.platforms.none;
     }
@@ -251040,8 +253023,6 @@ self: {
       ];
       description = "Abstract interface for the file system";
       license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -251086,10 +253067,8 @@ self: {
     }:
     mkDerivation {
       pname = "fs-sim";
-      version = "0.4.1.0";
-      sha256 = "13igdxy6dnqdbvav7a66narfrckz0gaqwyih9wxra3pyf4jzzs9g";
-      revision = "1";
-      editedCabalFile = "1kj1bvkk7s6ly5qc1ixi3c0mh0v48ni2g4jk2ygflm0brl4259h9";
+      version = "0.5.0.0";
+      sha256 = "0f1iisz7klqgxh9g79h42fz7mgg7bh4c8izahjy7hq9cvsh0mnni";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -252172,7 +254151,6 @@ self: {
       funcons-tools,
       funcons-values,
       gll,
-      iml-tools,
       mtl,
       pretty,
       regex-applicative,
@@ -252182,8 +254160,8 @@ self: {
     }:
     mkDerivation {
       pname = "funcons-intgen";
-      version = "0.2.0.1";
-      sha256 = "12g6lizcxhvk26k3qp1k3v9dz9pz9xx004jpmipqm291r9nyiya9";
+      version = "0.2.0.3";
+      sha256 = "0rzyislf08ginflq7m7gjri3m5asshyfywn46fcfv4v3gnqhkmv4";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -252194,7 +254172,6 @@ self: {
         funcons-tools
         funcons-values
         gll
-        iml-tools
         mtl
         pretty
         regex-applicative
@@ -252206,9 +254183,8 @@ self: {
       license = lib.licenses.mit;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cbsc";
-      broken = true;
     }
-  ) { iml-tools = null; };
+  ) { };
 
   funcons-lambda-cbv-mp = callPackage (
     {
@@ -252290,8 +254266,8 @@ self: {
     }:
     mkDerivation {
       pname = "funcons-tools";
-      version = "0.2.0.15";
-      sha256 = "0yfl7rg7hwy8yyxq5axicd57lk650i5pmm0slnxqbsgl96iv8x24";
+      version = "0.2.0.16";
+      sha256 = "1p7lm45762xw5yds4xqqkz0mal0fndnz1k0xspi93v91cskyjq3y";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -253087,7 +255063,6 @@ self: {
       ];
       description = "GLL parser with simple combinator interface";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -253652,10 +255627,8 @@ self: {
     }:
     mkDerivation {
       pname = "fusion-plugin";
-      version = "0.2.7";
-      sha256 = "0ly2pyhh5s1ahmgkbmm1rqnz035dmniv23w6m2d0vbgxy5mkbb0i";
-      revision = "4";
-      editedCabalFile = "1qdy773bglbkl0gwmnm8jrk5w4zn7vfvs9k70p8vaim1d5ccbfrd";
+      version = "0.2.8";
+      sha256 = "184axrs7z08w7lyq61wly6v082jnjb8nj46z5rq92rymb82mh3r9";
       libraryHaskellDepends = [
         base
         containers
@@ -253723,6 +255696,7 @@ self: {
       language-c-quote,
       lens,
       lsp,
+      lsp-test,
       lsp-types,
       mainland-pretty,
       megaparsec,
@@ -253732,6 +255706,7 @@ self: {
       parallel,
       prettyprinter,
       prettyprinter-ansi-terminal,
+      process,
       process-extras,
       QuickCheck,
       random,
@@ -253754,8 +255729,8 @@ self: {
     }:
     mkDerivation {
       pname = "futhark";
-      version = "0.25.36";
-      sha256 = "1wyc7pakrd2rrql3bqww9xid5w26y9ll2c35kqnpx8fwv73918j1";
+      version = "0.25.37";
+      sha256 = "0ynbbp66f6xx836zf71qfarnkmnsbm1hyk1pmk3yf4z301vz1xdh";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -253793,6 +255768,7 @@ self: {
         language-c-quote
         lens
         lsp
+        lsp-test
         lsp-types
         mainland-pretty
         megaparsec
@@ -253802,6 +255778,7 @@ self: {
         parallel
         prettyprinter
         prettyprinter-ansi-terminal
+        process
         process-extras
         QuickCheck
         random
@@ -253952,8 +255929,8 @@ self: {
     }:
     mkDerivation {
       pname = "futhark-server";
-      version = "1.3.0.0";
-      sha256 = "1v8c5zfsc6x48z31lrfcyibbj4742cql3lglg6l59ly39cxi4and";
+      version = "1.3.3.0";
+      sha256 = "0j45clfg1mzy06nnzbgn9gdbys0nh7d9h31gyvpa825qm44xjfdj";
       libraryHaskellDepends = [
         base
         binary
@@ -253970,42 +255947,6 @@ self: {
     }
   ) { };
 
-  futhark-server_1_3_2_0 = callPackage (
-    {
-      mkDerivation,
-      base,
-      binary,
-      bytestring,
-      directory,
-      futhark-data,
-      mtl,
-      process,
-      temporary,
-      text,
-    }:
-    mkDerivation {
-      pname = "futhark-server";
-      version = "1.3.2.0";
-      sha256 = "1rpvd0z09bgnzj6npgc6ngz8par7zcda9y408yjfv5vawd9srv07";
-      revision = "1";
-      editedCabalFile = "1jfsv31s90prnh5gipyfa533sdivh8r2mxq0pbvq1vjbiwjqd81q";
-      libraryHaskellDepends = [
-        base
-        binary
-        bytestring
-        directory
-        futhark-data
-        mtl
-        process
-        temporary
-        text
-      ];
-      description = "Client implementation of the Futhark server protocol";
-      license = lib.meta.getLicenseFromSpdxId "ISC";
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
   futhask = callPackage (
     {
       mkDerivation,
@@ -254412,8 +256353,8 @@ self: {
     }:
     mkDerivation {
       pname = "fuzzySets";
-      version = "1.0.1";
-      sha256 = "1snj86p40p8abjhiqqblqi2qz35w3mnsbzq7x70rbc76hp6qyvw1";
+      version = "1.1.0";
+      sha256 = "09gik4mqa91fvrn9dwff8bhdh33yd1bml1rg3wimjbv2an65aym3";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -254421,8 +256362,10 @@ self: {
         tasty
         tasty-hunit
       ];
-      description = "Library for constructing and manipulating fuzzy sets and fuzzy relations";
+      description = "A Haskell library for working with fuzzy sets and fuzzy relations";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -254553,6 +256496,37 @@ self: {
     }
   ) { };
 
+  fuzzystrmatch-pg = callPackage (
+    {
+      mkDerivation,
+      base,
+      criterion,
+      hspec,
+      quickcheck-instances,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "fuzzystrmatch-pg";
+      version = "0.1.0.0";
+      sha256 = "06fnzvgii5lyzkn9dvzn91671cmg8igaxc36zkfzg0vyzq22kf3z";
+      libraryHaskellDepends = [
+        base
+        text
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        criterion
+        hspec
+        quickcheck-instances
+        text
+      ];
+      description = "Determine string similarities and distance";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   fuzzytime = callPackage (
     {
       mkDerivation,
@@ -254728,8 +256702,8 @@ self: {
     }:
     mkDerivation {
       pname = "fx";
-      version = "0.11";
-      sha256 = "1ibz7hxq6svlfdvmlr0hz8y43rpjs6hf1j08wrbx78vb3irb18cl";
+      version = "0.11.2";
+      sha256 = "0d1h3lj0khpfkw45gblzq0qg5kmg88d8cxddx9hqn2xpwklqqv5k";
       libraryHaskellDepends = [
         base
         monad-parallel
@@ -255878,8 +257852,8 @@ self: {
     }:
     mkDerivation {
       pname = "gb-sprite";
-      version = "0.4.0.0";
-      sha256 = "1812fs30l05amj47kfcplgdjy34q5wabb59gyy1rzdldqki6yql0";
+      version = "0.5.2.0";
+      sha256 = "19m6xac9lww9z10n6d6i7m5rhaggkm4whkv01l9hgvzxxzfpidhj";
       libraryHaskellDepends = [
         base
         bytestring
@@ -255890,7 +257864,7 @@ self: {
         bytestring
         directory
       ];
-      description = "Procedural 2D sprite and VFX generation";
+      description = "Pure Haskell 2D raster graphics engine";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
@@ -260587,6 +262561,8 @@ self: {
       ];
       description = "Standard spec's for Hashable instances";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -262640,6 +264616,65 @@ self: {
     }
   ) { };
 
+  ghc-bench = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      directory,
+      filepath,
+      hspec,
+      hspec-discover,
+      http-types,
+      process,
+      silently,
+      temporary,
+      text,
+      transformers,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "ghc-bench";
+      version = "0.3.0";
+      sha256 = "0rinqgadzvjdd17nmvfz45l22mz59qhwlj12kmcwh8jwhc1m0qy0";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        base
+        bytestring
+        directory
+        filepath
+        http-types
+        process
+        temporary
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        hspec
+        http-types
+        process
+        silently
+        temporary
+        text
+        transformers
+        yaml
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Benchmark a Haskell development system";
+      license = lib.licenses.mit;
+      mainProgram = "ghc-bench";
+    }
+  ) { };
+
   ghc-bignum_1_3 = callPackage (
     { mkDerivation }:
     mkDerivation {
@@ -262864,8 +264899,8 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "ghc-compat";
-      version = "0.5.5.0";
-      sha256 = "0y8n31ri08rl1nzm4phjz5azia7zmwswv2fhzkx828xll6cpqbc3";
+      version = "0.5.7.0";
+      sha256 = "1cbjbnnw08n0ly2clm82hc1pishg0r88mdp79dfv6wqqyfxkgrdf";
       libraryHaskellDepends = [ base ];
       description = "GHC compatibility for MicroHs";
       license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
@@ -263033,6 +265068,7 @@ self: {
   ghc-debug-brick = callPackage (
     {
       mkDerivation,
+      async,
       base,
       brick,
       bytestring,
@@ -263040,6 +265076,8 @@ self: {
       containers,
       contra-tracer,
       deepseq,
+      dependent-map,
+      dependent-sum-template,
       directory,
       exceptions,
       filepath,
@@ -263048,6 +265086,8 @@ self: {
       ghc-debug-convention,
       microlens,
       microlens-platform,
+      safe-exceptions,
+      some,
       text,
       time,
       unordered-containers,
@@ -263056,11 +265096,12 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-debug-brick";
-      version = "0.7.0.0";
-      sha256 = "06lwx3j9cfyaffqwjmyvv53lhybnz1zyd7djaz2an99d2pp037bp";
-      isLibrary = false;
+      version = "0.8.0.0";
+      sha256 = "0msk2bq84vm0jicnnklri0wafp0dqwqnmnvi70gaw2ba2v7m78ks";
+      isLibrary = true;
       isExecutable = true;
-      executableHaskellDepends = [
+      libraryHaskellDepends = [
+        async
         base
         brick
         bytestring
@@ -263068,6 +265109,8 @@ self: {
         containers
         contra-tracer
         deepseq
+        dependent-map
+        dependent-sum-template
         directory
         exceptions
         filepath
@@ -263076,12 +265119,15 @@ self: {
         ghc-debug-convention
         microlens
         microlens-platform
+        safe-exceptions
+        some
         text
         time
         unordered-containers
         vty
         vty-crossplatform
       ];
+      executableHaskellDepends = [ base ];
       description = "A simple TUI using ghc-debug";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ghc-debug-brick";
@@ -263114,13 +265160,14 @@ self: {
       psqueues,
       stm,
       text,
+      transformers,
       unordered-containers,
       vector,
     }:
     mkDerivation {
       pname = "ghc-debug-client";
-      version = "0.7.0.0";
-      sha256 = "03gqzbms7iv06qbcmz2v2zpqz9rsz4in14jf37s574rj3kh1xw0m";
+      version = "0.8.0.0";
+      sha256 = "0rqrg9ddjqhv32r0h3fqbydrmama16l1m9wyljj29ldyndpwi85w";
       libraryHaskellDepends = [
         async
         base
@@ -263144,6 +265191,7 @@ self: {
         psqueues
         stm
         text
+        transformers
         unordered-containers
         vector
       ];
@@ -263172,8 +265220,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-debug-common";
-      version = "0.7.0.0";
-      sha256 = "0nb6d18lkynzas55inx7h60xygj1f5n2hzjiw3zl3j4yhs9pnq6k";
+      version = "0.8.0.0";
+      sha256 = "096bj03jyrg8320kmm11lxfdm7q6gwh91yvjvs3z7m1sw8zrzd8y";
       libraryHaskellDepends = [
         array
         base
@@ -263204,8 +265252,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-debug-convention";
-      version = "0.7.0.0";
-      sha256 = "19ir87s3n2k0ijwa0ax6d8p8gpbmf64a5h46k40dbs9h6waij0pa";
+      version = "0.8.0.0";
+      sha256 = "0nzbkd2cx4ryakh810xs3id1im8ayarfnb1m2bbk532qcfrwq5j6";
       libraryHaskellDepends = [
         base
         directory
@@ -263227,8 +265275,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-debug-stub";
-      version = "0.7.0.0";
-      sha256 = "0p7x3j5qwc1s4svqmxq1s5vcrjczwm86lml403mdg1xvd2scyn1z";
+      version = "0.8.0.0";
+      sha256 = "1axg67n0nyl9gwn3pqrpvq6qcykidcas5h96f4cckng8b75ab22b";
       libraryHaskellDepends = [
         base
         directory
@@ -266174,31 +268222,39 @@ self: {
   ghc-stack-profiler = callPackage (
     {
       mkDerivation,
+      async,
       base,
       binary,
       bytestring,
+      containers,
       ghc-heap,
       ghc-internal,
       ghc-stack-profiler-core,
       ghc-trace-events,
+      stm,
       text,
     }:
     mkDerivation {
       pname = "ghc-stack-profiler";
-      version = "0.1.0.0";
-      sha256 = "0l5qbabpcn0ywr3q12bmbbvq0j5shsn5jf7sd1frq8crfhy546ni";
+      version = "0.2.0.0";
+      sha256 = "0c5c7q600s21fvdqgp7lvjbc88imy965g8innnr9k9vgzdm163zi";
       libraryHaskellDepends = [
+        async
         base
         binary
         bytestring
+        containers
         ghc-heap
         ghc-internal
         ghc-stack-profiler-core
         ghc-trace-events
+        stm
         text
       ];
       description = "RTS Callstack profiler for GHC";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -266214,10 +268270,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-stack-profiler-core";
-      version = "0.1.0.0";
-      sha256 = "17chnk3kw9dbf63j0hhx2js3i871kkqm8mpvkgcg7in5rm27v0ra";
-      revision = "3";
-      editedCabalFile = "1rb9sq04d8bf6ygdp41fg99zrmwvmbp4rx25b5bibqr975v7hg2h";
+      version = "0.2.0.0";
+      sha256 = "17mvs444y48yx4r3bkawj6rg9k7xcg56mav9r7jfl7l82h7y6f5g";
       libraryHaskellDepends = [
         base
         binary
@@ -266242,14 +268296,15 @@ self: {
       ghc-events,
       ghc-stack-profiler-core,
       hs-speedscope,
+      ipedb,
       machines,
       optparse-applicative,
       text,
     }:
     mkDerivation {
       pname = "ghc-stack-profiler-speedscope";
-      version = "0.1.0.0";
-      sha256 = "01x0rphwn5hlp2j0d75wqmzn0m1qi6x51vaqp34nv1ig63qrc1zy";
+      version = "0.2.0.0";
+      sha256 = "0v9xqldkhm7ji6bwqh53d6949vmwq902ml4gflxpigbdvb2sami9";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -266261,6 +268316,7 @@ self: {
         ghc-events
         ghc-stack-profiler-core
         hs-speedscope
+        ipedb
         machines
         optparse-applicative
         text
@@ -266922,26 +268978,31 @@ self: {
     }
   ) { };
 
-  ghc-typelits-extra_0_5_2 = callPackage (
+  ghc-typelits-extra_0_5_3 = callPackage (
     {
       mkDerivation,
       base,
       containers,
+      directory,
+      filepath,
       ghc,
       ghc-bignum,
       ghc-prim,
       ghc-tcplugin-api,
       ghc-typelits-knownnat,
       ghc-typelits-natnormalise,
+      interpolate,
+      process,
       tasty,
       tasty-hunit,
       template-haskell,
+      temporary,
       transformers,
     }:
     mkDerivation {
       pname = "ghc-typelits-extra";
-      version = "0.5.2";
-      sha256 = "03l0gb3imz53pqnnqaqgxsvqxzv0jqv9syjfdvlfqah6kib6acii";
+      version = "0.5.3";
+      sha256 = "1azm03pz1rs0x6i7ywqckmrcs5n95ry0g4kj4c9asl8g0gnkvq8a";
       libraryHaskellDepends = [
         base
         containers
@@ -266956,10 +269017,15 @@ self: {
       ];
       testHaskellDepends = [
         base
+        directory
+        filepath
         ghc-typelits-knownnat
         ghc-typelits-natnormalise
+        interpolate
+        process
         tasty
         tasty-hunit
+        temporary
       ];
       description = "Additional type-level operations on GHC.TypeLits.Nat";
       license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
@@ -267006,7 +269072,7 @@ self: {
     }
   ) { };
 
-  ghc-typelits-knownnat_0_8_2 = callPackage (
+  ghc-typelits-knownnat_0_8_3 = callPackage (
     {
       mkDerivation,
       base,
@@ -267023,8 +269089,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-typelits-knownnat";
-      version = "0.8.2";
-      sha256 = "0fljjj0n47wwxbg8kxpnn7kbf7vfdh91q3fhnk0jaq3nnlv05bdy";
+      version = "0.8.3";
+      sha256 = "13s0yya4q32v76ix0qlimvj14j9qiamxvqyjfw0lp2g42wdj67fz";
       libraryHaskellDepends = [
         base
         ghc
@@ -267127,7 +269193,7 @@ self: {
     }
   ) { };
 
-  ghc-typelits-natnormalise_0_9_3 = callPackage (
+  ghc-typelits-natnormalise_0_9_5 = callPackage (
     {
       mkDerivation,
       base,
@@ -267136,15 +269202,17 @@ self: {
       ghc-bignum,
       ghc-prim,
       ghc-tcplugin-api,
+      interpolate,
+      process,
       tasty,
       tasty-hunit,
-      template-haskell,
+      temporary,
       transformers,
     }:
     mkDerivation {
       pname = "ghc-typelits-natnormalise";
-      version = "0.9.3";
-      sha256 = "0q5s6sz212xp88cwliizxz32jk1rk1b853riaypw7kvim7ssv90v";
+      version = "0.9.5";
+      sha256 = "1391bmh8460kybfp39v0c5njd7r4yxz6nyk28qvx70jry2pdysbq";
       libraryHaskellDepends = [
         base
         containers
@@ -267156,9 +269224,11 @@ self: {
       testHaskellDepends = [
         base
         ghc-prim
+        interpolate
+        process
         tasty
         tasty-hunit
-        template-haskell
+        temporary
       ];
       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
       license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
@@ -267807,6 +269877,69 @@ self: {
     }
   ) { };
 
+  ghci4luatex_0_1_3 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      cmdargs,
+      containers,
+      hspec,
+      network-simple,
+      process,
+      QuickCheck,
+      stm,
+      text,
+    }:
+    mkDerivation {
+      pname = "ghci4luatex";
+      version = "0.1.3";
+      sha256 = "00hdf29213sq9417b9j9x1fc6xp82mxrvvgpizxh68p7fs0ql7by";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        cmdargs
+        containers
+        network-simple
+        process
+        stm
+        text
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        cmdargs
+        containers
+        network-simple
+        process
+        stm
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        cmdargs
+        containers
+        hspec
+        network-simple
+        process
+        QuickCheck
+        stm
+        text
+      ];
+      description = "A GHCi session in LaTeX";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "ghci4luatex";
+    }
+  ) { };
+
   ghcid = callPackage (
     {
       mkDerivation,
@@ -268434,8 +270567,8 @@ self: {
     { mkDerivation, jsaddle-dom }:
     mkDerivation {
       pname = "ghcjs-dom-jsaddle";
-      version = "0.9.9.0";
-      sha256 = "0r9xkp23j3w8c6qwsx4zyd8g8a3pryx073rw84k7fl8nfsjb0b7m";
+      version = "0.9.9.1";
+      sha256 = "05spxlw1gjian9k4m0z72qv72sj8x491pjpj2vzh524jhg69hlb1";
       libraryHaskellDepends = [ jsaddle-dom ];
       doHaddock = false;
       description = "DOM library that supports both GHCJS and GHC using jsaddle";
@@ -274035,8 +276168,8 @@ self: {
     }:
     mkDerivation {
       pname = "git-annex";
-      version = "10.20260213";
-      sha256 = "0makjv87hvxvljv2jw22g62z0xrrcdxd6gn888vj9h8yy9j32q61";
+      version = "10.20260421";
+      sha256 = "0r7p1bs9syhzha1kyf2z6n29dvghqy8gf0lcw8igbzwk2d30q0vz";
       configureFlags = [
         "-fassistant"
         "-f-benchmark"
@@ -276615,7 +278748,7 @@ self: {
     }
   ) { };
 
-  gitlab-haskell_1_2_1_0 = callPackage (
+  gitlab-haskell_1_3_0_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -276641,8 +278774,8 @@ self: {
     }:
     mkDerivation {
       pname = "gitlab-haskell";
-      version = "1.2.1.0";
-      sha256 = "1x80hgf2q36xcdl0h7gw2qq56zlk0dps4i1msw5zk4ay2y4n8vsn";
+      version = "1.3.0.0";
+      sha256 = "1aa8hr6k4f7i6z0762zah10ija9f221f8yww0igbfmxm3g99sxnm";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -277192,6 +279325,8 @@ self: {
       pname = "gitrev-typed";
       version = "0.1";
       sha256 = "17313dgh672zw854zckp9wch7fpkwq3gsragqv7fpj82av0s4js1";
+      revision = "1";
+      editedCabalFile = "1x6z2ij43kzr94fnxy5gjrs0nd4wdi9i54c41mq7yy1v9qyv6fib";
       libraryHaskellDepends = [
         base
         directory
@@ -278775,8 +280910,8 @@ self: {
     }:
     mkDerivation {
       pname = "gll";
-      version = "0.4.1.1";
-      sha256 = "061ypdd5y2ksa4kmij8b1xasr30rsqa97w18n0j142817ravhxi7";
+      version = "0.4.1.2";
+      sha256 = "0ck7l086rj827ipsmz106jxhn0gj2v6r4v0x6pw6yq911a57kpi6";
       libraryHaskellDepends = [
         array
         base
@@ -278788,8 +280923,6 @@ self: {
       ];
       description = "GLL parser with simple combinator interface";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -286861,8 +288994,8 @@ self: {
     }:
     mkDerivation {
       pname = "granite";
-      version = "0.4.0.0";
-      sha256 = "0gy9hjlv7sm0kdrrn9xqh16kl3aj3kxgg6zp20501cbwcdnr95sd";
+      version = "0.4.0.1";
+      sha256 = "1a70sd5sndnyi024sv7fvgm7chlgjixz3ii8m9983mybap8ywn0g";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -287180,7 +289313,6 @@ self: {
       ];
       description = "Native Haskell implementation of the gRPC framework";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -287204,7 +289336,6 @@ self: {
       ];
       description = "grapesy-etcd - GRPC interface to etcd";
       license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -288830,8 +290961,8 @@ self: {
     }:
     mkDerivation {
       pname = "graphwiz";
-      version = "2.0.0";
-      sha256 = "1lh6rggylnwsyadbiq895lnykjyiv230x8bp5fvww9vi0b2fjwyy";
+      version = "3.0.0";
+      sha256 = "07fh4c38367szpm42lr104vlwaz9m2mgyzklq6zkz7k4k1zjyvgx";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -289503,6 +291634,57 @@ self: {
     }
   ) { };
 
+  greskell_2_0_3_4 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      exceptions,
+      greskell-core,
+      hashable,
+      hspec,
+      hspec-discover,
+      semigroups,
+      should-not-typecheck,
+      text,
+      transformers,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "greskell";
+      version = "2.0.3.4";
+      sha256 = "09kg39d520m95iaps94y31xdvy19x9s8ydg0g8sxx3903i7xalyv";
+      libraryHaskellDepends = [
+        aeson
+        base
+        exceptions
+        greskell-core
+        hashable
+        semigroups
+        text
+        transformers
+        unordered-containers
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        greskell-core
+        hspec
+        should-not-typecheck
+        text
+        unordered-containers
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Haskell binding for Gremlin graph query language";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   greskell-core = callPackage (
     {
       mkDerivation,
@@ -289554,6 +291736,58 @@ self: {
     }
   ) { };
 
+  greskell-core_1_0_0_7 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      hashable,
+      hspec,
+      hspec-discover,
+      QuickCheck,
+      scientific,
+      semigroups,
+      text,
+      unordered-containers,
+      uuid,
+      vector,
+    }:
+    mkDerivation {
+      pname = "greskell-core";
+      version = "1.0.0.7";
+      sha256 = "015pjqrf60xmvamb13ma2f2paiabwhrnhrc7a4dxcar6h0zg4qfd";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        hashable
+        scientific
+        semigroups
+        text
+        unordered-containers
+        uuid
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        hspec
+        QuickCheck
+        text
+        unordered-containers
+        vector
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Haskell binding for Gremlin graph query language - core data types and tools";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   greskell-websocket = callPackage (
     {
       mkDerivation,
@@ -289610,6 +291844,63 @@ self: {
     }
   ) { };
 
+  greskell-websocket_1_0_0_5 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      base64-bytestring,
+      bytestring,
+      greskell-core,
+      hashtables,
+      hspec,
+      hspec-discover,
+      safe-exceptions,
+      stm,
+      text,
+      unordered-containers,
+      uuid,
+      vector,
+      websockets,
+    }:
+    mkDerivation {
+      pname = "greskell-websocket";
+      version = "1.0.0.5";
+      sha256 = "0x2zwlcnih84v35r3kmd4hp6iriiqdk9gl1ra7ghvjzg8q7hqrwd";
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        base64-bytestring
+        bytestring
+        greskell-core
+        hashtables
+        safe-exceptions
+        stm
+        text
+        unordered-containers
+        uuid
+        vector
+        websockets
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        greskell-core
+        hspec
+        unordered-containers
+        uuid
+        vector
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Haskell client for Gremlin Server using WebSocket serializer";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   grfn = callPackage (
     {
       mkDerivation,
@@ -290970,8 +293261,8 @@ self: {
       pname = "groups-generic";
       version = "0.3.1.0";
       sha256 = "1v9mw478x6kfv38m13kypfmz9w8vn3xkvff3gy9g7x29aq5bvjfy";
-      revision = "1";
-      editedCabalFile = "1fsniqwyinpj9fmavdy915pl9f39bcyqbppk3iilml02yjrg73kg";
+      revision = "2";
+      editedCabalFile = "0zzr205mm4d68d13x934rpqfs0wflb79yqgkhg6dvnkkn1jj8bxk";
       libraryHaskellDepends = [
         base
         groups
@@ -292201,13 +294492,16 @@ self: {
       gi-gdk3,
       gi-gdkpixbuf,
       gi-glib,
+      gi-gobject,
       gi-gtk-layer-shell,
       gi-gtk3,
+      gtk-scaling-image,
       gtk-strut,
       gtk3,
       haskell-gi,
       haskell-gi-base,
       hslogger,
+      hspec,
       optparse-applicative,
       status-notifier-item,
       text,
@@ -292217,8 +294511,8 @@ self: {
     }:
     mkDerivation {
       pname = "gtk-sni-tray";
-      version = "0.2.0.0";
-      sha256 = "1nhw7nlcghwi9rlrd55951brfi98fz7za9jhn9bnrca6yd8pkh35";
+      version = "0.2.1.1";
+      sha256 = "0cc7lzn19ipn69i4ggqs308ncn06w772azcgha1biqba0hv1hcsp";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -292237,7 +294531,9 @@ self: {
         gi-gdk3
         gi-gdkpixbuf
         gi-glib
+        gi-gobject
         gi-gtk3
+        gtk-scaling-image
         gtk-strut
         haskell-gi
         haskell-gi-base
@@ -292264,6 +294560,11 @@ self: {
         text
         unix
       ];
+      testHaskellDepends = [
+        base
+        containers
+        hspec
+      ];
       description = "A standalone StatusNotifierItem/AppIndicator tray";
       license = lib.licenses.bsd3;
       badPlatforms = lib.platforms.darwin;
@@ -293792,6 +296093,7 @@ self: {
     {
       mkDerivation,
       base,
+      c2hs,
       h3,
       QuickCheck,
       test-framework,
@@ -293799,10 +296101,11 @@ self: {
     }:
     mkDerivation {
       pname = "h3-hs";
-      version = "0.2.0.1";
-      sha256 = "1rnqvnmf4mznwpi06i58f2wjn6gbjl9vxr8g6al7jfw61qy4rnlh";
+      version = "0.3.0.0";
+      sha256 = "1qkszvf3z94ak7i4gjyqvyv00p8f832ns9fwmzxmr67bmjg9m0hy";
       libraryHaskellDepends = [ base ];
       librarySystemDepends = [ h3 ];
+      libraryToolDepends = [ c2hs ];
       testHaskellDepends = [
         base
         QuickCheck
@@ -295026,17 +297329,20 @@ self: {
       mkDerivation,
       base,
       containers,
+      deepseq,
       hspec,
       mtl,
       process,
       QuickCheck,
       random,
+      tasty,
+      tasty-bench,
       vector,
     }:
     mkDerivation {
       pname = "haal";
-      version = "0.3.0.0";
-      sha256 = "1kllgy5q29xr1zh2xif1c7ixlhjkcr9cs5j3km90fr9sdd9hjjxl";
+      version = "0.5.0.0";
+      sha256 = "1qjnga4f5q2k8bamn3vgkzv7brs4a4bc6jpyxxyp7h63lhxrfy6n";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -295060,6 +297366,15 @@ self: {
         QuickCheck
         random
       ];
+      benchmarkHaskellDepends = [
+        base
+        containers
+        deepseq
+        mtl
+        random
+        tasty
+        tasty-bench
+      ];
       description = "A Haskell library for Active Automata Learning";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
@@ -295067,6 +297382,28 @@ self: {
     }
   ) { };
 
+  haal-models = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      haal,
+    }:
+    mkDerivation {
+      pname = "haal-models";
+      version = "0.1.0.0";
+      sha256 = "19yhz0gp2axzy3hp7nk1k61ygfzhgplki3sidw5cppqxk3gi640g";
+      libraryHaskellDepends = [
+        base
+        containers
+        haal
+      ];
+      description = "Pre-built Mealy automaton models for haal";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   haar = callPackage (
     {
       mkDerivation,
@@ -296272,6 +298609,93 @@ self: {
     }
   ) { };
 
+  hackage-cli_0_2_0_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      base-compat,
+      bytestring,
+      Cabal,
+      containers,
+      deepseq,
+      directory,
+      filepath,
+      http-io-streams,
+      io-streams,
+      microlens,
+      microlens-mtl,
+      microlens-th,
+      mtl,
+      netrc,
+      optparse-applicative,
+      pretty,
+      process-extras,
+      stringsearch,
+      tagsoup,
+      tar,
+      tasty,
+      tasty-golden,
+      text,
+      time,
+      zlib,
+    }:
+    mkDerivation {
+      pname = "hackage-cli";
+      version = "0.2.0.0";
+      sha256 = "0sswfdgdqwh3m6cczd2ycw3bbrvhvq5ckr0nnm9p1cy1hb4g34l2";
+      isLibrary = false;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        Cabal
+        containers
+        mtl
+        pretty
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        base-compat
+        bytestring
+        Cabal
+        containers
+        deepseq
+        directory
+        filepath
+        http-io-streams
+        io-streams
+        microlens
+        microlens-mtl
+        microlens-th
+        mtl
+        netrc
+        optparse-applicative
+        process-extras
+        stringsearch
+        tagsoup
+        tar
+        text
+        time
+        zlib
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        Cabal
+        filepath
+        tasty
+        tasty-golden
+      ];
+      doHaddock = false;
+      description = "CLI tool for Hackage";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "hackage-cli";
+    }
+  ) { };
+
   hackage-db = callPackage (
     {
       mkDerivation,
@@ -296822,8 +299246,8 @@ self: {
       pname = "hackage-security";
       version = "0.6.3.2";
       sha256 = "1yb8hz4h4wmmj2smr31nmfjfpfqrv3xcn3x92c59s8fmis39g3xz";
-      revision = "1";
-      editedCabalFile = "0bglycgf2l1dxilprs5s3bc4gznvilqs48kvv7m11y5wzip4g8jx";
+      revision = "2";
+      editedCabalFile = "1h3j39pys4sx36z0iz3vshj530gz178hs14nhp6ln60hf5xmf9n0";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -299161,6 +301585,7 @@ self: {
       blaze-html,
       bytestring,
       containers,
+      contravariant,
       data-default,
       deepseq,
       directory,
@@ -299202,10 +301627,10 @@ self: {
     }:
     mkDerivation {
       pname = "hakyll";
-      version = "4.16.7.1";
-      sha256 = "18wg5ay6l3ngsmqq00g6y7djmg4f8285kwdi47g0rg70mq6sn0py";
-      revision = "3";
-      editedCabalFile = "185panz8k3wqiy1hpzaa9p38v1n7vwcj2r6ij2pwqs7qrrwqr6dw";
+      version = "4.16.8.0";
+      sha256 = "0hndp8y0rn4i534jgb2j08jps36x33ywxxy0iibxicsvc3y07l5p";
+      revision = "1";
+      editedCabalFile = "1fmphmwhbqzf0yg6ifnxhhmpjnd67ki84xdgcvm69n2sp4n208mz";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -299216,6 +301641,7 @@ self: {
         blaze-html
         bytestring
         containers
+        contravariant
         data-default
         deepseq
         directory
@@ -299757,7 +302183,9 @@ self: {
       ];
       description = "Dhall compiler for Hakyll";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "hakyll-dhall-test-app";
+      broken = true;
     }
   ) { };
 
@@ -299815,6 +302243,8 @@ self: {
       ];
       description = "A Hakyll plugin for rendering diagrams figures from embedded Haskell code";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -304432,6 +306862,7 @@ self: {
       description = "Deep embedding of hardware descriptions with code generation";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -308685,6 +311116,7 @@ self: {
       ghc-boot-th,
       ghc-experimental,
       ghc-heap,
+      ghc-stack-annotations,
       ghci,
       haskeline,
       haskell-debugger-view,
@@ -308698,6 +311130,8 @@ self: {
       process,
       random,
       regex,
+      retry,
+      stm,
       tasty,
       tasty-expected-failure,
       tasty-golden,
@@ -308708,11 +311142,12 @@ self: {
       transformers,
       unix,
       unordered-containers,
+      uuid,
     }:
     mkDerivation {
       pname = "haskell-debugger";
-      version = "0.12.2.0";
-      sha256 = "16x87g1y3r5l1hbl2v23cycmcdzyihr2ha1afh47xda1grlqzd7l";
+      version = "0.13.0.0";
+      sha256 = "1zgfjf2ncgma3shlyr124h27hky8si5gy70mihv3zf53j0fs4dy2";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -308736,11 +311171,14 @@ self: {
         ghc-boot-th
         ghc-experimental
         ghc-heap
+        ghc-stack-annotations
         ghci
         haskell-debugger-view
         hie-bios
         mtl
+        network
         process
+        retry
         text
         time
         unix
@@ -308757,6 +311195,7 @@ self: {
         exceptions
         filepath
         ghc
+        ghc-stack-annotations
         ghci
         haskeline
         hie-bios
@@ -308771,6 +311210,7 @@ self: {
         time
         transformers
         unordered-containers
+        uuid
       ];
       testHaskellDepends = [
         aeson
@@ -308780,12 +311220,17 @@ self: {
         bytestring
         containers
         dap
+        directory
+        exceptions
         filepath
+        mtl
         network
         network-run
         process
         random
         regex
+        retry
+        stm
         tasty
         tasty-expected-failure
         tasty-golden
@@ -309827,6 +312272,8 @@ self: {
       ];
       description = "Bindings to the igraph C library (v0.8.5).";
       license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -310229,6 +312676,39 @@ self: {
     }
   ) { };
 
+  haskell-list-builder = callPackage (
+    {
+      mkDerivation,
+      base,
+      criterion,
+      dlist,
+      ghc-prim,
+      hedgehog,
+      primitive,
+    }:
+    mkDerivation {
+      pname = "haskell-list-builder";
+      version = "0.1.0.0";
+      sha256 = "02753zmb1zv5n5plz33zlzwvhp2x0n36d7mj3iik9kgnnskzw9rw";
+      libraryHaskellDepends = [
+        base
+        ghc-prim
+        primitive
+      ];
+      testHaskellDepends = [
+        base
+        hedgehog
+      ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        dlist
+      ];
+      description = "Fast Sequencing and Building Lists using Unsafe Primitives";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   haskell-lsp = callPackage (
     {
       mkDerivation,
@@ -310786,8 +313266,8 @@ self: {
     }:
     mkDerivation {
       pname = "haskell-opentimestamps";
-      version = "0.5.5.1";
-      sha256 = "04dzai6q93gzqjx3jqhgnzsy6fmsalyamylqsnmxg09i0zgbyk66";
+      version = "0.5.5.2";
+      sha256 = "14gd70lrh27kkkg1jf4gqxm8ixnc7hj1j3csyvkplv7ayxffdl58";
       libraryHaskellDepends = [
         aeson
         base
@@ -310853,8 +313333,8 @@ self: {
     }:
     mkDerivation {
       pname = "haskell-opentimestamps-client";
-      version = "0.4.1.0";
-      sha256 = "0w6avx3jsj875ljddc82pzqqckgbc113c1mj3ghp473palzjigni";
+      version = "0.4.1.1";
+      sha256 = "0f57pr1c8c8v67ni9jla8y5qrd9rhmsabq09nm6yqqshd67xhcyj";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -315032,7 +317512,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Bitcoin & Bitcoin Cash library for Haskell";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -315182,7 +317661,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "P2P library for Bitcoin and Bitcoin Cash";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -315482,7 +317960,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Storage and index for Bitcoin and Bitcoin Cash";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "haskoin-store";
     }
   ) { };
@@ -315576,7 +318053,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Data for Haskoin Store";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -315803,7 +318279,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Lightweight CLI wallet for Bitcoin and Bitcoin Cash";
       license = lib.licenses.publicDomain;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "hw";
     }
   ) { };
@@ -318481,6 +320956,81 @@ self: {
     }
   ) { };
 
+  hasql-interpolate_1_1_0_1 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      array,
+      base,
+      bytestring,
+      containers,
+      haskell-src-meta,
+      hasql,
+      iproute,
+      megaparsec,
+      mtl,
+      scientific,
+      tasty,
+      tasty-hunit,
+      template-haskell,
+      text,
+      time,
+      tmp-postgres,
+      transformers,
+      uuid,
+      vector,
+    }:
+    mkDerivation {
+      pname = "hasql-interpolate";
+      version = "1.1.0.1";
+      sha256 = "1l7a1p62r8i262304zn4s0a1kar8mq0b17yfrlak4pdfdskwbydy";
+      libraryHaskellDepends = [
+        aeson
+        array
+        base
+        bytestring
+        containers
+        haskell-src-meta
+        hasql
+        iproute
+        megaparsec
+        mtl
+        scientific
+        template-haskell
+        text
+        time
+        transformers
+        uuid
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        array
+        base
+        bytestring
+        containers
+        haskell-src-meta
+        hasql
+        iproute
+        megaparsec
+        mtl
+        scientific
+        tasty
+        tasty-hunit
+        template-haskell
+        text
+        time
+        tmp-postgres
+        transformers
+        uuid
+        vector
+      ];
+      description = "QuasiQuoter that supports expression interpolation for hasql";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   hasql-listen-notify = callPackage (
     {
       mkDerivation,
@@ -318525,8 +321075,8 @@ self: {
     }:
     mkDerivation {
       pname = "hasql-mapping";
-      version = "0.1";
-      sha256 = "1jppr5z54ca79smjyrk031swgxivz4mnhrli31x33fkyidi0xm8j";
+      version = "0.1.0.1";
+      sha256 = "01w5xr4yw18000nsm2fsr8l672dr7lksr6w6cj45i21x4i6cs5c0";
       libraryHaskellDepends = [
         aeson
         base
@@ -319163,8 +321713,8 @@ self: {
     }:
     mkDerivation {
       pname = "hasql-postgresql-types";
-      version = "0.2";
-      sha256 = "10yh2mlr97w7s7gz63g5mzgcnrbadkzv59xfs99hf0rs0syckm2l";
+      version = "0.2.0.1";
+      sha256 = "0g1r4b98y939fkvacy9lyr9sk1mzpz5514rbgiv0g91vy0mr52ch";
       libraryHaskellDepends = [
         base
         hasql
@@ -320687,6 +323237,56 @@ self: {
     }
   ) { };
 
+  hatter = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      directory,
+      filepath,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      text,
+      time,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "hatter";
+      version = "0.3.0";
+      sha256 = "04ds24lhbl294i4lq0x0jfhmgbsc7nwpf34vqfqhp9rvn9sqn65k";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        text
+        time
+        transformers
+      ];
+      executableHaskellDepends = [
+        base
+        text
+        time
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        text
+      ];
+      description = "Native IOS and Android applications in haskell!";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   haveibeenpwned = callPackage (
     {
       mkDerivation,
@@ -321230,8 +323830,8 @@ self: {
     }:
     mkDerivation {
       pname = "haxr";
-      version = "3000.11.6";
-      sha256 = "0i5nvksznsixnqjrp1bgz68xhjqbzc84zqzjjvs6g1v18fbbk2fy";
+      version = "3000.11.6.1";
+      sha256 = "1ldlgp22y8zs84mgp1d3q35r9rbfjrknslw0b9wjnwnzhvxb8g91";
       libraryHaskellDepends = [
         array
         base
@@ -325345,6 +327945,8 @@ self: {
       pname = "hedgehog-extras";
       version = "0.10.1.0";
       sha256 = "04m51s11485war8ngyhywjnrb60fsn8fikrxz3bqzlib6k4mb7yz";
+      revision = "1";
+      editedCabalFile = "0rz162nj37v6472favc9rimczg3s6f54arwgjcxflz4qdna8d67p";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -325752,6 +328354,44 @@ self: {
     }
   ) { };
 
+  hedgehog-utils = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      deepseq,
+      hedgehog,
+      hspec,
+      hspec-core,
+      hspec-discover,
+      hspec-hedgehog,
+      hspec-tidy-formatter,
+    }:
+    mkDerivation {
+      pname = "hedgehog-utils";
+      version = "0.1.0.0";
+      sha256 = "0q5qzg38jkrjkpqdmhdw7xlzz2dbgpgicpnr8h8sjzzf77m7c6c5";
+      libraryHaskellDepends = [
+        base
+        containers
+        deepseq
+        hedgehog
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        hedgehog
+        hspec
+        hspec-core
+        hspec-hedgehog
+        hspec-tidy-formatter
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Utilities for Hedgehog";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   hedis = callPackage (
     {
       mkDerivation,
@@ -326337,6 +328977,71 @@ self: {
     }
   ) { };
 
+  hegel = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      array,
+      async,
+      base,
+      bytestring,
+      cborg,
+      containers,
+      data-default,
+      digest,
+      directory,
+      hspec,
+      hspec-discover,
+      process,
+      stm,
+      text,
+    }:
+    mkDerivation {
+      pname = "hegel";
+      version = "0.1.0";
+      sha256 = "01cp2b4wk0vx5ckwzjh74x9rw7a5zma3a1vmh00a1xs06zppz303";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        array
+        async
+        base
+        bytestring
+        cborg
+        containers
+        data-default
+        digest
+        directory
+        process
+        stm
+        text
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        data-default
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        cborg
+        data-default
+        hspec
+        process
+        stm
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Property-based testing powered by Hypothesis";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   hegg = callPackage (
     {
       mkDerivation,
@@ -327877,8 +330582,6 @@ self: {
       doHaddock = false;
       description = "GHC plugin to enforce user specified rules on code";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -329206,10 +331909,8 @@ self: {
     }:
     mkDerivation {
       pname = "hermes-json";
-      version = "0.7.0.0";
-      sha256 = "1261sm969kwji4gwk474l41rk0f3i8isb5x4zd77l3y4d5hgz85b";
-      revision = "1";
-      editedCabalFile = "1dnk3gdhpr13m9y2j71ivjsbjkns9jvjpasf5vhlsz7w4v679zni";
+      version = "0.8.0.0";
+      sha256 = "0lcl2rsjaa3cvgcvdrkdyw7kv3bmrv31v0hhdmjppdwqjhx4jlvz";
       libraryHaskellDepends = [
         base
         bytestring
@@ -332395,9 +335096,7 @@ self: {
       ];
       description = "Bindings to libintl.h (gettext, bindtextdomain)";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "hgettext";
-      broken = true;
     }
   ) { };
 
@@ -332545,8 +335244,8 @@ self: {
       pname = "hgmp";
       version = "0.1.2.1";
       sha256 = "08w0b6yla086vk802xqcqslpkqpjx2h2hc6l3jyymms77qyn70f6";
-      revision = "3";
-      editedCabalFile = "1m4rhz6myq5bwysmcv4jsaayxfgfn6ka3dfxppnvxjgcrn4nd0zd";
+      revision = "4";
+      editedCabalFile = "12108xb2imax44wzdfff2ccj5fzlbj59hf108hqyg786dqw7n94x";
       libraryHaskellDepends = [
         base
         ghc-bignum
@@ -332828,6 +335527,57 @@ self: {
     }
   ) { harp = null; };
 
+  hhlo = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      bytestring,
+      containers,
+      mtl,
+      tasty,
+      tasty-hunit,
+      text,
+      transformers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "hhlo";
+      version = "0.2.0.0";
+      sha256 = "1z583k7srmwzkhb3p4dcxwlhp3x2va4gjh5agrxr994qw7666mc1";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        async
+        base
+        bytestring
+        containers
+        mtl
+        text
+        transformers
+        vector
+      ];
+      executableHaskellDepends = [
+        base
+        text
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        tasty
+        tasty-hunit
+        text
+        vector
+      ];
+      description = "Haskell Frontend for StableHLO — type-safe ML inference on CPU and GPU";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "hhlo-demo";
+      broken = true;
+    }
+  ) { };
+
   hhp = callPackage (
     {
       mkDerivation,
@@ -333523,7 +336273,7 @@ self: {
     }
   ) { };
 
-  hie-bios_0_18_0 = callPackage (
+  hie-bios_0_19_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -333557,8 +336307,8 @@ self: {
     }:
     mkDerivation {
       pname = "hie-bios";
-      version = "0.18.0";
-      sha256 = "0bzav8ppm7mfy01d8vin67ik5jb6zld06716zy0i32c2fys6wack";
+      version = "0.19.0";
+      sha256 = "0k0sqwwsjbbcx7n08xxvxd8l1a3833fm7w268nivhhlyb7ahahgv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -335058,8 +337808,8 @@ self: {
     }:
     mkDerivation {
       pname = "himari";
-      version = "1.0.5.0";
-      sha256 = "1dg3sx3242yajxqcky6mmjjhhsc5qbyhdp3f06wgb9wphc1m13lg";
+      version = "1.1.0.0";
+      sha256 = "11mvj0sykjjw50l0ca5hlns93myjcxvvh07ndsa3biwi20sfzhml";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -338343,10 +341093,8 @@ self: {
     }:
     mkDerivation {
       pname = "hledger";
-      version = "1.51.2";
-      sha256 = "0bcb1dxlmi3h12wb7y4iqbi0p0wvzp23m0xkghiz5k5ydp3ixrv8";
-      revision = "1";
-      editedCabalFile = "082qb8n4lhgjab0829dgf7pchh1p8j8d0qq39sx8mcinyjwmm9gd";
+      version = "1.52";
+      sha256 = "10pj2y6a90awrvg982pmimx5j8sykghgpfx7xv1511jyj89g5ry1";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -338620,6 +341368,7 @@ self: {
       mkDerivation,
       base,
       containers,
+      directory,
       exceptions,
       filepath,
       foldl,
@@ -338635,8 +341384,8 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-flow";
-      version = "0.16.1";
-      sha256 = "0lf3ndx8p4f2mfq0d7hwansc2xvqazhn4ywr6q2z6ygki4jac99g";
+      version = "0.16.3";
+      sha256 = "08b52li78brqg6ny1m7vb1q1f0bg3jjkmp15z2j5gxs3ns01jx78";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -338663,12 +341412,14 @@ self: {
       testHaskellDepends = [
         base
         containers
+        directory
         foldl
         HUnit
         path
         path-io
         stm
         text
+        time
         turtle
       ];
       description = "An hledger workflow focusing on automated statement import and classification";
@@ -338708,8 +341459,8 @@ self: {
       pname = "hledger-iadd";
       version = "1.3.22";
       sha256 = "077v7jgqhmpkg8m68bg4qi0jxl4zkg17aqk5n58ni3s2h71lkwlv";
-      revision = "2";
-      editedCabalFile = "0jnczff457f3n4sgz16iiyfsdhr2dhxdvxpb3dls24n7452vf2mw";
+      revision = "5";
+      editedCabalFile = "1hg7gdv72zzh39ai33r0q0fissq2m2p61ivm3lv910h69xk7n83f";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -338789,8 +341540,8 @@ self: {
       pname = "hledger-interest";
       version = "1.6.7";
       sha256 = "1jirygghw82zi8z160j45qzfcj1l89vckqr7hrv78h3f3pim6np4";
-      revision = "4";
-      editedCabalFile = "1h3jx1jj4spgj34mhxydg24lwv95m39f8ndy222849s5nsh6lg0n";
+      revision = "5";
+      editedCabalFile = "0nvvya1mrvsi5cj86fq403129isc5pz2a0982y37dk8h8l0jwrgn";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -338900,8 +341651,8 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-lib";
-      version = "1.51.2";
-      sha256 = "03smy5xc817c797nkh5pjvrb2p41xdvxvwlkhzgkb9b7hrk9nic8";
+      version = "1.52";
+      sha256 = "0z7fi6qj009ab1p77cmhsy1pbxx6p9gqkbdgyiycwpkim6yv9awy";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -339167,8 +341918,10 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-ui";
-      version = "1.51.2";
-      sha256 = "0wmqqr83zfz82qdw2pvqd937233brxa67wvjgaag7fqjhlbpd9qk";
+      version = "1.52";
+      sha256 = "09nhri3w1bzryiwsjydxnklwz10xl1x8mbfq5614q92msqnfcfks";
+      revision = "3";
+      editedCabalFile = "0g2qybp51xl0zabrxzmlgh43m3lldr2mkc1lzlr9dcvcckbnscqm";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -339303,8 +342056,10 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-web";
-      version = "1.51.2";
-      sha256 = "12k2sl9ll8lfxl194hin8c58gbipxh4yyzycbwn0lbb231agyjfg";
+      version = "1.52";
+      sha256 = "0948qyzbkxpg9hvpbia0xdzlcch3a72f6qkjszr7a8mv0179mfir";
+      revision = "1";
+      editedCabalFile = "1gvhsrd69snahjayj4fvjs5ay6wn8gds0q937x24x4vynw06n9a8";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -344342,7 +347097,7 @@ self: {
     }
   ) { };
 
-  hoauth2_2_15_0 = callPackage (
+  hoauth2_2_15_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -344368,8 +347123,8 @@ self: {
     }:
     mkDerivation {
       pname = "hoauth2";
-      version = "2.15.0";
-      sha256 = "1l8jp07vp1sx02bkg6799pb4gqbbp0rych8kqccinjawv6w3zbag";
+      version = "2.15.1";
+      sha256 = "137l525fhii89h9wdkyjppi0yyblwdfq0ccixf6w5273j326jva5";
       libraryHaskellDepends = [
         aeson
         base
@@ -344421,6 +347176,7 @@ self: {
       jose-jwt,
       mustache,
       parsec,
+      pretty-simple,
       scotty,
       text,
       transformers,
@@ -344431,8 +347187,8 @@ self: {
     }:
     mkDerivation {
       pname = "hoauth2-demo";
-      version = "1.12.1";
-      sha256 = "11dc846zcs3pxfa8nk0xl5csfma2yli23gp2j1mx8apcv1iihnj5";
+      version = "1.12.2";
+      sha256 = "0yhc4ydvkwvzmqz3pgfj8iqacbmgsxfs9kxykffp8l3jinliadb6";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -344450,6 +347206,7 @@ self: {
         jose-jwt
         mustache
         parsec
+        pretty-simple
         scotty
         text
         transformers
@@ -344490,8 +347247,8 @@ self: {
     }:
     mkDerivation {
       pname = "hoauth2-providers";
-      version = "0.9.0";
-      sha256 = "0rkmns6kqf0gvzc607vzr9gcws5v0axngbyb4zxkbhf09491d1hs";
+      version = "0.9.1";
+      sha256 = "1c55p60537jxmm18hnnw3h9h1hb9qniifn7xcdvq1ds8is3gk5cf";
       libraryHaskellDepends = [
         aeson
         base
@@ -344517,7 +347274,7 @@ self: {
         uri-bytestring
       ];
       testToolDepends = [ hspec-discover ];
-      description = "OAuth2 Identity Providers";
+      description = "OAuth2 identity providers";
       license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -344541,8 +347298,8 @@ self: {
     }:
     mkDerivation {
       pname = "hoauth2-providers-tutorial";
-      version = "0.9.0";
-      sha256 = "06vvg3ri0bxhjj4v2b91z6320jlhckd3b976zpc06mc94mwn66bx";
+      version = "0.9.1";
+      sha256 = "0nc72w59glr8ahqphssr4nyq0vzzpn70pl39g5fp7phrnginkfvi";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -344559,7 +347316,7 @@ self: {
         uri-bytestring
       ];
       executableHaskellDepends = [ base ];
-      description = "tutorial for hoauth2-providers module";
+      description = "Tutorial for the hoauth2-providers module";
       license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hoauth2-providers-tutorial";
@@ -344584,8 +347341,8 @@ self: {
     }:
     mkDerivation {
       pname = "hoauth2-tutorial";
-      version = "0.9.0";
-      sha256 = "1kh3qc9pmpf13w6qxxrfw8ycz9xk5nzk9jy770l2jskmg0j3gym4";
+      version = "0.9.1";
+      sha256 = "0qi635f85vsa410y3xyk62p3psqhm079carbvkq75wnmy8ahjm2w";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -347977,7 +350734,6 @@ self: {
       enummapset,
       ghc-typelits-knownnat,
       ghc-typelits-natnormalise,
-      indexed-traversable,
       inspection-testing,
       mnist-idx,
       orthotope,
@@ -347992,8 +350748,8 @@ self: {
     }:
     mkDerivation {
       pname = "horde-ad";
-      version = "0.2.0.0";
-      sha256 = "0sjhczkfmjv8hcma7sm27b1qzfgzb8kxxh4vd8ybaa6pdn374yjr";
+      version = "0.3.0.0";
+      sha256 = "191nx7b2v5fr96g8syrd2nlxfmqzfwfp2k8z2ggykni2pxis52hv";
       libraryHaskellDepends = [
         assert-failure
         atomic-counter
@@ -348009,7 +350765,6 @@ self: {
         enummapset
         ghc-typelits-knownnat
         ghc-typelits-natnormalise
-        indexed-traversable
         inspection-testing
         mnist-idx
         orthotope
@@ -350236,6 +352991,7 @@ self: {
       description = "Generate reports from hpc data";
       license = lib.licenses.bsd3;
       mainProgram = "hpc-codecov";
+      maintainers = [ lib.maintainers.wolfgangwalther ];
     }
   ) { };
 
@@ -351157,6 +353913,8 @@ self: {
       pname = "hpqtypes-extras";
       version = "1.19.0.0";
       sha256 = "0i2rrmbhm35kpfr4w6w4hqkrb2plnyi4rz1l11gdy3mp9938rwgc";
+      revision = "1";
+      editedCabalFile = "10yaza7wwl1rcq44fhh2jbwil67081q069zlm8z2y7k5zl17kaba";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -355834,6 +358592,50 @@ self: {
     }
   ) { };
 
+  hs-wayland-scanner = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      directory,
+      filepath,
+      process,
+      text,
+      xml,
+    }:
+    mkDerivation {
+      pname = "hs-wayland-scanner";
+      version = "0.1.0";
+      sha256 = "0x25phb3x8w99sbi6rdrcpb2dl9df6prnx3003z535f9n8k6bsk7";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        process
+        text
+        xml
+      ];
+      executableHaskellDepends = [
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        process
+        text
+        xml
+      ];
+      description = "Haskell implementation of the Wayland Message Definition Language";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "hws";
+    }
+  ) { };
+
   hs-zstd = callPackage (
     {
       mkDerivation,
@@ -356769,7 +359571,7 @@ self: {
       bytestring,
       c2hs,
       deepseq,
-      memory,
+      ram,
       tasty,
       tasty-discover,
       tasty-hunit,
@@ -356777,21 +359579,19 @@ self: {
     }:
     mkDerivation {
       pname = "hsblst";
-      version = "0.0.4";
-      sha256 = "13dlz8am20np31bq31z596yam6w1rb0fdzlg3zwwvm6wyjh6b8sg";
-      revision = "1";
-      editedCabalFile = "1cwplg9k8pr6iy27gkc32ayxnwf63sbzdd660p1lm8dihvj9q1jy";
+      version = "0.0.5";
+      sha256 = "0xlb8q5dm0x0ih83v14jmawlaxyi3fgps4hv41fbakp6yg1x80q4";
       libraryHaskellDepends = [
         base
         deepseq
-        memory
+        ram
       ];
       libraryToolDepends = [ c2hs ];
       testHaskellDepends = [
         base
         base16-bytestring
         bytestring
-        memory
+        ram
         tasty
         tasty-hunit
         text
@@ -356799,6 +359599,8 @@ self: {
       testToolDepends = [ tasty-discover ];
       description = "Haskell bindings to BLST";
       license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -360488,6 +363290,47 @@ self: {
     }
   ) { };
 
+  hslua-annotations = callPackage (
+    {
+      mkDerivation,
+      base,
+      hslua-core,
+      hslua-marshalling,
+      hslua-module-path,
+      hslua-module-version,
+      hslua-packaging,
+      tasty,
+      tasty-golden,
+      text,
+    }:
+    mkDerivation {
+      pname = "hslua-annotations";
+      version = "0.1.0";
+      sha256 = "127jnd73f10xy24ri79q8v18v00lp98as5afdchzy1aykrxv95cw";
+      libraryHaskellDepends = [
+        base
+        hslua-core
+        hslua-packaging
+        text
+      ];
+      testHaskellDepends = [
+        base
+        hslua-core
+        hslua-marshalling
+        hslua-module-path
+        hslua-module-version
+        hslua-packaging
+        tasty
+        tasty-golden
+        text
+      ];
+      description = "A type annotation generator for HSLua";
+      license = "(MIT OR Apache-2.0)";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   hslua-classes = callPackage (
     {
       mkDerivation,
@@ -361608,6 +364451,50 @@ self: {
         inherit (pkgs) zlib;
       };
 
+  hsmin = callPackage (
+    {
+      mkDerivation,
+      base,
+      directory,
+      filepath,
+      ghc-lib-parser,
+      optparse-applicative,
+      process,
+      tasty,
+      tasty-hunit,
+      temporary,
+    }:
+    mkDerivation {
+      pname = "hsmin";
+      version = "0.1.0";
+      sha256 = "0niqzyl5kw7jpgiw8b6jxf64g9xrlsck4j5999aq04bll9ag1nk1";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        ghc-lib-parser
+      ];
+      executableHaskellDepends = [
+        base
+        optparse-applicative
+      ];
+      testHaskellDepends = [
+        base
+        directory
+        filepath
+        process
+        tasty
+        tasty-hunit
+        temporary
+      ];
+      description = "Haskell source code minifier for LLM token reduction";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "hsmin";
+      broken = true;
+    }
+  ) { };
+
   hsmisc = callPackage (
     {
       mkDerivation,
@@ -361695,6 +364582,30 @@ self: {
     }
   ) { };
 
+  hsmrc-marc8 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      hsmrc,
+      utf8-string,
+    }:
+    mkDerivation {
+      pname = "hsmrc-marc8";
+      version = "0.0.1";
+      sha256 = "11cikagla28ql84xcrmfqcl457c7fklq0an7026ygklkj8769rx1";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        hsmrc
+        utf8-string
+      ];
+      description = "MARC-8 charset decoding library for hsmrc";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   hsmtpclient = callPackage (
     {
       mkDerivation,
@@ -363584,6 +366495,37 @@ self: {
     }
   ) { };
 
+  hspec-quickcheck-classes = callPackage (
+    {
+      mkDerivation,
+      base,
+      hspec,
+      QuickCheck,
+      quickcheck-classes,
+    }:
+    mkDerivation {
+      pname = "hspec-quickcheck-classes";
+      version = "0.0.0.0";
+      sha256 = "0vrngysx45pg8j9frn6n7jvgnr820ijnbmjfr7c1xz1xajg8h8b2";
+      libraryHaskellDepends = [
+        base
+        hspec
+        QuickCheck
+        quickcheck-classes
+      ];
+      testHaskellDepends = [
+        base
+        hspec
+        QuickCheck
+        quickcheck-classes
+      ];
+      description = "Integration between Hspec and quickcheck-classes";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   hspec-server = callPackage (
     {
       mkDerivation,
@@ -370667,6 +373609,100 @@ self: {
     }
   ) { };
 
+  http-tower-hs = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      containers,
+      crypton-connection,
+      crypton-x509-store,
+      crypton-x509-system,
+      directory,
+      hs-opentelemetry-api,
+      hs-opentelemetry-exporter-in-memory,
+      hs-opentelemetry-exporter-otlp,
+      hs-opentelemetry-sdk,
+      hspec,
+      hspec-discover,
+      http-client,
+      http-client-tls,
+      http-conduit,
+      http-types,
+      process,
+      QuickCheck,
+      safe-exceptions,
+      stm,
+      testcontainers,
+      text,
+      time,
+      tls,
+      tower-hs,
+      unagi-chan,
+      unordered-containers,
+      uuid,
+      vector,
+    }:
+    mkDerivation {
+      pname = "http-tower-hs";
+      version = "0.3.1.0";
+      sha256 = "1pbi2nqrba0rirlm7nyd5fa79a1119hsnv1hd6kv1c2rarln8wvf";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        crypton-connection
+        crypton-x509-store
+        crypton-x509-system
+        hs-opentelemetry-api
+        http-client
+        http-client-tls
+        http-types
+        safe-exceptions
+        text
+        time
+        tls
+        tower-hs
+        unordered-containers
+        uuid
+      ];
+      testHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        containers
+        directory
+        hs-opentelemetry-api
+        hs-opentelemetry-exporter-in-memory
+        hs-opentelemetry-exporter-otlp
+        hs-opentelemetry-sdk
+        hspec
+        hspec-discover
+        http-client
+        http-client-tls
+        http-conduit
+        http-types
+        process
+        QuickCheck
+        stm
+        testcontainers
+        text
+        time
+        tower-hs
+        unagi-chan
+        uuid
+        vector
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Composable HTTP client middleware for Haskell, built on tower-hs";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   http-trace = callPackage (
     {
       mkDerivation,
@@ -371186,6 +374222,47 @@ self: {
   ) { };
 
   http2-tls = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      crypton-x509-store,
+      crypton-x509-validation,
+      http2,
+      network,
+      network-control,
+      network-run,
+      recv,
+      time-manager,
+      tls,
+      utf8-string,
+    }:
+    mkDerivation {
+      pname = "http2-tls";
+      version = "0.4.5";
+      sha256 = "0kc7g8ldgm40fsh73r881pxjb87x0m00xnjd0zsl0baaa85f7r4y";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        crypton-x509-store
+        crypton-x509-validation
+        http2
+        network
+        network-control
+        network-run
+        recv
+        time-manager
+        tls
+        utf8-string
+      ];
+      description = "Library for HTTP/2 over TLS";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
+  http2-tls_0_5_3 = callPackage (
     {
       mkDerivation,
       base,
@@ -371206,6 +374283,8 @@ self: {
       pname = "http2-tls";
       version = "0.5.3";
       sha256 = "1awhnls36h3i4qbcnjxbjipzq0qfcgzx7brb9nlnmi5p8fbz5458";
+      revision = "1";
+      editedCabalFile = "1iiisrk3sr97zzbzimfr4b3dcjmvpacfdj72y49hq4m47pc174hk";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -371226,7 +374305,6 @@ self: {
       description = "Library for HTTP/2 over TLS";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -371266,6 +374344,8 @@ self: {
       pname = "http3";
       version = "0.1.3";
       sha256 = "0agb0cp5lh74vv47ryv38pk46mpiqpv659i9qqmgvigaxkl379sh";
+      revision = "2";
+      editedCabalFile = "1dahwp4hmzb5khb3v1s5m2ivbm6pqbvv3m24ih44204vhcr4s0lc";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -374393,8 +377473,6 @@ self: {
       testToolDepends = [ doctest-discover ];
       description = "Extra hedgehog functionality";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -375238,6 +378316,45 @@ self: {
     }
   ) { };
 
+  hw-kafka-streamly = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      exceptions,
+      hw-kafka-client,
+      streamly-core,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+    }:
+    mkDerivation {
+      pname = "hw-kafka-streamly";
+      version = "0.1.0.0";
+      sha256 = "1m69dkp4ypk71dypjkzlznv899h9knsxw35mx02zbpv33azds248";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        exceptions
+        hw-kafka-client
+        streamly-core
+      ];
+      testHaskellDepends = [
+        base
+        exceptions
+        hw-kafka-client
+        streamly-core
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      description = "Streamly bindings for hw-kafka-client";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   hw-lazy = callPackage (
     {
       mkDerivation,
@@ -376241,8 +379358,6 @@ self: {
       ];
       description = "String parser";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -376795,8 +379910,8 @@ self: {
     }:
     mkDerivation {
       pname = "hwm";
-      version = "0.4.0";
-      sha256 = "1b8xbwp3qwzdnidc9511kn54fzyaf9smpw3r5jqyf1d42yxzl17z";
+      version = "0.5.0";
+      sha256 = "08ljwsia33wb7ba5ndfhhws28h91y7mqhdyay3qwhyy3jsfcmnw0";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -377992,11 +381107,11 @@ self: {
       filepath,
       hspec,
       hspec-discover,
-      HsYAML,
       HUnit,
       mtl,
       process,
       QuickCheck,
+      regex-tdfa,
       scientific,
       split,
       text,
@@ -378005,8 +381120,8 @@ self: {
     }:
     mkDerivation {
       pname = "hydra";
-      version = "0.13.0";
-      sha256 = "0pr8wd73jbk40d8ks6gryivj9n1i81qbrcq9vzzmz27402730ihw";
+      version = "0.14.0";
+      sha256 = "1ajds9p3z324w04nijfn4pjiilmdavyi2zi9ly51k1bgz0kpq3k2";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -378017,7 +381132,7 @@ self: {
         containers
         directory
         filepath
-        HsYAML
+        regex-tdfa
         scientific
         split
         text
@@ -378032,7 +381147,7 @@ self: {
         directory
         filepath
         hspec
-        HsYAML
+        regex-tdfa
         scientific
         split
         text
@@ -378048,11 +381163,11 @@ self: {
         filepath
         hspec
         hspec-discover
-        HsYAML
         HUnit
         mtl
         process
         QuickCheck
+        regex-tdfa
         scientific
         split
         text
@@ -379721,8 +382836,6 @@ self: {
       ];
       description = "Haskell interface to Zenity dialogs";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -382622,6 +385735,7 @@ self: {
       ];
       description = "Embed R quasiquotes and plots in IHaskell notebooks";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -382881,28 +385995,40 @@ self: {
       clientsession,
       conduit-extra,
       containers,
+      contravariant,
       cookie,
       countable-inflections,
       data-default,
       deepseq,
       directory,
       fast-logger,
+      filepath,
       ghc-prim,
+      hashable,
       haskell-src-exts,
       haskell-src-meta,
+      hasql,
+      hasql-dynamic-statements,
+      hasql-implicits,
+      hasql-mapping,
+      hasql-pool,
+      hasql-postgresql-types,
+      hasql-transaction,
       hspec,
       http-client,
       http-client-tls,
       http-media,
       http-types,
+      ihp-context,
       ihp-hsx,
-      ihp-postgresql-simple-extra,
+      ihp-imagemagick,
+      ihp-log,
+      ihp-modal,
+      ihp-pagehead,
+      ihp-pglistener,
       inflections,
       interpolate,
-      ip,
       lens,
-      mime-mail,
-      mime-mail-ses,
       mime-types,
       minio-hs,
       mono-traversable,
@@ -382912,6 +386038,8 @@ self: {
       network-uri,
       parser-combinators,
       postgresql-simple,
+      postgresql-simple-postgresql-types,
+      postgresql-types,
       process,
       pwstore-fast,
       random,
@@ -382921,9 +386049,11 @@ self: {
       resourcet,
       safe-exceptions,
       scientific,
-      smtp-mail,
+      slugger,
       split,
+      stm,
       string-conversions,
+      tasty-bench,
       template-haskell,
       temporary,
       text,
@@ -382940,10 +386070,13 @@ self: {
       vector,
       wai,
       wai-app-static,
+      wai-asset-path,
       wai-cors,
       wai-extra,
-      wai-session,
-      wai-session-clientsession,
+      wai-flash-messages,
+      wai-request-params,
+      wai-session-clientsession-deferred,
+      wai-session-maybe,
       wai-util,
       wai-websockets,
       warp,
@@ -382954,8 +386087,8 @@ self: {
     }:
     mkDerivation {
       pname = "ihp";
-      version = "1.4.1";
-      sha256 = "0d5hj8c8qvjqmdjy7dxibhq41qzbfqmrcgmfw84s6gfss9jbanlq";
+      version = "1.5.0";
+      sha256 = "1cx0pxw1mgky4fv2j059sijd01rgl681jbrgl9j07kfn0pw99bvb";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -382974,28 +386107,40 @@ self: {
         clientsession
         conduit-extra
         containers
+        contravariant
         cookie
         countable-inflections
         data-default
         deepseq
         directory
         fast-logger
+        filepath
         ghc-prim
+        hashable
         haskell-src-exts
         haskell-src-meta
+        hasql
+        hasql-dynamic-statements
+        hasql-implicits
+        hasql-mapping
+        hasql-pool
+        hasql-postgresql-types
+        hasql-transaction
         hspec
         http-client
         http-client-tls
         http-media
         http-types
+        ihp-context
         ihp-hsx
-        ihp-postgresql-simple-extra
+        ihp-imagemagick
+        ihp-log
+        ihp-modal
+        ihp-pagehead
+        ihp-pglistener
         inflections
         interpolate
-        ip
         lens
-        mime-mail
-        mime-mail-ses
         mime-types
         minio-hs
         mono-traversable
@@ -383005,6 +386150,8 @@ self: {
         network-uri
         parser-combinators
         postgresql-simple
+        postgresql-simple-postgresql-types
+        postgresql-types
         process
         pwstore-fast
         random
@@ -383014,8 +386161,9 @@ self: {
         resourcet
         safe-exceptions
         scientific
-        smtp-mail
+        slugger
         split
+        stm
         string-conversions
         template-haskell
         temporary
@@ -383033,10 +386181,226 @@ self: {
         vector
         wai
         wai-app-static
+        wai-asset-path
         wai-cors
         wai-extra
-        wai-session
-        wai-session-clientsession
+        wai-flash-messages
+        wai-request-params
+        wai-session-clientsession-deferred
+        wai-session-maybe
+        wai-util
+        wai-websockets
+        warp
+        warp-systemd
+        websockets
+        with-utf8
+        wreq
+      ];
+      testHaskellDepends = [
+        aeson
+        async
+        attoparsec
+        base
+        basic-prelude
+        binary
+        blaze-html
+        blaze-markup
+        bytestring
+        case-insensitive
+        cereal
+        cereal-text
+        classy-prelude
+        clientsession
+        conduit-extra
+        containers
+        contravariant
+        cookie
+        countable-inflections
+        data-default
+        deepseq
+        directory
+        fast-logger
+        filepath
+        ghc-prim
+        hashable
+        haskell-src-exts
+        haskell-src-meta
+        hasql
+        hasql-dynamic-statements
+        hasql-implicits
+        hasql-mapping
+        hasql-pool
+        hasql-postgresql-types
+        hasql-transaction
+        hspec
+        http-client
+        http-client-tls
+        http-media
+        http-types
+        ihp-context
+        ihp-hsx
+        ihp-imagemagick
+        ihp-log
+        ihp-modal
+        ihp-pagehead
+        ihp-pglistener
+        inflections
+        interpolate
+        lens
+        mime-types
+        minio-hs
+        mono-traversable
+        mtl
+        neat-interpolation
+        network
+        network-uri
+        parser-combinators
+        postgresql-simple
+        postgresql-simple-postgresql-types
+        postgresql-types
+        process
+        pwstore-fast
+        random
+        random-strings
+        regex-tdfa
+        resource-pool
+        resourcet
+        safe-exceptions
+        scientific
+        slugger
+        split
+        stm
+        string-conversions
+        template-haskell
+        temporary
+        text
+        time
+        transformers
+        typerep-map
+        unagi-chan
+        unix
+        unliftio
+        unordered-containers
+        uri-encode
+        uuid
+        vault
+        vector
+        wai
+        wai-app-static
+        wai-asset-path
+        wai-cors
+        wai-extra
+        wai-flash-messages
+        wai-request-params
+        wai-session-clientsession-deferred
+        wai-session-maybe
+        wai-util
+        wai-websockets
+        warp
+        warp-systemd
+        websockets
+        with-utf8
+        wreq
+      ];
+      benchmarkHaskellDepends = [
+        aeson
+        async
+        attoparsec
+        base
+        basic-prelude
+        binary
+        blaze-html
+        blaze-markup
+        bytestring
+        case-insensitive
+        cereal
+        cereal-text
+        classy-prelude
+        clientsession
+        conduit-extra
+        containers
+        contravariant
+        cookie
+        countable-inflections
+        data-default
+        deepseq
+        directory
+        fast-logger
+        filepath
+        ghc-prim
+        hashable
+        haskell-src-exts
+        haskell-src-meta
+        hasql
+        hasql-dynamic-statements
+        hasql-implicits
+        hasql-mapping
+        hasql-pool
+        hasql-postgresql-types
+        hasql-transaction
+        hspec
+        http-client
+        http-client-tls
+        http-media
+        http-types
+        ihp-context
+        ihp-hsx
+        ihp-imagemagick
+        ihp-log
+        ihp-modal
+        ihp-pagehead
+        ihp-pglistener
+        inflections
+        interpolate
+        lens
+        mime-types
+        minio-hs
+        mono-traversable
+        mtl
+        neat-interpolation
+        network
+        network-uri
+        parser-combinators
+        postgresql-simple
+        postgresql-simple-postgresql-types
+        postgresql-types
+        process
+        pwstore-fast
+        random
+        random-strings
+        regex-tdfa
+        resource-pool
+        resourcet
+        safe-exceptions
+        scientific
+        slugger
+        split
+        stm
+        string-conversions
+        tasty-bench
+        template-haskell
+        temporary
+        text
+        time
+        transformers
+        typerep-map
+        unagi-chan
+        unix
+        unliftio
+        unordered-containers
+        uri-encode
+        uuid
+        vault
+        vector
+        wai
+        wai-app-static
+        wai-asset-path
+        wai-cors
+        wai-extra
+        wai-flash-messages
+        wai-request-params
+        wai-session-clientsession-deferred
+        wai-session-maybe
         wai-util
         wai-websockets
         warp
@@ -383047,10 +386411,314 @@ self: {
       ];
       description = "Haskell Web Framework";
       license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
 
+  ihp-context = callPackage (
+    {
+      mkDerivation,
+      base,
+      typerep-map,
+    }:
+    mkDerivation {
+      pname = "ihp-context";
+      version = "1.0.0";
+      sha256 = "0jz6vfzahi3imxpnx5wkizq1ihv7xahrg45gcvc9szli6i50i7lj";
+      libraryHaskellDepends = [
+        base
+        typerep-map
+      ];
+      description = "Minimal typed context container for IHP";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  ihp-datasync = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      attoparsec,
+      base,
+      bytestring,
+      case-insensitive,
+      classy-prelude,
+      containers,
+      deepseq,
+      haskell-src-exts,
+      haskell-src-meta,
+      hasql,
+      hasql-dynamic-statements,
+      hasql-mapping,
+      hasql-pool,
+      hasql-postgresql-types,
+      hasql-transaction,
+      hspec,
+      http-media,
+      http-types,
+      ihp,
+      ihp-hsx,
+      ihp-log,
+      interpolate,
+      mono-traversable,
+      mtl,
+      postgresql-types,
+      safe-exceptions,
+      scientific,
+      stm,
+      template-haskell,
+      text,
+      time,
+      transformers,
+      typerep-map,
+      unliftio,
+      unordered-containers,
+      uuid,
+      vault,
+      vector,
+      wai,
+      wai-websockets,
+      warp,
+      websockets,
+    }:
+    mkDerivation {
+      pname = "ihp-datasync";
+      version = "1.5.0";
+      sha256 = "1d6fi1g2qzdisyjgikzd2swfn7gcncmn92mvfmh83khwkgbq7jk1";
+      libraryHaskellDepends = [
+        aeson
+        async
+        attoparsec
+        base
+        bytestring
+        case-insensitive
+        classy-prelude
+        containers
+        deepseq
+        haskell-src-exts
+        haskell-src-meta
+        hasql
+        hasql-dynamic-statements
+        hasql-mapping
+        hasql-pool
+        hasql-postgresql-types
+        hasql-transaction
+        http-media
+        http-types
+        ihp
+        ihp-hsx
+        ihp-log
+        interpolate
+        mono-traversable
+        mtl
+        postgresql-types
+        safe-exceptions
+        scientific
+        stm
+        template-haskell
+        text
+        time
+        transformers
+        typerep-map
+        unliftio
+        unordered-containers
+        uuid
+        vault
+        vector
+        wai
+        wai-websockets
+        warp
+        websockets
+      ];
+      testHaskellDepends = [
+        aeson
+        async
+        attoparsec
+        base
+        bytestring
+        case-insensitive
+        classy-prelude
+        containers
+        deepseq
+        haskell-src-exts
+        haskell-src-meta
+        hasql
+        hasql-dynamic-statements
+        hasql-mapping
+        hasql-pool
+        hasql-postgresql-types
+        hasql-transaction
+        hspec
+        http-media
+        http-types
+        ihp
+        ihp-hsx
+        ihp-log
+        interpolate
+        mono-traversable
+        mtl
+        postgresql-types
+        safe-exceptions
+        scientific
+        stm
+        template-haskell
+        text
+        time
+        transformers
+        typerep-map
+        unliftio
+        unordered-containers
+        uuid
+        vault
+        vector
+        wai
+        wai-websockets
+        warp
+        websockets
+      ];
+      description = "IHP DataSync Framework";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ihp-datasync-typescript = callPackage (
+    {
+      mkDerivation,
+      hspec,
+      ihp,
+      ihp-postgres-parser,
+      megaparsec,
+      neat-interpolation,
+      text,
+      with-utf8,
+    }:
+    mkDerivation {
+      pname = "ihp-datasync-typescript";
+      version = "1.5.0";
+      sha256 = "0y75qrjx8lsi8cs1n1k0x91sziq9ymnwv46awlmsgmg0fjdx787g";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        ihp
+        ihp-postgres-parser
+        neat-interpolation
+      ];
+      executableHaskellDepends = [
+        ihp
+        ihp-postgres-parser
+        neat-interpolation
+        text
+        with-utf8
+      ];
+      testHaskellDepends = [
+        hspec
+        ihp
+        ihp-postgres-parser
+        megaparsec
+        neat-interpolation
+      ];
+      description = "TypeScript code generation for IHP DataSync";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "generate-datasync-types";
+    }
+  ) { };
+
+  ihp-graphql = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      base,
+      bytestring,
+      countable-inflections,
+      hspec,
+      ihp,
+      ihp-postgres-parser,
+      megaparsec,
+      postgresql-simple,
+      scientific,
+      text,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "ihp-graphql";
+      version = "1.5.0";
+      sha256 = "1s1q8rxsjs8prckvd1dzc3fqg0kfa442cr4km16r0kc3rg2sdpnf";
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        countable-inflections
+        ihp
+        ihp-postgres-parser
+        postgresql-simple
+        scientific
+        text
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        bytestring
+        countable-inflections
+        hspec
+        ihp
+        ihp-postgres-parser
+        megaparsec
+        postgresql-simple
+        scientific
+        text
+        unordered-containers
+      ];
+      description = "GraphQL support for IHP";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ihp-hspec = callPackage (
+    {
+      mkDerivation,
+      base,
+      hasql,
+      ihp,
+      ihp-ide,
+      ihp-log,
+      process,
+      text,
+      uuid,
+      vault,
+      wai,
+      wai-request-params,
+    }:
+    mkDerivation {
+      pname = "ihp-hspec";
+      version = "1.5.0";
+      sha256 = "1z4d121bn2d476lgd66li706i1jsmz28zvahzndixid54bvrd529";
+      libraryHaskellDepends = [
+        base
+        hasql
+        ihp
+        ihp-ide
+        ihp-log
+        process
+        text
+        uuid
+        vault
+        wai
+        wai-request-params
+      ];
+      description = "Test helpers for IHP apps";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   ihp-hsx = callPackage (
     {
       mkDerivation,
@@ -383131,10 +386799,21 @@ self: {
       cryptohash,
       data-default,
       directory,
+      filepath,
       fsnotify,
+      hasql,
+      hasql-dynamic-statements,
+      hasql-implicits,
+      hasql-pool,
+      hspec,
       http-types,
       ihp,
       ihp-hsx,
+      ihp-log,
+      ihp-migrate,
+      ihp-modal,
+      ihp-postgres-parser,
+      ihp-schema-compiler,
       inflections,
       interpolate,
       megaparsec,
@@ -383142,8 +386821,6 @@ self: {
       neat-interpolation,
       network,
       network-uri,
-      parser-combinators,
-      postgresql-simple,
       process,
       safe-exceptions,
       split,
@@ -383159,9 +386836,11 @@ self: {
       vault,
       wai,
       wai-app-static,
+      wai-asset-path,
       wai-extra,
-      wai-session,
-      wai-session-clientsession,
+      wai-request-params,
+      wai-session-clientsession-deferred,
+      wai-session-maybe,
       wai-util,
       wai-websockets,
       warp,
@@ -383171,8 +386850,8 @@ self: {
     }:
     mkDerivation {
       pname = "ihp-ide";
-      version = "1.4.0";
-      sha256 = "0mglqbbmk7y94avmb2z4mqhrbcwrhabzicyjd0cgd49v9mz32p5n";
+      version = "1.5.0";
+      sha256 = "1r76ww4fd46lhjw5rnnjnbk22wgygy9vc2052dgvg6jl3shiivwl";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -383194,10 +386873,20 @@ self: {
         cryptohash
         data-default
         directory
+        filepath
         fsnotify
+        hasql
+        hasql-dynamic-statements
+        hasql-implicits
+        hasql-pool
         http-types
         ihp
         ihp-hsx
+        ihp-log
+        ihp-migrate
+        ihp-modal
+        ihp-postgres-parser
+        ihp-schema-compiler
         inflections
         interpolate
         megaparsec
@@ -383205,8 +386894,6 @@ self: {
         neat-interpolation
         network
         network-uri
-        parser-combinators
-        postgresql-simple
         process
         safe-exceptions
         split
@@ -383223,8 +386910,9 @@ self: {
         wai
         wai-app-static
         wai-extra
-        wai-session
-        wai-session-clientsession
+        wai-request-params
+        wai-session-clientsession-deferred
+        wai-session-maybe
         wai-util
         wai-websockets
         warp
@@ -383251,10 +386939,19 @@ self: {
         cryptohash
         data-default
         directory
+        filepath
         fsnotify
+        hasql
+        hasql-dynamic-statements
+        hasql-implicits
+        hasql-pool
         http-types
         ihp
         ihp-hsx
+        ihp-log
+        ihp-migrate
+        ihp-postgres-parser
+        ihp-schema-compiler
         inflections
         interpolate
         megaparsec
@@ -383262,8 +386959,6 @@ self: {
         neat-interpolation
         network
         network-uri
-        parser-combinators
-        postgresql-simple
         process
         safe-exceptions
         split
@@ -383280,8 +386975,75 @@ self: {
         wai
         wai-app-static
         wai-extra
-        wai-session
-        wai-session-clientsession
+        wai-session-clientsession-deferred
+        wai-session-maybe
+        wai-util
+        wai-websockets
+        warp
+        websockets
+        with-utf8
+        wreq
+      ];
+      testHaskellDepends = [
+        aeson
+        async
+        attoparsec
+        auto-update
+        base
+        base16-bytestring
+        basic-prelude
+        blaze-html
+        blaze-markup
+        bytestring
+        classy-prelude
+        clientsession
+        containers
+        countable-inflections
+        cryptohash
+        data-default
+        directory
+        filepath
+        fsnotify
+        hasql
+        hasql-dynamic-statements
+        hasql-implicits
+        hasql-pool
+        hspec
+        http-types
+        ihp
+        ihp-hsx
+        ihp-log
+        ihp-migrate
+        ihp-modal
+        ihp-postgres-parser
+        ihp-schema-compiler
+        inflections
+        interpolate
+        megaparsec
+        mono-traversable
+        neat-interpolation
+        network
+        network-uri
+        process
+        safe-exceptions
+        split
+        string-conversions
+        text
+        time
+        transformers
+        unagi-chan
+        unix
+        unliftio
+        uri-encode
+        uuid
+        vault
+        wai
+        wai-app-static
+        wai-asset-path
+        wai-extra
+        wai-request-params
+        wai-session-clientsession-deferred
+        wai-session-maybe
         wai-util
         wai-websockets
         warp
@@ -383291,24 +387053,201 @@ self: {
       ];
       description = "Dev tools for IHP";
       license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
 
+  ihp-imagemagick = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      process,
+      temporary,
+      text,
+      wai-extra,
+    }:
+    mkDerivation {
+      pname = "ihp-imagemagick";
+      version = "1.0.0";
+      sha256 = "0sqyq2jasm56slpvndphayi0xh0x0zjkgc025ppmh7280rfsy7rr";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        process
+        temporary
+        text
+        wai-extra
+      ];
+      description = "ImageMagick preprocessing for IHP file uploads";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  ihp-job-dashboard = callPackage (
+    {
+      mkDerivation,
+      base,
+      blaze-html,
+      blaze-markup,
+      hasql,
+      hasql-dynamic-statements,
+      hasql-implicits,
+      hasql-pool,
+      http-types,
+      ihp,
+      ihp-hsx,
+      mtl,
+      text,
+      wai,
+      wai-request-params,
+    }:
+    mkDerivation {
+      pname = "ihp-job-dashboard";
+      version = "1.5.0";
+      sha256 = "0izps7i1q1aifaqhzidr3sakzmiwin137naqsi2mblkw6d03jcn4";
+      libraryHaskellDepends = [
+        base
+        blaze-html
+        blaze-markup
+        hasql
+        hasql-dynamic-statements
+        hasql-implicits
+        hasql-pool
+        http-types
+        ihp
+        ihp-hsx
+        mtl
+        text
+        wai
+        wai-request-params
+      ];
+      description = "Dashboard for IHP job runners";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ihp-log = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      data-default,
+      fast-logger,
+      filepath,
+      text,
+      wai,
+      wai-extra,
+    }:
+    mkDerivation {
+      pname = "ihp-log";
+      version = "1.0.0";
+      sha256 = "16s17nyxkpdj07sycyzhv6zk84kh4gwn9kb1hqd0wnfjlldb6zcr";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        data-default
+        fast-logger
+        filepath
+        text
+        wai
+        wai-extra
+      ];
+      description = "Lightweight logging for IHP applications";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  ihp-mail = callPackage (
+    {
+      mkDerivation,
+      base,
+      blaze-html,
+      bytestring,
+      http-client,
+      http-client-tls,
+      ihp,
+      mime-mail,
+      mime-mail-ses,
+      network,
+      smtp-mail,
+      string-conversions,
+      text,
+      typerep-map,
+    }:
+    mkDerivation {
+      pname = "ihp-mail";
+      version = "1.5.0";
+      sha256 = "146vk72lpafh4irnzwpw3asz3vnk6gkvjm8d3jb84i6xpxi4yq6r";
+      libraryHaskellDepends = [
+        base
+        blaze-html
+        bytestring
+        http-client
+        http-client-tls
+        ihp
+        mime-mail
+        mime-mail-ses
+        network
+        smtp-mail
+        string-conversions
+        text
+        typerep-map
+      ];
+      description = "Email support for IHP";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   ihp-migrate = callPackage (
     {
       mkDerivation,
-      ihp,
+      base,
+      directory,
+      filepath,
+      hasql,
+      hasql-transaction,
+      hspec,
+      string-conversions,
+      temporary,
+      text,
       with-utf8,
     }:
     mkDerivation {
       pname = "ihp-migrate";
-      version = "1.4.0";
-      sha256 = "1l4vapnqnnayfdrbrspsvjjyi2wd7jy3a081dpzyi4pwl4jdwgx8";
-      isLibrary = false;
+      version = "1.5.0";
+      sha256 = "1r2jraa85ghvswng06pza3ygnvszq360vbhanqx2707ns2abnccr";
+      isLibrary = true;
       isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        directory
+        filepath
+        hasql
+        hasql-transaction
+        string-conversions
+        text
+        with-utf8
+      ];
       executableHaskellDepends = [
-        ihp
+        base
+        directory
+        filepath
+        hasql
+        hasql-transaction
+        string-conversions
+        text
+        with-utf8
+      ];
+      testHaskellDepends = [
+        base
+        directory
+        filepath
+        hspec
+        temporary
         with-utf8
       ];
       description = "Provides the IHP migrate binary";
@@ -383318,6 +387257,35 @@ self: {
     }
   ) { };
 
+  ihp-modal = callPackage (
+    {
+      mkDerivation,
+      base,
+      blaze-html,
+      ihp-context,
+      ihp-hsx,
+      text,
+      vault,
+      wai,
+    }:
+    mkDerivation {
+      pname = "ihp-modal";
+      version = "1.0.0";
+      sha256 = "04al79xq7ydfly9xp0ziyvv5f3fm6v7zn6v0l960idgdw2y1q04a";
+      libraryHaskellDepends = [
+        base
+        blaze-html
+        ihp-context
+        ihp-hsx
+        text
+        vault
+        wai
+      ];
+      description = "Modal dialog support for IHP applications";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   ihp-openai = callPackage (
     {
       mkDerivation,
@@ -383337,8 +387305,8 @@ self: {
     }:
     mkDerivation {
       pname = "ihp-openai";
-      version = "1.4.0";
-      sha256 = "0npcnqdfmqv979gfn7iyl5p76hkggblc9n82z056wppj0i9q0i86";
+      version = "1.5.0";
+      sha256 = "10afra79rsfigb15qwn9wbvdsnw05whvvk8nj3pdb079vpsdkh47";
       libraryHaskellDepends = [
         aeson
         attoparsec-aeson
@@ -383365,6 +387333,141 @@ self: {
     }
   ) { };
 
+  ihp-pagehead = callPackage (
+    {
+      mkDerivation,
+      base,
+      blaze-html,
+      ihp-context,
+      ihp-hsx,
+      text,
+      vault,
+      wai,
+    }:
+    mkDerivation {
+      pname = "ihp-pagehead";
+      version = "1.0.0";
+      sha256 = "16mk412prgr95fdbiz5zh3g8vvqwmjr1i1rdyhs8ach1q999gdlm";
+      libraryHaskellDepends = [
+        base
+        blaze-html
+        ihp-context
+        ihp-hsx
+        text
+        vault
+        wai
+      ];
+      description = "Page title and meta tags for IHP";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  ihp-pglistener = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      containers,
+      hashable,
+      hasql,
+      hasql-notifications,
+      hspec,
+      ihp-log,
+      safe-exceptions,
+      string-conversions,
+      text,
+      unagi-chan,
+      unordered-containers,
+      uuid,
+    }:
+    mkDerivation {
+      pname = "ihp-pglistener";
+      version = "1.0.0";
+      sha256 = "1nmkhm08wyycw4rcgnywqbn5ldj7h36lc39jkqzscxvb9sb030sj";
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        containers
+        hashable
+        hasql
+        hasql-notifications
+        ihp-log
+        safe-exceptions
+        string-conversions
+        text
+        unagi-chan
+        unordered-containers
+        uuid
+      ];
+      testHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        containers
+        hashable
+        hasql
+        hasql-notifications
+        hspec
+        ihp-log
+        safe-exceptions
+        string-conversions
+        text
+        unagi-chan
+        unordered-containers
+        uuid
+      ];
+      description = "PostgreSQL LISTEN/NOTIFY channel manager for IHP";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
+  ihp-postgres-parser = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      filepath,
+      hspec,
+      megaparsec,
+      parser-combinators,
+      string-conversions,
+      text,
+    }:
+    mkDerivation {
+      pname = "ihp-postgres-parser";
+      version = "1.0.0";
+      sha256 = "0w4077h4wxm6qnjghcv6r0rfr8vnl4ki9m7mghd4bi8xah156lpp";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        filepath
+        megaparsec
+        parser-combinators
+        string-conversions
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        filepath
+        hspec
+        megaparsec
+        parser-combinators
+        string-conversions
+        text
+      ];
+      description = "PostgreSQL DDL parser and compiler";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   ihp-postgresql-simple-extra = callPackage (
     {
       mkDerivation,
@@ -383418,6 +387521,282 @@ self: {
     }
   ) { };
 
+  ihp-schema-compiler = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      classy-prelude,
+      countable-inflections,
+      directory,
+      filepath,
+      ihp,
+      ihp-postgres-parser,
+      interpolate,
+      neat-interpolation,
+      split,
+      string-conversions,
+      text,
+      with-utf8,
+    }:
+    mkDerivation {
+      pname = "ihp-schema-compiler";
+      version = "1.5.0";
+      sha256 = "1lxfm0fgmg69hjmw3vdv2id9idyqjj1py60p7rlkafwwv0barcp6";
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        classy-prelude
+        countable-inflections
+        directory
+        filepath
+        ihp
+        ihp-postgres-parser
+        interpolate
+        neat-interpolation
+        split
+        string-conversions
+        text
+        with-utf8
+      ];
+      executableHaskellDepends = [
+        base
+        bytestring
+        classy-prelude
+        countable-inflections
+        directory
+        filepath
+        ihp
+        ihp-postgres-parser
+        interpolate
+        neat-interpolation
+        split
+        string-conversions
+        text
+        with-utf8
+      ];
+      description = "Lightweight schema compiler for IHP";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "build-generated-code";
+    }
+  ) { };
+
+  ihp-sitemap = callPackage (
+    {
+      mkDerivation,
+      base,
+      blaze-html,
+      blaze-markup,
+      hspec,
+      http-types,
+      ihp,
+      ihp-hsx,
+      ihp-log,
+      text,
+      wai,
+      wai-extra,
+    }:
+    mkDerivation {
+      pname = "ihp-sitemap";
+      version = "1.5.0";
+      sha256 = "1smkd53n6dkh9da4ns8ay2jjbnmi0vfxbc63sr9vc0wv3gwd5rzc";
+      libraryHaskellDepends = [
+        base
+        blaze-html
+        blaze-markup
+        ihp
+        text
+        wai
+      ];
+      testHaskellDepends = [
+        base
+        hspec
+        http-types
+        ihp
+        ihp-hsx
+        ihp-log
+        wai
+        wai-extra
+      ];
+      description = "SEO";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ihp-ssc = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      base,
+      basic-prelude,
+      blaze-html,
+      bytestring,
+      ihp,
+      ihp-hsx,
+      ihp-log,
+      megaparsec,
+      string-conversions,
+      text,
+      wai,
+      wai-request-params,
+      websockets,
+    }:
+    mkDerivation {
+      pname = "ihp-ssc";
+      version = "1.5.0";
+      sha256 = "12haf557kg6r407rr10h841yhc6cfm29ipjgg6qh7sd9wn78s40x";
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        basic-prelude
+        blaze-html
+        bytestring
+        ihp
+        ihp-hsx
+        ihp-log
+        megaparsec
+        string-conversions
+        text
+        wai
+        wai-request-params
+        websockets
+      ];
+      description = "Server Side Components for IHP";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ihp-typed-sql = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      directory,
+      filepath,
+      haskell-src-meta,
+      hasql,
+      hasql-dynamic-statements,
+      hasql-mapping,
+      hasql-pool,
+      hspec,
+      ihp,
+      ihp-log,
+      postgresql-libpq,
+      postgresql-syntax,
+      postgresql-types,
+      process,
+      scientific,
+      string-conversions,
+      template-haskell,
+      temporary,
+      text,
+    }:
+    mkDerivation {
+      pname = "ihp-typed-sql";
+      version = "1.5.0";
+      sha256 = "0l431b3908mm81v9c376xwf0ak7zbbb47rk93k64n5nixql0l639";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        haskell-src-meta
+        hasql
+        hasql-dynamic-statements
+        hasql-mapping
+        hasql-pool
+        ihp
+        postgresql-libpq
+        postgresql-syntax
+        postgresql-types
+        scientific
+        string-conversions
+        template-haskell
+        text
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        directory
+        filepath
+        hspec
+        ihp
+        ihp-log
+        process
+        string-conversions
+        temporary
+        text
+      ];
+      description = "Compile-time typed SQL quasiquoter for IHP";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ihp-welcome = callPackage (
+    {
+      mkDerivation,
+      base,
+      blaze-html,
+      blaze-markup,
+      ihp,
+      ihp-hsx,
+      text,
+    }:
+    mkDerivation {
+      pname = "ihp-welcome";
+      version = "1.5.0";
+      sha256 = "1rnplvsm13y3y5bsm5lpcx4ifmr9jgzz7rhg69lah3nhxy5sym19";
+      libraryHaskellDepends = [
+        base
+        blaze-html
+        blaze-markup
+        ihp
+        ihp-hsx
+        text
+      ];
+      description = "IHP Welcome Controller";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ihp-zip = callPackage (
+    {
+      mkDerivation,
+      base,
+      http-types,
+      ihp,
+      wai,
+      zip-archive,
+    }:
+    mkDerivation {
+      pname = "ihp-zip";
+      version = "0.1.1";
+      sha256 = "1hkx1rf4h297bjjwwf6ckxg6jp7bvr2z92vy4a67n33k8l7mhi18";
+      libraryHaskellDepends = [
+        base
+        http-types
+        ihp
+        wai
+        zip-archive
+      ];
+      description = "Support for making ZIP archives with IHP";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   ihs = callPackage (
     {
       mkDerivation,
@@ -384736,6 +389115,7 @@ self: {
       description = "Deep embedding of imperative programs with code generation";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -384770,6 +389150,7 @@ self: {
       description = "Deep embedding of VHDL programs with code generation";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -386500,8 +390881,8 @@ self: {
       pname = "indexed-traversable";
       version = "0.1.4";
       sha256 = "08ivs1shxnvw5fzklvg7yh4xy0nnh3gsglm059fa5m9svyphkgjq";
-      revision = "1";
-      editedCabalFile = "0zbys0254a7bsq4x297s1lagcbw7va5bkjikh8j7rhd0cm5fina2";
+      revision = "2";
+      editedCabalFile = "1khvjcdhl9i26r7nmzsrg3vacmrp778m081iswwr0j4m4yww1fla";
       libraryHaskellDepends = [
         array
         base
@@ -386525,16 +390906,13 @@ self: {
       tagged,
       tasty,
       tasty-quickcheck,
-      transformers,
       unordered-containers,
       vector,
     }:
     mkDerivation {
       pname = "indexed-traversable-instances";
-      version = "0.1.2";
-      sha256 = "1hf75x729c3348yvgxk0pjab2mmwi0xxcw3h2yb6c78lp8pvcarw";
-      revision = "1";
-      editedCabalFile = "12fxhsx9ay2yqk5967kd389lqdpfkx2g3svgkrgw3qha0z40zpv8";
+      version = "0.1.2.1";
+      sha256 = "1v0z86lwri4r2hjvwdgjgcpwg2gllis37q5f0cp3qilm7br437g6";
       libraryHaskellDepends = [
         base
         indexed-traversable
@@ -386552,7 +390930,6 @@ self: {
         quickcheck-instances
         tasty
         tasty-quickcheck
-        transformers
         unordered-containers
         vector
       ];
@@ -387557,6 +391934,7 @@ self: {
       mkDerivation,
       base,
       containers,
+      criterion,
       exceptions,
       hspec,
       hspec-discover,
@@ -387565,11 +391943,12 @@ self: {
       QuickCheck,
       text,
       unordered-containers,
+      weigh,
     }:
     mkDerivation {
       pname = "inflections";
-      version = "0.4.0.7";
-      sha256 = "0gafsyv4k45ff61jym29vp02zyirml8j9pkp507ssr0zz5jasgjr";
+      version = "0.4.1.0";
+      sha256 = "1wv10w7sjs7vixzpmm4jhsc4vnggd1m5rg4n0npv0v9497m702az";
       libraryHaskellDepends = [
         base
         exceptions
@@ -387587,6 +391966,12 @@ self: {
         text
       ];
       testToolDepends = [ hspec-discover ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        text
+        weigh
+      ];
       description = "Inflections library for Haskell";
       license = lib.licenses.mit;
       maintainers = [ lib.maintainers.mpscholten ];
@@ -388318,6 +392703,7 @@ self: {
       ];
       description = "Win32 API Context for the inline-c library";
       license = lib.licenses.mit;
+      platforms = lib.platforms.windows;
     }
   ) { };
 
@@ -388548,6 +392934,8 @@ self: {
       ];
       description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { inherit (pkgs) R; };
 
@@ -392072,8 +396460,8 @@ self: {
     }:
     mkDerivation {
       pname = "io-classes";
-      version = "1.10.0.0";
-      sha256 = "0cwf0dc59qw5qyhf758ws71ajp4gxjqbxh5zsmcakrnbcv2i977b";
+      version = "1.10.1.0";
+      sha256 = "10j0q5a1nncrn8gpj8nlcl2ppvv4lz6mjyyi4z1q91yaya0n1l1w";
       libraryHaskellDepends = [
         array
         async
@@ -392289,10 +396677,8 @@ self: {
     }:
     mkDerivation {
       pname = "io-sim";
-      version = "1.10.0.0";
-      sha256 = "02gk2xgiv9mrl1cvwqabi8rki7w15cj23s65h0qmw1dyf29rbb9q";
-      revision = "1";
-      editedCabalFile = "1qmnvisf3r4n2ji4z0k3fskbwk8ys9p84mrhapa8ymsray2ccwz4";
+      version = "1.10.1.0";
+      sha256 = "1jlss750qqy1licfaixhgjrn6lbjd2zbg0gf7if2543df658j5xc";
       libraryHaskellDepends = [
         base
         containers
@@ -394562,6 +398948,31 @@ self: {
     }
   ) { };
 
+  is-list = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      hashable,
+      lens,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "is-list";
+      version = "0.0.3";
+      sha256 = "15dm24zbjd2dmhr6vnj9389svjj9arccahvds30lcvzc7fbq331s";
+      libraryHaskellDepends = [
+        base
+        containers
+        hashable
+        lens
+        unordered-containers
+      ];
+      description = "Fix IsList";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   isbn = callPackage (
     {
       mkDerivation,
@@ -395050,6 +399461,41 @@ self: {
     }
   ) { };
 
+  isocline_1_1_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      text,
+    }:
+    mkDerivation {
+      pname = "isocline";
+      version = "1.1.0";
+      sha256 = "00x5rs6m1mq6m3ax6g43rx3yrrmnqj0bq4ri934d12iis2vbyqvz";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        text
+      ];
+      executableHaskellDepends = [
+        base
+        bytestring
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        text
+      ];
+      description = "A portable alternative to GNU Readline";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "example";
+    }
+  ) { };
+
   isohunt = callPackage (
     {
       mkDerivation,
@@ -396911,8 +401357,8 @@ self: {
     }:
     mkDerivation {
       pname = "jacinda";
-      version = "3.3.0.5";
-      sha256 = "0msadmd9d7syjzr2lnxfa2gsplwdc17kgdxrh61h6i0k9crlgbdp";
+      version = "3.3.0.6";
+      sha256 = "0jc1hsq7fh4nbdhr36pzzl5gc5sqzqizjw29y26hf95mrk8avpfk";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -400453,6 +404899,7 @@ self: {
       filepath,
       ghc-prim,
       http-types,
+      kan-extensions,
       lens,
       primitive,
       process,
@@ -400469,8 +404916,8 @@ self: {
     }:
     mkDerivation {
       pname = "jsaddle";
-      version = "0.9.9.3";
-      sha256 = "0k784bcvqhnsd771pa3k1s8gv25adwwyxk1dzwyqvnp2jpl4djcc";
+      version = "0.9.9.4";
+      sha256 = "0a27sb18yx0j7kby4f79wr7djr0l37y3607qfl82w52sbncp5fd1";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -400484,6 +404931,7 @@ self: {
         filepath
         ghc-prim
         http-types
+        kan-extensions
         lens
         primitive
         process
@@ -400517,8 +404965,8 @@ self: {
     }:
     mkDerivation {
       pname = "jsaddle-clib";
-      version = "0.9.9.3";
-      sha256 = "08l6a8yvkcngcz6sv8smwpbd9j0a0xxnw3s7dwix1mww0ghq0zfd";
+      version = "0.9.9.4";
+      sha256 = "0a9afqwshqrxqb1clznbbar8431blkmb7yvd2xmnvy8vp9l362h5";
       libraryHaskellDepends = [
         aeson
         base
@@ -400547,8 +404995,8 @@ self: {
     }:
     mkDerivation {
       pname = "jsaddle-dom";
-      version = "0.9.9.2";
-      sha256 = "0f2c95hagrabyb8s5bdyn1x6sbg5dzvzp23qhmyygi9cgp89nmf4";
+      version = "0.9.9.3";
+      sha256 = "04ywzmbzd54v94g7wgh5qpzz5jipl1wp3diqdkd9898y4ql1bggb";
       libraryHaskellDepends = [
         base
         base-compat
@@ -400625,8 +405073,8 @@ self: {
     }:
     mkDerivation {
       pname = "jsaddle-warp";
-      version = "0.9.9.5";
-      sha256 = "1w7i64aaqisvk25f7p1qgxk1krqdh8ii9phapw0wyk7jcn6ybar2";
+      version = "0.9.9.6";
+      sha256 = "05dwhshnhdw4k1ccp1sr630pxps19n9vjrrzf5jn2r9vr75vn48j";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -404097,8 +408545,6 @@ self: {
       ];
       description = "Tiny JSON-RPC client for Haskell Web3 library";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -404221,8 +408667,6 @@ self: {
       ];
       description = "JSON Schema derivation and validation";
       license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -405807,6 +410251,35 @@ self: {
     }
   ) { };
 
+  kafka-effectful = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      effectful-core,
+      hw-kafka-client,
+      text,
+    }:
+    mkDerivation {
+      pname = "kafka-effectful";
+      version = "0.1.0.0";
+      sha256 = "1s9yw67x8aaa36q6b05cywya4pxbbm4yry3ns7w1xk6dd53vafrc";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        effectful-core
+        hw-kafka-client
+        text
+      ];
+      description = "Effectful effects for hw-kafka-client";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   kafka-interchange = callPackage (
     {
       mkDerivation,
@@ -407595,8 +412068,8 @@ self: {
     }:
     mkDerivation {
       pname = "kb-text-shape";
-      version = "0.1.0.0";
-      sha256 = "1kgqpnbfxg30dawg5dkfv4i6chaf4zr29g4iq2cwcqz3qd1sp7as";
+      version = "0.1.0.1";
+      sha256 = "0pd6wffy7mi9gsj0faydyp30lfg39yv5vrpgp5rpmi0bjb6n8fvr";
       libraryHaskellDepends = [
         base
         bytestring
@@ -407799,8 +412272,8 @@ self: {
     }:
     mkDerivation {
       pname = "kdl-hs";
-      version = "1.0.1";
-      sha256 = "1z2y85avj0npgdin46pagyjdnh34sixf5vjasxphkcgshbw4pa8x";
+      version = "1.1.0";
+      sha256 = "0hf6z44arpwk8y2f5ih1xz261r75y6lpy8rki6d26jmg9zgmwf72";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -408143,7 +412616,6 @@ self: {
       ];
       description = "Rapid Gtk Application Development - I18N";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -409480,7 +413952,7 @@ self: {
     }
   ) { };
 
-  keter_2_3_2 = callPackage (
+  keter_2_3_5 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -409542,8 +414014,8 @@ self: {
     }:
     mkDerivation {
       pname = "keter";
-      version = "2.3.2";
-      sha256 = "01m5pqrfyznmmc4ms94dqpgnsrl5b0mf4ihmnljr2bvnknp2dk7v";
+      version = "2.3.5";
+      sha256 = "13j8xpi4p6sr7n1c3s81j11zxf5mr60s98m57i1l5m06ykr0p121";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -412666,6 +417138,42 @@ self: {
     }
   ) { };
 
+  ktx-font = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      kb-text-shape,
+      ktx-codec,
+      msdf-atlas,
+      text,
+      vector,
+      zstd,
+    }:
+    mkDerivation {
+      pname = "ktx-font";
+      version = "0.1.0.1";
+      sha256 = "0i0dqa6dq8jcpv17x54r1v5k91w70xwqz7hf3y87av4gann9n5h6";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        kb-text-shape
+        ktx-codec
+        msdf-atlas
+        text
+        vector
+        zstd
+      ];
+      description = "GPU-ready rasterized fonts";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   kubernetes-api = callPackage (
     {
       mkDerivation,
@@ -412700,8 +417208,8 @@ self: {
     }:
     mkDerivation {
       pname = "kubernetes-api";
-      version = "132.0.0";
-      sha256 = "086311p6lv45jb1plsab6jax1ha3d9kcsndzrm4w998ci7zyah45";
+      version = "135.0.1";
+      sha256 = "1089s9nzvhrqnaqaxb3jwv5nhhr93n16lgxjy4kxr1wvmwb64v5k";
       libraryHaskellDepends = [
         aeson
         base
@@ -413842,6 +418350,37 @@ self: {
     }
   ) { };
 
+  lager = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      prettyprinter,
+      prettyprinter-ansi-terminal,
+      stm,
+      text,
+    }:
+    mkDerivation {
+      pname = "lager";
+      version = "1.0.0.0";
+      sha256 = "1cfsq5ap8lwsq9s4qppp9vag5w9wqvaw9nhiq4xl0hbj6756z924";
+      libraryHaskellDepends = [
+        async
+        base
+        prettyprinter
+        prettyprinter-ansi-terminal
+        stm
+        text
+      ];
+      testHaskellDepends = [
+        async
+        base
+      ];
+      description = "Concurrent logging";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   lagrangian = callPackage (
     {
       mkDerivation,
@@ -420564,10 +425103,8 @@ self: {
     }:
     mkDerivation {
       pname = "lattices";
-      version = "2.2.1";
-      sha256 = "0rknzbzwcbg87hjiz4jwqb81w14pywkipxjrrlrp0m5i8ciky1i7";
-      revision = "3";
-      editedCabalFile = "0ry6d23sy0pqgzn2cfbr0yrsxcf1mix2irhv1x9bzv99cz2az3qm";
+      version = "2.2.1.1";
+      sha256 = "1813yzg08fwyvycq7wmyl3l8905k96nfldlh8wn0pz90ksviqd6i";
       libraryHaskellDepends = [
         base
         containers
@@ -420588,7 +425125,6 @@ self: {
         quickcheck-instances
         tasty
         tasty-quickcheck
-        transformers
         universe-base
         universe-reverse-instances
         unordered-containers
@@ -421340,19 +425876,24 @@ self: {
       base,
       tasty,
       tasty-hunit,
+      text,
     }:
     mkDerivation {
       pname = "layoutz";
-      version = "0.3.3.0";
-      sha256 = "0ra8v9ybpx5i69g0w2r8j2xqnsq90l74ka2x8p221c134g0i7vrp";
+      version = "0.3.4.0";
+      sha256 = "1wkldb91mlp4sqi04bc1az7a1wpj1i0g5kqhnzycqbr2idzk7n4k";
       isLibrary = true;
       isExecutable = true;
-      libraryHaskellDepends = [ base ];
+      libraryHaskellDepends = [
+        base
+        text
+      ];
       executableHaskellDepends = [ base ];
       testHaskellDepends = [
         base
         tasty
         tasty-hunit
+        text
       ];
       description = "Simple, beautiful CLI output";
       license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
@@ -422560,6 +427101,25 @@ self: {
     }
   ) { };
 
+  leancheck-extras = callPackage (
+    {
+      mkDerivation,
+      base,
+      leancheck,
+    }:
+    mkDerivation {
+      pname = "leancheck-extras";
+      version = "0";
+      sha256 = "1ngqkkh4575zq980h0xslzhsvfvcacics5drk9irh68a9yhng8s5";
+      libraryHaskellDepends = [
+        base
+        leancheck
+      ];
+      description = "extra features for leancheck";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   leancheck-instances = callPackage (
     {
       mkDerivation,
@@ -422884,8 +427444,8 @@ self: {
       pname = "leb128";
       version = "0.1.0.0";
       sha256 = "097xzdj1q17whnzwlpwnfapppgc4lqwmmfcv2694gzlil84rqwk7";
-      revision = "2";
-      editedCabalFile = "12qilpvx1sr1k1k5qsvpk8j678gvkhdzxbkdh6yhkb5w6hg4jzph";
+      revision = "3";
+      editedCabalFile = "0nhn6m6a20rgxspcvqlbzmlg3ajc77lpjzi92wyigdvynylxfx0m";
       libraryHaskellDepends = [
         base
         bytestring
@@ -425755,12 +430315,14 @@ self: {
     { mkDerivation, zlib-clib }:
     mkDerivation {
       pname = "libarchive-clib";
-      version = "3.8.5";
-      sha256 = "0v2l84ay1mhc4b86ddzyk0fl2ahc4y2fnkw8jyvzdia4g2mg08jr";
+      version = "3.8.6.2";
+      sha256 = "1yx7j413x3wkjwkq7bjglc8rz9xfsx253mw6r9gxdb51721via0q";
       libraryHaskellDepends = [ zlib-clib ];
       doHaddock = false;
       description = "Haskell interface to libarchive (C sources)";
       license = "unknown";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -425791,6 +430353,43 @@ self: {
     }
   ) { archive = null; };
 
+  libasterix = callPackage (
+    {
+      mkDerivation,
+      base,
+      base16-bytestring,
+      bytestring,
+      containers,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "libasterix";
+      version = "0.11.0";
+      sha256 = "0xy76mnv2xgv0iillk1h7if8chlajphwh6f61hj2lzqjiwxs5cn9";
+      libraryHaskellDepends = [
+        base
+        base16-bytestring
+        bytestring
+        containers
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      description = "Asterix data processing library";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   libconfig = callPackage (
     {
       mkDerivation,
@@ -428538,8 +433137,8 @@ self: {
     }:
     mkDerivation {
       pname = "libyaml-streamly";
-      version = "0.2.3.0";
-      sha256 = "1jmrxnxh3qps3wa8b0hjlwxgc36j0hk2b6jkxsaymx03rjvml2zn";
+      version = "0.2.4.0";
+      sha256 = "0yc1nsk9i35lwdcgqlidc3ssqz16j1dinzg3asajgn4nc1ws4yvr";
       libraryHaskellDepends = [
         base
         bytestring
@@ -431332,6 +435931,44 @@ self: {
     }
   ) { };
 
+  link-canonical-effectful = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      effectful-core,
+      http-types,
+      link-canonical,
+      modern-uri,
+      tasty,
+      tasty-hunit,
+    }:
+    mkDerivation {
+      pname = "link-canonical-effectful";
+      version = "0.1.0.0";
+      sha256 = "1h4xiv0vbbam0v8cny7i5inqiq5k62kj25jagbxj5bmgasb4bjbp";
+      libraryHaskellDepends = [
+        base
+        effectful-core
+        link-canonical
+        modern-uri
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        effectful-core
+        http-types
+        link-canonical
+        tasty
+        tasty-hunit
+      ];
+      description = "Effectful integration for link-canonical";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   link-relations = callPackage (
     {
       mkDerivation,
@@ -434789,6 +439426,27 @@ self: {
     }
   ) { };
 
+  live-stats = callPackage (
+    {
+      mkDerivation,
+      base,
+      relude,
+      time,
+    }:
+    mkDerivation {
+      pname = "live-stats";
+      version = "0.1.0.0";
+      sha256 = "1k99vrnvrspmk826dgrhkyb6q2jjqrzsi83jwxbywfzwlfdwyw2q";
+      libraryHaskellDepends = [
+        base
+        relude
+        time
+      ];
+      description = "A reusable run-time stats module";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   liveplot = callPackage (
     {
       mkDerivation,
@@ -439478,8 +444136,8 @@ self: {
       pname = "long-double";
       version = "0.1.1.1";
       sha256 = "0xq2f0ziinlw1drgg3q6p7303rkzbasc9jwrz8lgjfl3wv24qk8l";
-      revision = "1";
-      editedCabalFile = "07hbfv5mcz39j4j9z63s4xs5d077hxc138vrcyzp552nns78cms7";
+      revision = "2";
+      editedCabalFile = "0fixx8w3svlgi5szhjqia2zp1kz40pks2v32qfxiq8wd44dj2wrr";
       libraryHaskellDepends = [
         base
         integer-gmp
@@ -439638,8 +444296,6 @@ self: {
       ];
       description = "A simple text parser with decent errors";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -441035,8 +445691,8 @@ self: {
     }:
     mkDerivation {
       pname = "lsm-tree";
-      version = "1.0.0.1";
-      sha256 = "1b7w7w4i9ylsvi7ww5d9xry0r2gpr7i17r79fpizpgv11rz2lzvh";
+      version = "1.0.0.2";
+      sha256 = "0iqhb5pjcb3fjpd2iibjqradr14jpc0cchcsllb87gbl4izkrryf";
       libraryHaskellDepends = [
         base
         binary
@@ -445476,8 +450132,8 @@ self: {
     }:
     mkDerivation {
       pname = "magma";
-      version = "0.6.1.1";
-      sha256 = "0zv97sjlsisgbyhjb0c1p4l3l64mxk3hj9g4dqn7xy3qskbccdf6";
+      version = "0.7.0.0";
+      sha256 = "1ks8y5pjxyni4phphq1h2qsf8fshgpbig1y6v9cqpxjnxih0gaxk";
       libraryHaskellDepends = [
         base
         deepseq
@@ -452214,8 +456870,6 @@ self: {
       ];
       description = "A Servant-based Model Context Protocol (MCP) server for Haskell";
       license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -453665,10 +458319,8 @@ self: {
     }:
     mkDerivation {
       pname = "megastore";
-      version = "0.1.1.1";
-      sha256 = "0i34jla7v5fsqcnpy8h7iqy413p6qcqnc1z1yi933kdwsh6srdyj";
-      isLibrary = true;
-      isExecutable = true;
+      version = "0.1.1.2";
+      sha256 = "1ssl3yfjj7pa03nmzjjqjmz3jfrhy2pv1mp0r7g63mllk43h3jvk";
       libraryHaskellDepends = [
         adjunctions
         base
@@ -453687,28 +458339,9 @@ self: {
         vector
         zlib
       ];
-      executableHaskellDepends = [
-        adjunctions
-        base
-        binary
-        bytestring
-        containers
-        directory
-        ghc
-        hashable
-        JuicyPixels
-        lens
-        mtl
-        random
-        text
-        text-show
-        vector
-        zlib
-      ];
       description = "Bulk image or strict bytestring storage";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
-      mainProgram = "megastore";
       broken = true;
     }
   ) { };
@@ -454904,7 +459537,6 @@ self: {
       ];
       description = "Hex-string type for Haskell Web3 library";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -456669,13 +461301,12 @@ self: {
       bytestring,
       containers,
       crypton,
-      memory,
-      text,
+      ram,
     }:
     mkDerivation {
       pname = "mfmts";
-      version = "1.0.0.0";
-      sha256 = "1h2gr2a03gs1gy3wngq0l25bdph3xfvmhipqmzybaknjiix5mix8";
+      version = "1.0.0.1";
+      sha256 = "0ff8i8y6khcci1mqfjw75j3aiak9srfp3rr1hyic6w4l4js6x16i";
       libraryHaskellDepends = [
         array
         base
@@ -456683,10 +461314,8 @@ self: {
         bytestring
         containers
         crypton
-        memory
-        text
+        ram
       ];
-      doHaddock = false;
       description = "Implements multiformats specification";
       license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
@@ -457853,15 +462482,12 @@ self: {
       tasty-hunit,
       text,
       transformers,
-      unordered-containers,
       vector,
     }:
     mkDerivation {
       pname = "microstache";
-      version = "1.0.3";
-      sha256 = "13w9macbi0krdilyp7dvzcg48di89biyz1axd7vvl3ylggjr1wim";
-      revision = "1";
-      editedCabalFile = "13hqvjzb7k03bxnvyyflfw1rs6hyc3z16b7n2r52xsk32lrmz9c6";
+      version = "1.0.3.1";
+      sha256 = "163xqaf3igikz8vhpyh063spbml3kq1ih3svpax09izglvcd7238";
       libraryHaskellDepends = [
         aeson
         base
@@ -457872,7 +462498,6 @@ self: {
         parsec
         text
         transformers
-        unordered-containers
         vector
       ];
       testHaskellDepends = [
@@ -458509,7 +463134,6 @@ self: {
       ];
       description = "Utils to use RIO with mig library";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -458553,7 +463177,6 @@ self: {
       ];
       description = "Build lightweight and composable servers";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -458595,8 +463218,6 @@ self: {
       ];
       description = "Swagger servers for mig library";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -458782,6 +463403,113 @@ self: {
     }
   ) { };
 
+  mighttpd2_4_0_10 = callPackage (
+    {
+      mkDerivation,
+      array,
+      async,
+      auto-update,
+      base,
+      byteorder,
+      bytestring,
+      case-insensitive,
+      conduit,
+      conduit-extra,
+      directory,
+      filepath,
+      hspec,
+      hspec-discover,
+      http-client,
+      http-date,
+      http-types,
+      http2,
+      network,
+      old-locale,
+      parsec,
+      resourcet,
+      split,
+      streaming-commons,
+      text,
+      time,
+      time-manager,
+      transformers,
+      unix,
+      unix-time,
+      unordered-containers,
+      wai,
+      wai-app-file-cgi,
+      wai-logger,
+      warp,
+    }:
+    mkDerivation {
+      pname = "mighttpd2";
+      version = "4.0.10";
+      sha256 = "1nsphcg0fc1mc56d27b96ba9ds6lddngzcbca9zm65w5fikzj4km";
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        array
+        async
+        auto-update
+        base
+        byteorder
+        bytestring
+        case-insensitive
+        conduit
+        conduit-extra
+        directory
+        filepath
+        http-date
+        http-types
+        http2
+        network
+        parsec
+        resourcet
+        split
+        streaming-commons
+        text
+        unix
+        unix-time
+        unordered-containers
+        wai
+        wai-app-file-cgi
+        warp
+      ];
+      executableHaskellDepends = [
+        base
+        bytestring
+        conduit-extra
+        directory
+        filepath
+        http-client
+        http-date
+        http-types
+        network
+        old-locale
+        streaming-commons
+        time
+        time-manager
+        transformers
+        unix
+        wai
+        wai-app-file-cgi
+        wai-logger
+        warp
+      ];
+      testHaskellDepends = [
+        base
+        hspec
+        http-client
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "High performance web server on WAI/warp";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.sternenseemann ];
+    }
+  ) { };
+
   mighty-metropolis = callPackage (
     {
       mkDerivation,
@@ -459268,6 +463996,46 @@ self: {
     }
   ) { };
 
+  mime-mail_0_5_2 = callPackage (
+    {
+      mkDerivation,
+      base,
+      base64-bytestring,
+      blaze-builder,
+      bytestring,
+      filepath,
+      hspec,
+      process,
+      random,
+      text,
+    }:
+    mkDerivation {
+      pname = "mime-mail";
+      version = "0.5.2";
+      sha256 = "0y3qzkpf6v0agbdvfmc97if5lqyzsvknnjf1qcj3rs7ai58bsh60";
+      libraryHaskellDepends = [
+        base
+        base64-bytestring
+        blaze-builder
+        bytestring
+        filepath
+        process
+        random
+        text
+      ];
+      testHaskellDepends = [
+        base
+        blaze-builder
+        bytestring
+        hspec
+        text
+      ];
+      description = "Compose MIME email messages";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   mime-mail-ses = callPackage (
     {
       mkDerivation,
@@ -461376,6 +466144,36 @@ self: {
     }
   ) { };
 
+  miso_1_9_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      mtl,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "miso";
+      version = "1.9.0.0";
+      sha256 = "0v45pvrxwf0biywx8icq2qww8gvmy2a9k1iz0n21p14bxm2fjicx";
+      revision = "1";
+      editedCabalFile = "0pjvyyr7ldggx0ffzrwnrmx7xss407i0sprvpy55n9lxknzvjav0";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        mtl
+        text
+        transformers
+      ];
+      description = "A tasty Haskell front-end web framework";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   miso-action-logger = callPackage (
     {
       mkDerivation,
@@ -461400,6 +466198,37 @@ self: {
     }
   ) { };
 
+  miso-aeson = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      containers,
+      miso,
+      scientific,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "miso-aeson";
+      version = "0.1.0.0";
+      sha256 = "0h83n38p14sr4si9z4x0ilhdmnhiz8xi7fd9g61ws3b0dcwfb917";
+      libraryHaskellDepends = [
+        aeson
+        base
+        containers
+        miso
+        scientific
+        unordered-containers
+        vector
+      ];
+      description = "JSON conversion library";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   miso-examples = callPackage (
     { mkDerivation }:
     mkDerivation {
@@ -461417,30 +466246,65 @@ self: {
   miso-from-html = callPackage (
     {
       mkDerivation,
-      attoparsec,
       base,
       bytestring,
       containers,
+      fourmolu,
+      html-parse,
+      miso,
+      mtl,
       pretty-simple,
       text,
     }:
     mkDerivation {
       pname = "miso-from-html";
-      version = "0.2.0.0";
-      sha256 = "191qszlmgakpjdzg6k54kxg7c8v05jib66sk3w1aqc98j74f4yix";
-      isLibrary = false;
+      version = "0.3.0.0";
+      sha256 = "1vv4brss0cg80jxb9s0rjcpm401b2d1qh4v1k3c246x2p2g3zkvc";
+      isLibrary = true;
       isExecutable = true;
-      executableHaskellDepends = [
-        attoparsec
+      libraryHaskellDepends = [
         base
         bytestring
         containers
+        html-parse
+        miso
+        mtl
         pretty-simple
         text
       ];
+      executableHaskellDepends = [
+        base
+        fourmolu
+        miso
+        text
+      ];
       description = "Convert HTML to miso View syntax";
-      license = lib.licenses.bsd3;
-      mainProgram = "miso-from-html";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
+  miso-optics = callPackage (
+    {
+      mkDerivation,
+      base,
+      miso,
+      optics,
+    }:
+    mkDerivation {
+      pname = "miso-optics";
+      version = "0.1.0.0";
+      sha256 = "1xai6klyhxlylx6cbg5cjqa9mjx02w4hgb6k8wwpbx4jx0i44l5v";
+      libraryHaskellDepends = [
+        base
+        miso
+        optics
+      ];
+      description = "An adaptor package for using miso with optics";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -461995,14 +466859,14 @@ self: {
       mkDerivation,
       aeson,
       base,
-      basement,
       bytestring,
       criterion,
-      cryptonite,
+      crypton,
       deepseq,
       directory,
-      memory,
+      primitive,
       process,
+      ram,
       tasty,
       tasty-hunit,
       tasty-quickcheck,
@@ -462011,27 +466875,25 @@ self: {
     }:
     mkDerivation {
       pname = "mlkem";
-      version = "0.1.1.0";
-      sha256 = "1l77dqysiq797ci3168z708qz7i986yvmvisssfdr36rwnsz7nrl";
-      revision = "1";
-      editedCabalFile = "18nzz4gg1cb2275k3qqfi3y9d05kfm9fqh4z4aarliv6hbs0nvvd";
+      version = "0.2.0.0";
+      sha256 = "0ryq0mwlics4kqjqh05y33y4qmj2j2z0r4p2jaw6mhs41qyj346z";
       libraryHaskellDepends = [
         base
-        basement
-        cryptonite
+        crypton
         deepseq
-        memory
+        primitive
+        ram
       ];
       testHaskellDepends = [
         aeson
         base
-        basement
         bytestring
-        cryptonite
+        crypton
         deepseq
         directory
-        memory
+        primitive
         process
+        ram
         tasty
         tasty-hunit
         tasty-quickcheck
@@ -462040,11 +466902,11 @@ self: {
       ];
       benchmarkHaskellDepends = [
         base
-        basement
         criterion
-        cryptonite
+        crypton
         deepseq
-        memory
+        primitive
+        ram
       ];
       description = "Module-Lattice-based Key-Encapsulation Mechanism";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
@@ -462334,8 +467196,8 @@ self: {
       pname = "mmorph";
       version = "1.2.2";
       sha256 = "1bwzgd0xwvlxcgn86lvm26lnq0d4kd693zpyqr7m8xk77cmjsvyx";
-      revision = "1";
-      editedCabalFile = "093280asv0ni2yz0nn6zbvl7650b5wddfq3b521vi8vi16zizf9s";
+      revision = "2";
+      editedCabalFile = "0kvgdpmj3328ll3kp7wm9mvrr8vvw1fp7vzd701z8pm99319f359";
       libraryHaskellDepends = [
         base
         mtl
@@ -462897,8 +467759,8 @@ self: {
     }:
     mkDerivation {
       pname = "mmzk-env";
-      version = "0.2.1.0";
-      sha256 = "0fxilcn5y4fvafq681jphagirm6kk94f3i6rdxjxfam1d8sv4r4r";
+      version = "0.4.0.0";
+      sha256 = "0f5mkr92jjcz6ks9zlcf1czm6pnjqq0mbksyn5r6ykjq5wc7kjx9";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -462945,8 +467807,8 @@ self: {
     }:
     mkDerivation {
       pname = "mmzk-typeid";
-      version = "0.7.0.2";
-      sha256 = "0zkyxyzc4dgp3d7jr806jwplagw7m0y0pjysagcw9b76lrw229r5";
+      version = "0.7.1.0";
+      sha256 = "1jvxkdvah8xip4q7mf66hx6vaa9hcv3417y5bmwaz1lmai4ngzv1";
       libraryHaskellDepends = [
         aeson
         array
@@ -465113,19 +469975,17 @@ self: {
       semigroupoids,
       these,
       transformers,
-      transformers-compat,
     }:
     mkDerivation {
       pname = "monad-chronicle";
-      version = "1.1";
-      sha256 = "0qqxawj64jyrsjf1xs3s07nazw3xngsq30crk9g7vbbqrizamhxz";
+      version = "1.1.0.1";
+      sha256 = "13g266jka2mvhhz5zwp4bwbicgpnyfihvbs7knjlhqyn71q0dcw9";
       libraryHaskellDepends = [
         base
         mtl
         semigroupoids
         these
         transformers
-        transformers-compat
       ];
       description = "These as a transformer, ChronicleT";
       license = lib.licenses.bsd3;
@@ -465486,6 +470346,7 @@ self: {
       lens,
       monad-effect,
       monad-logger,
+      optparse-applicative,
       primitive,
       stm,
       template-haskell,
@@ -465494,8 +470355,8 @@ self: {
     }:
     mkDerivation {
       pname = "monad-effect-logging";
-      version = "0.1.0.0";
-      sha256 = "1xaaa76icrm39c6xw7y8gamajsa2q480f6djml32jgy6zq7q876a";
+      version = "0.3.0.0";
+      sha256 = "18dgyzy277ncwyyj9img188qnyc5hf7h03lbw8zql682aa6nqj5b";
       libraryHaskellDepends = [
         aeson
         base
@@ -465505,6 +470366,7 @@ self: {
         lens
         monad-effect
         monad-logger
+        optparse-applicative
         primitive
         stm
         template-haskell
@@ -466884,6 +471746,43 @@ self: {
     }
   ) { };
 
+  monad-rail = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      hspec,
+      hspec-discover,
+      mtl,
+      QuickCheck,
+      text,
+    }:
+    mkDerivation {
+      pname = "monad-rail";
+      version = "0.1.0.0";
+      sha256 = "1ww8l7cq6chjrz0bf0vmcz59ykb8qrg7cbg9cl6rfk503rz20idi";
+      libraryHaskellDepends = [
+        aeson
+        base
+        mtl
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        hspec
+        mtl
+        QuickCheck
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Railway-oriented error handling for Haskell";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   monad-ran = callPackage (
     {
       mkDerivation,
@@ -467378,8 +472277,8 @@ self: {
     }:
     mkDerivation {
       pname = "monad-time-effectful";
-      version = "1.0.0.0";
-      sha256 = "1gxmgr8vrpdncrnw9q5i3vqbi7llrah34gpfyq3qcb15sqi44gk9";
+      version = "1.0.1.0";
+      sha256 = "166y7g9g0ycdcpxrw42m9k3p9dvlgkcrgymmi897kc6fxwrq92kn";
       libraryHaskellDepends = [
         base
         effectful-core
@@ -467872,8 +472771,8 @@ self: {
     }:
     mkDerivation {
       pname = "monadic-recursion-schemes";
-      version = "0.1.13.2";
-      sha256 = "0jf615bjzbf690lk4xiygy4gnz1myhqrbw1mlicdikfcgii5hr3p";
+      version = "0.1.14.0";
+      sha256 = "13al051p1spwfsy6r8l0sxyd72j9k522jzvhr4nlbjjm0srcxg56";
       libraryHaskellDepends = [
         base
         comonad
@@ -469026,12 +473925,11 @@ self: {
       criterion,
       groups,
       semigroupoids,
-      semigroups,
     }:
     mkDerivation {
       pname = "monoid-extras";
-      version = "0.7.0.1";
-      sha256 = "0g4jgbpgvk6blzczv1vddq98z4ym613mgpw4j92290prmj9zvhmz";
+      version = "0.7.0.2";
+      sha256 = "0280lp5rln4f8k90rwmjh6fknr0z13gq7m6lrmjr6ibsy183hij4";
       libraryHaskellDepends = [
         base
         groups
@@ -469040,7 +473938,6 @@ self: {
       benchmarkHaskellDepends = [
         base
         criterion
-        semigroups
       ];
       description = "Various extra monoid-related definitions and utilities";
       license = lib.licenses.bsd3;
@@ -469374,7 +474271,7 @@ self: {
     }
   ) { };
 
-  monoidmap_0_0_5_0 = callPackage (
+  monoidmap_0_0_5_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -469387,8 +474284,8 @@ self: {
     }:
     mkDerivation {
       pname = "monoidmap";
-      version = "0.0.5.0";
-      sha256 = "1vl97smpnss8kfns1bdkaw1adgpy57g7m0inhk4wi97hq9nnqpaf";
+      version = "0.0.5.1";
+      sha256 = "1dmnhqwwycm246daxg9yzfnxk6i92c4mnh8s2arl6nvxw7knyhgj";
       libraryHaskellDepends = [
         base
         containers
@@ -469450,6 +474347,55 @@ self: {
     }
   ) { };
 
+  monoidmap-aeson_0_0_0_7 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      containers,
+      hspec,
+      hspec-discover,
+      hspec-golden-aeson,
+      hspec-quickcheck-classes,
+      monoid-subclasses,
+      monoidmap,
+      QuickCheck,
+      quickcheck-classes,
+      quickcheck-quid,
+      text,
+    }:
+    mkDerivation {
+      pname = "monoidmap-aeson";
+      version = "0.0.0.7";
+      sha256 = "1qwqsr2ivihxsiw3ky676s5mypc89v7zyl3kh8kn4jhhbrqj7npf";
+      libraryHaskellDepends = [
+        aeson
+        base
+        containers
+        monoid-subclasses
+        monoidmap
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        containers
+        hspec
+        hspec-golden-aeson
+        hspec-quickcheck-classes
+        monoid-subclasses
+        monoidmap
+        QuickCheck
+        quickcheck-classes
+        quickcheck-quid
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "JSON support for monoidmap";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   monoidmap-examples = callPackage (
     {
       mkDerivation,
@@ -469463,8 +474409,8 @@ self: {
     }:
     mkDerivation {
       pname = "monoidmap-examples";
-      version = "0.0.0.1";
-      sha256 = "1q7vssgknncjq1f187zvg6630r6kk12mdmq1985skm98ynl1n8wx";
+      version = "0.0.0.2";
+      sha256 = "0rl2vxchlagcmkc2qjvh9pky8f80ppx79xnawxxsv22fbcz01ixl";
       libraryHaskellDepends = [
         base
         containers
@@ -469493,8 +474439,8 @@ self: {
     }:
     mkDerivation {
       pname = "monoidmap-hashable";
-      version = "0.0.0.0";
-      sha256 = "0ifqn4998qgmvb7f7vanmrw7qvf6a5ycdxan8dpyp4z2vyslphrl";
+      version = "0.0.0.1";
+      sha256 = "0plwib2ghr0jbcah2pz9hayhmvkx5vfgamniv9qwm5k5g3l07d1x";
       libraryHaskellDepends = [
         base
         containers
@@ -469566,7 +474512,7 @@ self: {
     }
   ) { };
 
-  monoidmap-internal_0_1_0_1 = callPackage (
+  monoidmap-internal_0_1_0_2 = callPackage (
     {
       mkDerivation,
       base,
@@ -469575,6 +474521,7 @@ self: {
       groups,
       hspec,
       hspec-discover,
+      hspec-quickcheck-classes,
       monoid-subclasses,
       nothunks,
       pretty-show,
@@ -469589,8 +474536,8 @@ self: {
     }:
     mkDerivation {
       pname = "monoidmap-internal";
-      version = "0.1.0.1";
-      sha256 = "1z1w34qyrihlsdnd1ijqfjj7475yi74n8z7ywkmfdagwxfjdw2yv";
+      version = "0.1.0.2";
+      sha256 = "1n6xxzcrk8ynvbmq5d1fgkngas517l5dsqycd696bawkyfgql64k";
       libraryHaskellDepends = [
         base
         containers
@@ -469604,6 +474551,7 @@ self: {
         containers
         groups
         hspec
+        hspec-quickcheck-classes
         monoid-subclasses
         pretty-show
         QuickCheck
@@ -469638,8 +474586,8 @@ self: {
     }:
     mkDerivation {
       pname = "monoidmap-quickcheck";
-      version = "0.0.0.3";
-      sha256 = "065b7rk64yg89ll546n338jny9d3y0pmp2alwf5z7z5n25nf40cq";
+      version = "0.0.0.4";
+      sha256 = "1h482q9x5mw83mmx3wc1i7zhbp8byfnzb58acls1pg49qdyvhljf";
       libraryHaskellDepends = [
         base
         containers
@@ -472516,15 +477464,13 @@ self: {
     }:
     mkDerivation {
       pname = "mpd-current-json";
-      version = "3.0.0.0";
-      sha256 = "184466w92jif7266izbpb4l3i6arsg2199c70yfngsw7fvyhy2hr";
+      version = "3.1.0.0";
+      sha256 = "0z0yc5gy02kpdd22x77pnawlr9fcdspda138gnm1q3sn4ryq9z7a";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         aeson
-        aeson-pretty
         base
-        bytestring
         deriving-aeson
         libmpd
         text
@@ -473907,8 +478853,8 @@ self: {
     }:
     mkDerivation {
       pname = "msdf-atlas";
-      version = "0.1.0.0";
-      sha256 = "1kc2hirz07rrz1wfarpfzw3vcyihndwj84jjjy0scki211qbhxzc";
+      version = "0.1.1.0";
+      sha256 = "0c2s6jp0lbh8mrnl62cwvjkqhyv348igh79w7iw0dv6jfjrix9h4";
       libraryHaskellDepends = [
         aeson
         base
@@ -478795,8 +483741,8 @@ self: {
     }:
     mkDerivation {
       pname = "musig2";
-      version = "0.1.4";
-      sha256 = "1pxyhi8d29dlac45qscgsjmfpnnc7n7ir9jnx59450awzv6mdxp2";
+      version = "0.2.0";
+      sha256 = "1n02a8b0sjixc2rh4h71nakwzdk8xv7dqhc0jpk7dqdbbzry99ak";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -480309,8 +485255,11 @@ self: {
   mysql-haskell = callPackage (
     {
       mkDerivation,
+      asn1-encoding,
+      asn1-types,
       attoparsec,
       base,
+      base16-bytestring,
       binary,
       blaze-textual,
       bytestring,
@@ -480327,7 +485276,6 @@ self: {
       filepath,
       http-types,
       io-streams,
-      memory,
       monad-loops,
       network,
       pem,
@@ -480349,9 +485297,11 @@ self: {
     }:
     mkDerivation {
       pname = "mysql-haskell";
-      version = "1.2.0";
-      sha256 = "1ilqva74p8kl2x5pb1wf8bv3pb3f0k5njjzd2pa90lzy812w5h2g";
+      version = "1.2.4";
+      sha256 = "1cfc8ljyih3gh0yp8bfj9l1d029mwinjv32x3wn0s9k0maq4lnfc";
       libraryHaskellDepends = [
+        asn1-encoding
+        asn1-types
         base
         binary
         blaze-textual
@@ -480364,7 +485314,6 @@ self: {
         data-default-class
         deepseq
         io-streams
-        memory
         monad-loops
         network
         pem
@@ -480379,6 +485328,7 @@ self: {
       testHaskellDepends = [
         attoparsec
         base
+        base16-bytestring
         binary
         bytestring
         deepseq
@@ -481575,6 +486525,29 @@ self: {
     }
   ) { };
 
+  named_0_4_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      generic-lens,
+      inspection-testing,
+    }:
+    mkDerivation {
+      pname = "named";
+      version = "0.4.0.0";
+      sha256 = "1lk7bhbx5fd3lhxj2qxqfq1m6vi6ny2rzdc28r10wasvlji9shm4";
+      libraryHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        generic-lens
+        inspection-testing
+      ];
+      description = "Named parameters (keyword arguments) for Haskell";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   named-binary-tag = callPackage (
     {
       mkDerivation,
@@ -482868,41 +487841,30 @@ self: {
   natural = callPackage (
     {
       mkDerivation,
+      aeson,
       base,
-      checkers,
-      hedgehog,
+      doctest,
       lens,
-      QuickCheck,
+      process,
       semigroupoids,
-      tasty,
-      tasty-hedgehog,
-      tasty-hunit,
-      tasty-quickcheck,
-      transformers,
     }:
     mkDerivation {
       pname = "natural";
-      version = "0.3.0.7";
-      sha256 = "0g39s1pimcfp4agxfa823x0crbnwlx825zpzf675bdjnczdn18jy";
+      version = "0.4.0.0";
+      sha256 = "11a72y49d3kz6hy638b0g21gbwhpdk8x3yg62rxqa4ks78qisqnr";
       libraryHaskellDepends = [
+        aeson
         base
         lens
         semigroupoids
       ];
       testHaskellDepends = [
         base
-        checkers
-        hedgehog
-        lens
-        QuickCheck
-        tasty
-        tasty-hedgehog
-        tasty-hunit
-        tasty-quickcheck
-        transformers
+        process
       ];
+      testToolDepends = [ doctest ];
       description = "Natural number";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -488051,10 +493013,8 @@ self: {
     }:
     mkDerivation {
       pname = "network-transport-quic";
-      version = "0.1.1";
-      sha256 = "1grif580mw6kp5hdgmimia8a14ydqcz1q4wj824hs3qwmxgmp44d";
-      revision = "2";
-      editedCabalFile = "0flm8syhran28h0a66hsrzkqsfdsr9hcjwmbw0wr6x981ldlabn8";
+      version = "0.1.2";
+      sha256 = "1x3fq68jb6330v8hpjrng90yjicrnqjbshx9chlaqx8imzmrw9vl";
       libraryHaskellDepends = [
         async
         base
@@ -489841,8 +494801,8 @@ self: {
     }:
     mkDerivation {
       pname = "ngx-export";
-      version = "1.7.11";
-      sha256 = "1r8cj7hqyfnadcq2lyh16bczfcv3c2cpw63hyxdzkfg315yjnhmb";
+      version = "1.7.11.1";
+      sha256 = "1p98r1y1g54lyzgl53kj186087pdh7l1p3fs56dd66mrjs969fdq";
       libraryHaskellDepends = [
         async
         base
@@ -490019,7 +494979,6 @@ self: {
     {
       mkDerivation,
       aeson,
-      array,
       async,
       base,
       base64,
@@ -490041,7 +495000,6 @@ self: {
       pcre-light,
       prettyprinter,
       resolv,
-      safe,
       safe-exceptions,
       snap-core,
       snap-server,
@@ -490053,11 +495011,10 @@ self: {
     }:
     mkDerivation {
       pname = "ngx-export-tools-extra";
-      version = "1.2.12.2";
-      sha256 = "1k37qdi1mp3b1qxyv7fxdn9i3b1r7hd8991588zjywakdsnk9y2w";
+      version = "1.2.13";
+      sha256 = "1rr4if1b8fj2154jkp3khx874khka1ym1zfsgfybifpnxgjwpqs1";
       libraryHaskellDepends = [
         aeson
-        array
         async
         base
         base64
@@ -490079,7 +495036,6 @@ self: {
         pcre-light
         prettyprinter
         resolv
-        safe
         safe-exceptions
         snap-core
         snap-server
@@ -493412,6 +498368,8 @@ self: {
       pname = "nonempty-vector";
       version = "0.2.4";
       sha256 = "0rqw8yp6i60m4ka0fgkl9mdrmnl0r5knr1znwdv7wl32g3xrwbg3";
+      revision = "1";
+      editedCabalFile = "14yhzlaxyn7npxsjg1a3f7r7m1qrb7ymrp7zv71sfkcyhbdd7j9n";
       libraryHaskellDepends = [
         base
         deepseq
@@ -494182,9 +499140,7 @@ self: {
       ];
       license = lib.licenses.bsd3;
       badPlatforms = lib.platforms.darwin;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "notifications-tray-icon";
-      broken = true;
     }
   ) { };
 
@@ -494201,6 +499157,7 @@ self: {
       http-api-data,
       http-client,
       http-client-tls,
+      scientific,
       servant,
       servant-client,
       servant-multipart-api,
@@ -494215,8 +499172,8 @@ self: {
     }:
     mkDerivation {
       pname = "notion-client";
-      version = "0.1.0.0";
-      sha256 = "1q1l6ls0dk5wfbc7q8d357ahw4ia0f450q6a6kdk755ax5c8c75k";
+      version = "0.7.0.1";
+      sha256 = "17f6wms983698p1zxk5w1iwgdfzq36w0sbsms12jfxmwdbivh14p";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -494229,6 +499186,7 @@ self: {
         filepath
         http-api-data
         http-client-tls
+        scientific
         servant
         servant-client
         servant-multipart-api
@@ -494243,6 +499201,7 @@ self: {
         aeson
         base
         containers
+        scientific
         text
         unordered-containers
         vector
@@ -494250,12 +499209,17 @@ self: {
       testHaskellDepends = [
         aeson
         base
+        bytestring
+        containers
+        http-api-data
         http-client
         http-client-tls
+        scientific
         servant-client
         tasty
         tasty-hunit
         text
+        vector
       ];
       description = "Type-safe Haskell client for the Notion API";
       license = lib.meta.getLicenseFromSpdxId "MIT";
@@ -494530,8 +499494,8 @@ self: {
     }:
     mkDerivation {
       pname = "nova-cache";
-      version = "0.3.1.0";
-      sha256 = "1ir4xd3x92cs84yavlv0sk32qrw86bv83c13nbhxnkczcswx7ynn";
+      version = "0.3.2.1";
+      sha256 = "13k4g6msfcf40hizba1sdl4h59839jajs909phcn0h6yhw2v3cn9";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -494579,8 +499543,8 @@ self: {
     }:
     mkDerivation {
       pname = "nova-net";
-      version = "0.1.0.0";
-      sha256 = "0qjpzvs9ldbkyqgzg7vsq0k8wl7k9gv36vbn0x5kc32g4nq0rrmg";
+      version = "0.3.0.0";
+      sha256 = "00ybcyrz0b7jh2izqnihn1lxq1hk6m7hn2rc0cyhnzfp8lpflqn7";
       libraryHaskellDepends = [
         base
         bytestring
@@ -494594,6 +499558,8 @@ self: {
       testHaskellDepends = [
         base
         bytestring
+        containers
+        network
         QuickCheck
       ];
       benchmarkHaskellDepends = [
@@ -499521,8 +504487,8 @@ self: {
     }:
     mkDerivation {
       pname = "oeis";
-      version = "0.3.10.1";
-      sha256 = "0m7h1pbiy2xpagvggsp6a8rvafdgzr84222bp8rl4yh57lz3wmw4";
+      version = "0.3.10.2";
+      sha256 = "1bmalcq0jp8nqx7gp0h0bz6sps978lddmwkk193sic42m2lkngqc";
       libraryHaskellDepends = [
         base
         http-client
@@ -499680,7 +504646,7 @@ self: {
     }
   ) { };
 
-  ogma-cli_1_12_0 = callPackage (
+  ogma-cli_1_13_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -499697,8 +504663,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-cli";
-      version = "1.12.0";
-      sha256 = "1qj6lvjdcj77gfzyavr8rf4g2ywfq4maq38m9xvl7mqa9as235d2";
+      version = "1.13.0";
+      sha256 = "07x7ac06pji09fsv7z0r5a7zp9v789gx1jmza3ccj1l1qjaxgkk5";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -499796,16 +504762,20 @@ self: {
     }
   ) { };
 
-  ogma-core_1_12_0 = callPackage (
+  ogma-core_1_13_0 = callPackage (
     {
       mkDerivation,
       aeson,
       base,
       bytestring,
       containers,
+      copilot-core,
+      copilot-language,
+      copilot-theorem,
       directory,
       filepath,
       graphviz,
+      hint,
       HUnit,
       megaparsec,
       mtl,
@@ -499828,17 +504798,21 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-core";
-      version = "1.12.0";
-      sha256 = "1pg9ikal0dd6b7kxs3rxbcv0hfiqb32lazzihpvivyngybb3wh3b";
+      version = "1.13.0";
+      sha256 = "05pg97plq3nwv5x1qsfi4hy7zcwm4680nyz7an2n82ggdj8dagc9";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
         base
         bytestring
         containers
+        copilot-core
+        copilot-language
+        copilot-theorem
         directory
         filepath
         graphviz
+        hint
         megaparsec
         mtl
         ogma-extra
@@ -499909,7 +504883,7 @@ self: {
     }
   ) { };
 
-  ogma-extra_1_12_0 = callPackage (
+  ogma-extra_1_13_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -499926,8 +504900,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-extra";
-      version = "1.12.0";
-      sha256 = "0qkxnmhb2lj0g5vi7bwybib56m3p4malqiiwgv8jqc1p7c4j7phg";
+      version = "1.13.0";
+      sha256 = "02nzxh64sjzx18q372rj9vg4q1gwxwxk7ni1dd1xkdfpnxrfskj2";
       libraryHaskellDepends = [
         aeson
         base
@@ -499993,7 +504967,7 @@ self: {
     }
   ) { };
 
-  ogma-language-c_1_12_0 = callPackage (
+  ogma-language-c_1_13_0 = callPackage (
     {
       mkDerivation,
       alex,
@@ -500009,8 +504983,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-c";
-      version = "1.12.0";
-      sha256 = "07wgqwp0lmmj3klfn0kzhzkr8b2f74ffi1g9hdrzfd38dax0lccz";
+      version = "1.13.0";
+      sha256 = "10r06yl8pygnahzv3cf9j31f22l1jfbrcwba222x3m7gx6q5dsxk";
       setupHaskellDepends = [
         base
         Cabal
@@ -500088,12 +505062,12 @@ self: {
     }
   ) { };
 
-  ogma-language-copilot_1_12_0 = callPackage (
+  ogma-language-copilot_1_13_0 = callPackage (
     { mkDerivation, base }:
     mkDerivation {
       pname = "ogma-language-copilot";
-      version = "1.12.0";
-      sha256 = "1xcjf704lmwi94f4gbq1a9fcllphkqhv28kwgxsskazwkb65ql7z";
+      version = "1.13.0";
+      sha256 = "1ibaf4ic2yc3i9mhg0f97iyvxxqwws8h5x5n6r8n8wmsrn7k9isp";
       libraryHaskellDepends = [ base ];
       description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints";
       license = lib.licenses.asl20;
@@ -500130,7 +505104,7 @@ self: {
     }
   ) { };
 
-  ogma-language-csv_1_12_0 = callPackage (
+  ogma-language-csv_1_13_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -500143,8 +505117,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-csv";
-      version = "1.12.0";
-      sha256 = "0cwfzpnlb1m9vphkzq3w7mxkby6vp1cda9iaz62364khglixzk61";
+      version = "1.13.0";
+      sha256 = "0zx4wawgngr6377x3a288pmlbbgi6nvq15lfpx49qc46ys8af05c";
       libraryHaskellDepends = [
         base
         bytestring
@@ -500265,7 +505239,7 @@ self: {
     }
   ) { };
 
-  ogma-language-jsonspec_1_12_0 = callPackage (
+  ogma-language-jsonspec_1_13_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -500279,8 +505253,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-jsonspec";
-      version = "1.12.0";
-      sha256 = "1hr7a7pjwm52njnrg8ps9pwqgq88ls3vsr0nms49lz92xlnx150x";
+      version = "1.13.0";
+      sha256 = "0gjbn5ggpjirx2hfy8w77y0pfcpjsjmbmvdk9sx24ma1wbmbg34b";
       libraryHaskellDepends = [
         aeson
         base
@@ -500340,7 +505314,7 @@ self: {
     }
   ) { };
 
-  ogma-language-lustre_1_12_0 = callPackage (
+  ogma-language-lustre_1_13_0 = callPackage (
     {
       mkDerivation,
       alex,
@@ -500356,8 +505330,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-lustre";
-      version = "1.12.0";
-      sha256 = "0rw6nd91lwjd8mx79vx1fd9k7lv520x7ii8a8j3acgpmg736x5cc";
+      version = "1.13.0";
+      sha256 = "1f260y8qwqvx9ny9jjpkc7xhyhi89zk413kjabz7c7nsrlqb07y3";
       setupHaskellDepends = [
         base
         Cabal
@@ -500427,7 +505401,7 @@ self: {
     }
   ) { };
 
-  ogma-language-smv_1_12_0 = callPackage (
+  ogma-language-smv_1_13_0 = callPackage (
     {
       mkDerivation,
       alex,
@@ -500443,8 +505417,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-smv";
-      version = "1.12.0";
-      sha256 = "0xw93x9i2xdydwmnbm55jjx1l7ibavr5bd9dkamyhwanc3mr828x";
+      version = "1.13.0";
+      sha256 = "0l1ikxp8dasjlx16s8xmii1d1qla88hk03wdi5jlhxz9zgs25khs";
       setupHaskellDepends = [
         base
         Cabal
@@ -500496,7 +505470,7 @@ self: {
     }
   ) { };
 
-  ogma-language-xlsx_1_12_0 = callPackage (
+  ogma-language-xlsx_1_13_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -500507,8 +505481,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-xlsx";
-      version = "1.12.0";
-      sha256 = "1y4nwwaqqsr2dsw5zixvfjqfphhbxmacdid6z6kw16lng7dwksfg";
+      version = "1.13.0";
+      sha256 = "0v9m2fzi5crl7scwscpxf3y7spq7qx97jl34hc605xl4dgg1s2wm";
       libraryHaskellDepends = [
         base
         bytestring
@@ -500551,7 +505525,7 @@ self: {
     }
   ) { };
 
-  ogma-language-xmlspec_1_12_0 = callPackage (
+  ogma-language-xmlspec_1_13_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -500564,8 +505538,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-xmlspec";
-      version = "1.12.0";
-      sha256 = "0p6dzvy445330zl1kiz46jfd6kapkvaddsl6sp549d3zd29db2rr";
+      version = "1.13.0";
+      sha256 = "198p0910rgs0bgwz7n3v3h05yx91h22np2hdhxvr4rv8mdx5iznk";
       libraryHaskellDepends = [
         base
         hxt
@@ -500593,12 +505567,12 @@ self: {
     }
   ) { };
 
-  ogma-spec_1_12_0 = callPackage (
+  ogma-spec_1_13_0 = callPackage (
     { mkDerivation, base }:
     mkDerivation {
       pname = "ogma-spec";
-      version = "1.12.0";
-      sha256 = "1da8sq40zj22grc34qfnlchys70ai3n5plfjq1b8w47x83cww51q";
+      version = "1.13.0";
+      sha256 = "0f1yr25391mdchk0m06ybwpsjhw2bmmc5bmljr6gj6abz4vvxsrd";
       libraryHaskellDepends = [ base ];
       description = "Ogma: Runtime Monitor translator: JSON Frontend";
       license = lib.licenses.asl20;
@@ -501030,6 +506004,8 @@ self: {
       pname = "ollama-haskell";
       version = "0.2.1.0";
       sha256 = "0xs28lq5x7bc5qf35n2g2vnchvy0fw88yg0qvv4fl7swf15wdr0i";
+      revision = "2";
+      editedCabalFile = "1b1awcaps3819b990w9sl0b7jf635mncgxq4kq8naxp0kcw0asny";
       libraryHaskellDepends = [
         aeson
         base
@@ -502138,6 +507114,44 @@ self: {
     }
   ) { };
 
+  one = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      doctest,
+      hashable,
+      lens,
+      process,
+      text,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "one";
+      version = "0.0.1";
+      sha256 = "13a97d6d76ahw29gg26yw2jdc4vh6wk1swqziczmyjn3i2hfr72l";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        hashable
+        lens
+        text
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        base
+        process
+      ];
+      testToolDepends = [ doctest ];
+      description = "One";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   one-line-aeson-text = callPackage (
     {
       mkDerivation,
@@ -502211,6 +507225,8 @@ self: {
       pname = "one-liner-instances";
       version = "0.1.3.0";
       sha256 = "0qkvbrxgnr51a0hdd2ap6fndipgfplsdy4lh841h8hda5d4dhabg";
+      revision = "1";
+      editedCabalFile = "1qwc28z55vqhyr04l0imsb7s3dzaa35rmsi9mfs8jmyz4d92808n";
       libraryHaskellDepends = [
         base
         one-liner
@@ -503226,6 +508242,7 @@ self: {
       description = "Open type representations and dynamic types";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -503826,6 +508843,117 @@ self: {
     }
   ) { };
 
+  openapi3_3_2_5 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      base,
+      base-compat-batteries,
+      bytestring,
+      Cabal,
+      cabal-doctest,
+      containers,
+      cookie,
+      doctest,
+      generics-sop,
+      Glob,
+      hashable,
+      hspec,
+      hspec-discover,
+      http-media,
+      HUnit,
+      insert-ordered-containers,
+      lens,
+      mtl,
+      optics-core,
+      optics-th,
+      QuickCheck,
+      quickcheck-instances,
+      scientific,
+      template-haskell,
+      text,
+      time,
+      transformers,
+      unordered-containers,
+      utf8-string,
+      uuid-types,
+      vector,
+    }:
+    mkDerivation {
+      pname = "openapi3";
+      version = "3.2.5";
+      sha256 = "1gklvs8qf8npip0w1i324z32jn792zqbbm6208a4b3sk4gw2mxi6";
+      isLibrary = true;
+      isExecutable = true;
+      setupHaskellDepends = [
+        base
+        Cabal
+        cabal-doctest
+      ];
+      libraryHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        base-compat-batteries
+        bytestring
+        containers
+        cookie
+        generics-sop
+        hashable
+        http-media
+        insert-ordered-containers
+        lens
+        mtl
+        optics-core
+        optics-th
+        QuickCheck
+        scientific
+        template-haskell
+        text
+        time
+        transformers
+        unordered-containers
+        uuid-types
+        vector
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        lens
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        base-compat-batteries
+        bytestring
+        containers
+        doctest
+        Glob
+        hashable
+        hspec
+        HUnit
+        insert-ordered-containers
+        lens
+        mtl
+        QuickCheck
+        quickcheck-instances
+        template-haskell
+        text
+        time
+        unordered-containers
+        utf8-string
+        vector
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "OpenAPI 3.0 data model";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "example";
+    }
+  ) { };
+
   openapi3-code-generator = callPackage (
     {
       mkDerivation,
@@ -503972,8 +509100,8 @@ self: {
     }:
     mkDerivation {
       pname = "opencascade-hs";
-      version = "0.6.1.0";
-      sha256 = "16ird3yvscnjfnpfjxsvzlc7g2h7frylw7dqqf10xr2d0hx1icpw";
+      version = "0.6.2.1";
+      sha256 = "19i6rbqm4s88i91hjdzjyz520iimxd6s0x6m5sg6x5vdzxn6jjn8";
       libraryHaskellDepends = [
         base
         resourcet
@@ -506684,7 +511812,7 @@ self: {
     }
   ) { };
 
-  opt-env-conf_0_13_0_0 = callPackage (
+  opt-env-conf_0_15_0_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -506709,8 +511837,8 @@ self: {
     }:
     mkDerivation {
       pname = "opt-env-conf";
-      version = "0.13.0.0";
-      sha256 = "0s7g5h3z0if85pgxcm1dshyqhnsrvjvfwgdf65jyhdhmnlkxws4a";
+      version = "0.15.0.1";
+      sha256 = "15d6vn1c9ci26h9jh9ghw0m45j890y9kh4y140rs0gda8hxa6nq7";
       libraryHaskellDepends = [
         aeson
         autodocodec
@@ -507557,10 +512685,8 @@ self: {
     }:
     mkDerivation {
       pname = "optparse-generic";
-      version = "1.5.2";
-      sha256 = "0dca5q57jv4b8l1af4ywimaiw9rfrysambcghfmll4il5prm3d67";
-      revision = "3";
-      editedCabalFile = "0rmfwb4plak9vymdcf553ml7b5kpx81arjszwk4fsswx3mry6kif";
+      version = "1.5.3";
+      sha256 = "1ikkq0dkyz7phrzm5dazibmabixmx72lf0xgy8p5pjdlwq70fn9i";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -509296,6 +514422,8 @@ self: {
       pname = "orthotope";
       version = "0.1.8.0";
       sha256 = "03iik8v6vz30jnyg0dcn2ylmpm3y5zgwfclx86qkjhraa49djngz";
+      revision = "1";
+      editedCabalFile = "1fcnv7zjqcyb30nnf08pqak8wjacyzqpppijp2axl01v63nkma6s";
       libraryHaskellDepends = [
         base
         deepseq
@@ -510628,11 +515756,12 @@ self: {
       tasty-hedgehog,
       template-haskell,
       vector,
+      vector-stream,
     }:
     mkDerivation {
       pname = "ox-arrays";
-      version = "0.1.0.0";
-      sha256 = "0kix255p5n1dg9y3s00il3x4s1r4d3fn1v6ljm6zgy8j40lg1nzh";
+      version = "0.2.0.1";
+      sha256 = "0lq1c4bdnj3ssjjj8qa6vkvaj3shnz87x7z98s9xrxy0hv4b82bp";
       libraryHaskellDepends = [
         base
         deepseq
@@ -510641,6 +515770,7 @@ self: {
         orthotope
         template-haskell
         vector
+        vector-stream
       ];
       testHaskellDepends = [
         base
@@ -511017,6 +516147,8 @@ self: {
       pname = "package-version";
       version = "0.4.1";
       sha256 = "116r62wk0pyp1cqhsfjsp0jchyqf5638by6vl7k3c7ylac6ki45c";
+      revision = "1";
+      editedCabalFile = "0y8zp2nxjsjq90q5b035g6r5k2p4gynh1wjgx7mz14kgh9qcfskm";
       libraryHaskellDepends = [
         base
         bytestring
@@ -511539,6 +516671,8 @@ self: {
       hashable,
       int-cast,
       persist,
+      QuickCheck,
+      sandwich,
       text,
       text-show,
       time,
@@ -511547,8 +516681,8 @@ self: {
     }:
     mkDerivation {
       pname = "packstream-bolt";
-      version = "0.1.0.0";
-      sha256 = "1ws1k7xcmdq66y5iq2lc53zx1y66r558vy06iinnq2mvsqjhlpcw";
+      version = "0.1.0.1";
+      sha256 = "0ixbwisx5zkdzmvkzcv951x6c67kn47f6n4f5kl6flkzjb70wpiz";
       libraryHaskellDepends = [
         base
         bytestring
@@ -511562,6 +516696,15 @@ self: {
         unordered-containers
         vector
       ];
+      testHaskellDepends = [
+        base
+        bytestring
+        QuickCheck
+        sandwich
+        text
+        unordered-containers
+        vector
+      ];
       description = "PackStream binary serialization format";
       license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
@@ -512740,7 +517883,7 @@ self: {
     }
   ) { };
 
-  pandoc_3_9 = callPackage (
+  pandoc_3_9_0_2 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -512827,8 +517970,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc";
-      version = "3.9";
-      sha256 = "0y8nr10lmp0bsx2lsr8lcnlw8aj15fq9zq5bpfx0h1sd5z74932s";
+      version = "3.9.0.2";
+      sha256 = "0v1b3n9sn25kblhnzn1p0l5pv0raj93byx75jqbssnj854qshik4";
       configureFlags = [ "-f-trypandoc" ];
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
@@ -513159,7 +518302,7 @@ self: {
     }
   ) { };
 
-  pandoc-cli_3_9 = callPackage (
+  pandoc-cli_3_9_0_2 = callPackage (
     {
       mkDerivation,
       base,
@@ -513175,8 +518318,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc-cli";
-      version = "3.9";
-      sha256 = "1a94m8hdljqjh19753qph75xikd1y3bl79i1bbbi5vx07p2h0vnx";
+      version = "3.9.0.2";
+      sha256 = "084q8f3y9p2a4vjaqir56r35fjb277i6pkwn1kl3r7xgqjw3a1bj";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -514071,7 +519214,7 @@ self: {
     }
   ) { };
 
-  pandoc-lua-engine_0_5_1 = callPackage (
+  pandoc-lua-engine_0_5_2 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -514108,8 +519251,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc-lua-engine";
-      version = "0.5.1";
-      sha256 = "12p9f7x9bs3yark9k4nfx43c2pbgq9l1w69c60j1m7hpzh0w3ik2";
+      version = "0.5.2";
+      sha256 = "08lg5qsacgll5yvbh28r4x79hzhl7vm6jn8xw5wrqf9wgd7rbblk";
       libraryHaskellDepends = [
         aeson
         base
@@ -517757,6 +522900,89 @@ self: {
     }
   ) { };
 
+  parquet-haskell = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      binary,
+      binary-conduit,
+      bytestring,
+      conduit,
+      conduit-extra,
+      containers,
+      filepath,
+      generic-lens,
+      hspec,
+      http-client,
+      http-conduit,
+      http-types,
+      lens,
+      lifted-async,
+      monad-logger,
+      mtl,
+      pinch,
+      pretty-simple,
+      process,
+      QuickCheck,
+      relude,
+      safe,
+      serialise,
+      text,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "parquet-haskell";
+      version = "0.1.1.0";
+      sha256 = "07hr3prv5849c3jf1dpk8qnka5084h6xfbgllfxmqcfmg4gjgzw0";
+      libraryHaskellDepends = [
+        aeson
+        base
+        binary
+        binary-conduit
+        bytestring
+        conduit
+        conduit-extra
+        containers
+        generic-lens
+        http-client
+        http-conduit
+        http-types
+        lens
+        lifted-async
+        monad-logger
+        mtl
+        pinch
+        pretty-simple
+        relude
+        safe
+        serialise
+        text
+        unordered-containers
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        binary
+        bytestring
+        conduit
+        filepath
+        hspec
+        monad-logger
+        mtl
+        pretty-simple
+        process
+        QuickCheck
+        text
+      ];
+      description = "Streaming Parquet reader";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   parquet-hs = callPackage (
     {
       mkDerivation,
@@ -519777,8 +525003,8 @@ self: {
     }:
     mkDerivation {
       pname = "password";
-      version = "3.1.0.1";
-      sha256 = "11vy7i86dwks1zx4bw7nnp0wj0a1cz2zs1ir4psjcvq9ayhl9fpp";
+      version = "3.1.0.2";
+      sha256 = "0l4w8fyl32abyyrfb1ihnwa45bm8g8wvh5vk51iqg61pizjs7k7j";
       setupHaskellDepends = [
         base
         Cabal
@@ -519819,6 +525045,128 @@ self: {
     }
   ) { };
 
+  password-aeson = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      base-compat,
+      Cabal,
+      cabal-doctest,
+      doctest,
+      password,
+      password-types,
+      quickcheck-instances,
+      tasty,
+      tasty-quickcheck,
+      text,
+    }:
+    mkDerivation {
+      pname = "password-aeson";
+      version = "0.1.0.0";
+      sha256 = "18yx6n3iji3sygd4svscf31bz84gvsdsajgcasv2hdyp7v5fwzbz";
+      setupHaskellDepends = [
+        base
+        Cabal
+        cabal-doctest
+      ];
+      libraryHaskellDepends = [
+        aeson
+        base
+        password-types
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        base-compat
+        doctest
+        password
+        password-types
+        quickcheck-instances
+        tasty
+        tasty-quickcheck
+        text
+      ];
+      description = "aeson typeclass instances for password package";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
+  password-cli = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      optparse-applicative,
+      password,
+      password-types,
+      text,
+    }:
+    mkDerivation {
+      pname = "password-cli";
+      version = "0.1.1.0";
+      sha256 = "1lrr15w65h3gb33qhr42gv1dklbm9mg7brz6y25yhy862kwwk9xj";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        base
+        bytestring
+        optparse-applicative
+        password
+        password-types
+        text
+      ];
+      description = "use password from your CLI";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "password-cli";
+    }
+  ) { };
+
+  password-http-api-data = callPackage (
+    {
+      mkDerivation,
+      base,
+      base-compat,
+      Cabal,
+      cabal-doctest,
+      doctest,
+      http-api-data,
+      password,
+      password-types,
+      quickcheck-instances,
+      tasty,
+      tasty-quickcheck,
+    }:
+    mkDerivation {
+      pname = "password-http-api-data";
+      version = "0.1.0.0";
+      sha256 = "0gm07c9y6brgfjqcg7mcp4idgw9nzd0v89i85ahd4j9fmk9p0ch0";
+      setupHaskellDepends = [
+        base
+        Cabal
+        cabal-doctest
+      ];
+      libraryHaskellDepends = [
+        base
+        http-api-data
+        password-types
+      ];
+      testHaskellDepends = [
+        base
+        base-compat
+        doctest
+        http-api-data
+        password
+        password-types
+        quickcheck-instances
+        tasty
+        tasty-quickcheck
+      ];
+      description = "http-api-data typeclass instances for password package";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   password-instances = callPackage (
     {
       mkDerivation,
@@ -519880,6 +525228,83 @@ self: {
     }
   ) { };
 
+  password-instances_3_1_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      Cabal,
+      password-aeson,
+      password-http-api-data,
+      password-persistent,
+    }:
+    mkDerivation {
+      pname = "password-instances";
+      version = "3.1.0.0";
+      sha256 = "052af2wxj9s27za6j3xw2a2qr5rpspj1gjfxdnri5d9rqabd4wsy";
+      setupHaskellDepends = [
+        base
+        Cabal
+      ];
+      libraryHaskellDepends = [
+        base
+        password-aeson
+        password-http-api-data
+        password-persistent
+      ];
+      description = "typeclass instances for password package";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.cdepillabout ];
+    }
+  ) { };
+
+  password-persistent = callPackage (
+    {
+      mkDerivation,
+      base,
+      base-compat,
+      Cabal,
+      cabal-doctest,
+      doctest,
+      password,
+      password-types,
+      persistent,
+      quickcheck-instances,
+      tasty,
+      tasty-quickcheck,
+      text,
+    }:
+    mkDerivation {
+      pname = "password-persistent";
+      version = "0.1.0.0";
+      sha256 = "06803h6n1j72b8gdk39wh56mvxyf6s9f9yz0cb3pw85rlb2f1ml5";
+      setupHaskellDepends = [
+        base
+        Cabal
+        cabal-doctest
+      ];
+      libraryHaskellDepends = [
+        base
+        password-types
+        persistent
+        text
+      ];
+      testHaskellDepends = [
+        base
+        base-compat
+        doctest
+        password
+        password-types
+        persistent
+        quickcheck-instances
+        tasty
+        tasty-quickcheck
+      ];
+      description = "persistent typeclass instances for password package";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   password-types = callPackage (
     {
       mkDerivation,
@@ -526477,8 +531902,8 @@ self: {
     }:
     mkDerivation {
       pname = "persistent-mysql-pure";
-      version = "1.0.3";
-      sha256 = "145zjyyghsg9as5ymwgs18529vbkyrw5bq66574pbap13rhs82lk";
+      version = "1.0.4";
+      sha256 = "0w2am7667pmsmcx78mb73ymynl7xz68j3yrcnq85xixj0jqy4355";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -528362,6 +533787,82 @@ self: {
     }
   ) { };
 
+  pg-schema = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      case-insensitive,
+      containers,
+      deepseq,
+      directory,
+      exceptions,
+      hashable,
+      hedgehog,
+      mtl,
+      postgresql-simple,
+      resource-pool,
+      scientific,
+      singletons,
+      singletons-th,
+      tasty,
+      tasty-hedgehog,
+      text,
+      time,
+      unordered-containers,
+      uuid-types,
+      vector,
+    }:
+    mkDerivation {
+      pname = "pg-schema";
+      version = "0.6.0.0";
+      sha256 = "09ypr1az4sdqi19bqn9mv12h1aqiwc7brccp0hq2hyf8ys8bd61y";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        case-insensitive
+        containers
+        directory
+        exceptions
+        mtl
+        postgresql-simple
+        scientific
+        singletons
+        singletons-th
+        text
+        time
+        uuid-types
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        case-insensitive
+        deepseq
+        directory
+        hashable
+        hedgehog
+        postgresql-simple
+        resource-pool
+        scientific
+        singletons
+        tasty
+        tasty-hedgehog
+        text
+        time
+        unordered-containers
+        uuid-types
+        vector
+      ];
+      description = "Type-level definition of database schema and safe DML for PostgreSQL";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   pg-store = callPackage (
     {
       mkDerivation,
@@ -528622,11 +534123,12 @@ self: {
       tasty,
       tasty-hunit,
       text,
+      time,
     }:
     mkDerivation {
       pname = "pgmq-config";
-      version = "0.1.3.0";
-      sha256 = "0llfbcra52jqrwy6bngl2hik9vlfgg1xndlmv3s6iblcj838j53h";
+      version = "0.2.0.0";
+      sha256 = "0y5vgas8hixs57ygh7wcy76jikzlw567vc83w1ygjk6ssdx2vd1g";
       libraryHaskellDepends = [
         base
         containers
@@ -528654,6 +534156,7 @@ self: {
         tasty
         tasty-hunit
         text
+        time
       ];
       description = "Declarative queue configuration for PGMQ (PostgreSQL Message Queue)";
       license = lib.meta.getLicenseFromSpdxId "MIT";
@@ -528672,8 +534175,8 @@ self: {
     }:
     mkDerivation {
       pname = "pgmq-core";
-      version = "0.1.3.0";
-      sha256 = "1bi3ih43gy1pj6hrnsbbzx5jyz7519asxvp1mck00x4q8c3f0fag";
+      version = "0.2.0.0";
+      sha256 = "0pfiflhnaqnpxv8srblr5s11aqvy3jkq70v1ggbsji1a9q6zh4n8";
       libraryHaskellDepends = [
         aeson
         base
@@ -528694,13 +534197,23 @@ self: {
       aeson,
       base,
       bytestring,
+      case-insensitive,
       effectful-core,
+      ephemeral-pg,
       hasql,
       hasql-pool,
       hs-opentelemetry-api,
+      hs-opentelemetry-exporter-in-memory,
       hs-opentelemetry-propagator-w3c,
+      hs-opentelemetry-sdk,
+      hs-opentelemetry-semantic-conventions,
+      http-types,
       pgmq-core,
       pgmq-hasql,
+      pgmq-migration,
+      random,
+      tasty,
+      tasty-hunit,
       text,
       unliftio,
       unordered-containers,
@@ -528708,17 +534221,19 @@ self: {
     }:
     mkDerivation {
       pname = "pgmq-effectful";
-      version = "0.1.3.0";
-      sha256 = "1f6aj5s7y8mby6z7dp5qqcmxpl85dxhyvxk8cqwlndjj10d46ck3";
+      version = "0.2.0.0";
+      sha256 = "07d2zzg9s5n43k29xx7gqlpjjk21jgb58sv392i7wdvm9g5byhd8";
       libraryHaskellDepends = [
         aeson
         base
         bytestring
+        case-insensitive
         effectful-core
         hasql
         hasql-pool
         hs-opentelemetry-api
-        hs-opentelemetry-propagator-w3c
+        hs-opentelemetry-semantic-conventions
+        http-types
         pgmq-core
         pgmq-hasql
         text
@@ -528726,6 +534241,27 @@ self: {
         unordered-containers
         vector
       ];
+      testHaskellDepends = [
+        aeson
+        base
+        effectful-core
+        ephemeral-pg
+        hasql
+        hasql-pool
+        hs-opentelemetry-api
+        hs-opentelemetry-exporter-in-memory
+        hs-opentelemetry-propagator-w3c
+        hs-opentelemetry-sdk
+        hs-opentelemetry-semantic-conventions
+        pgmq-core
+        pgmq-migration
+        random
+        tasty
+        tasty-hunit
+        text
+        unordered-containers
+        vector
+      ];
       description = "Effectful effects for PGMQ (PostgreSQL Message Queue)";
       license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
@@ -528758,8 +534294,8 @@ self: {
     }:
     mkDerivation {
       pname = "pgmq-hasql";
-      version = "0.1.3.0";
-      sha256 = "03iwplvsbw4cq6m90bkarlwyxj8p30kn738ahv5za5a8dz2zkwrm";
+      version = "0.2.0.0";
+      sha256 = "128k8q1g78nb56282dmbgkjdic1acc5607fmg6cvdmh9xwmf5cv6";
       libraryHaskellDepends = [
         aeson
         base
@@ -528814,8 +534350,8 @@ self: {
     }:
     mkDerivation {
       pname = "pgmq-migration";
-      version = "0.1.3.0";
-      sha256 = "09imp5ynin48hv93n8073rr855c3zbw85vlqnbxgh3zkbmpl8qvr";
+      version = "0.2.0.0";
+      sha256 = "17yykj64dabc65hwzgdnq98v2qxr9q7cg5zhyhixybgi7s1c7ync";
       libraryHaskellDepends = [
         base
         bytestring
@@ -529287,8 +534823,8 @@ self: {
     }:
     mkDerivation {
       pname = "phino";
-      version = "0.0.0.65";
-      sha256 = "1abm32pm9zfqyg68pmnswf447mlrzdzjcg4a9risqwaj8jyx56sn";
+      version = "0.0.0.67";
+      sha256 = "160lkhc47i3k0sranhjx5k0mk9w9gm8q8iwizrwdq1n8qcanp5vv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -536703,10 +542239,12 @@ self: {
       async,
       base,
       bytestring,
+      case-insensitive,
       containers,
       directory,
       filepath,
       network,
+      resource-pool,
       stm,
       streaming,
       text,
@@ -536715,18 +542253,20 @@ self: {
     }:
     mkDerivation {
       pname = "plexus-protocol";
-      version = "0.3.0.0";
-      sha256 = "06rxyfr1910hpsiz1c5ygkg5jjpmaifmf9a943ml7ys9a153vq9c";
+      version = "0.5.0.0";
+      sha256 = "04ahh6l0bsd4x9i5xi8xx76j5risygrdvwxfihsv1x3x8c9kngny";
       libraryHaskellDepends = [
         aeson
         aeson-casing
         async
         base
         bytestring
+        case-insensitive
         containers
         directory
         filepath
         network
+        resource-pool
         stm
         streaming
         text
@@ -536751,9 +542291,11 @@ self: {
       bytestring,
       containers,
       directory,
+      fast-logger,
       filepath,
       hashable,
       hspec,
+      katip,
       mtl,
       mustache,
       network,
@@ -536775,20 +542317,23 @@ self: {
     }:
     mkDerivation {
       pname = "plexus-synapse";
-      version = "3.5.0";
-      sha256 = "02byicw0s0z515ks9ajv058r40k2951kkjii96whgzp61facx737";
+      version = "3.13.0";
+      sha256 = "0zp5jqmzg4kfq6snw1m3d68rmhbx91vcjmiaj89k1y7wi7w2qi07";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         aeson
+        aeson-pretty
         array
         async
         base
         bytestring
         containers
         directory
+        fast-logger
         filepath
         hashable
+        katip
         mtl
         mustache
         network
@@ -536814,6 +542359,7 @@ self: {
         containers
         directory
         filepath
+        katip
         mtl
         optparse-applicative
         plexus-protocol
@@ -536827,11 +542373,14 @@ self: {
         base
         bytestring
         containers
+        directory
         hspec
+        katip
         plexus-protocol
         process
         text
         vector
+        websockets
       ];
       description = "Schema-driven CLI for Plexus RPC servers";
       license = lib.meta.getLicenseFromSpdxId "MIT";
@@ -545038,8 +550587,8 @@ self: {
     }:
     mkDerivation {
       pname = "postgres-websockets";
-      version = "0.11.2.5";
-      sha256 = "1f4k7gmy76l18i63zkc3lsc2a99qmaqddb1gdpnkh4z4l77cab5p";
+      version = "0.12.0.0";
+      sha256 = "0y425aq3jn38k98ammprklscw8y13hx7n2ibgpcz91anpk6cir0h";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -545831,8 +551380,8 @@ self: {
     }:
     mkDerivation {
       pname = "postgresql-operation-counting";
-      version = "0.1.0.0";
-      sha256 = "1dlqlz59na8yzzan2yiihyp27nkjkxx79gqffjr4rjfkkjpr0niq";
+      version = "0.1.0.1";
+      sha256 = "1mjrili534bc8jgkch5ndnam9wcfxrgccggvfnbf5fbx9wcf2krc";
       libraryHaskellDepends = [
         base
         containers
@@ -546751,6 +552300,7 @@ self: {
       description = "Integration of \"postgresql-simple\" with \"postgresql-types\"";
       license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -546929,8 +552479,8 @@ self: {
     }:
     mkDerivation {
       pname = "postgresql-syntax";
-      version = "0.4.3";
-      sha256 = "1r55wwr34nbc3xzwibbkx5qg0dfxfvbf9h1pghpcqyvm4ycdpscw";
+      version = "0.4.3.1";
+      sha256 = "00hhws1krj80g8dkqgn45zkad1v15hiiahgq8h5wbdmqlap58pqd";
       libraryHaskellDepends = [
         base
         bytestring
@@ -547298,8 +552848,8 @@ self: {
     }:
     mkDerivation {
       pname = "postgresql-types";
-      version = "0.1.3";
-      sha256 = "1i9djnaxgkd4ljw2hynr8xyqvlr8acifdp1kfabmbpbx755jjkmr";
+      version = "0.1.3.2";
+      sha256 = "1g2209vs1k5s1f52x1zcg2864j41lr31m7kqmfrl5hysb7zfpn07";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -547351,7 +552901,6 @@ self: {
       doHaddock = false;
       description = "Precise PostgreSQL types representation and driver-agnostic codecs";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -547369,8 +552918,8 @@ self: {
     }:
     mkDerivation {
       pname = "postgresql-types-algebra";
-      version = "0.1";
-      sha256 = "1r1s37nc6bk77r5fzva5nhil4rr99hc3wgcby00nq2rg8jfwlh3c";
+      version = "0.1.0.1";
+      sha256 = "0dc43j0xp1lc8cvcp2jxvyzav7x30alnr59j79hssf6yrdd3xjvs";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -547383,7 +552932,6 @@ self: {
       ];
       description = "Type classes for PostgreSQL type mappings";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -548743,6 +554291,388 @@ self: {
     }
   ) { };
 
+  ppad-bolt1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      criterion,
+      deepseq,
+      ppad-base16,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      weigh,
+    }:
+    mkDerivation {
+      pname = "ppad-bolt1";
+      version = "0.0.1";
+      sha256 = "1kw9f10yr01n2izarfj1wczqf58g42hx1ijpjhrn6kdxh7cflyhd";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        deepseq
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        ppad-base16
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+        weigh
+      ];
+      description = "Base protocol per BOLT #1";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  ppad-bolt2 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      criterion,
+      deepseq,
+      ppad-base16,
+      ppad-bolt1,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      weigh,
+    }:
+    mkDerivation {
+      pname = "ppad-bolt2";
+      version = "0.0.1";
+      sha256 = "0hffa1waxn4rdxkv4720h9jpb5rpcpvvycgxdw47ml1z3jy2wz5s";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        deepseq
+        ppad-bolt1
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        ppad-base16
+        ppad-bolt1
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+        ppad-bolt1
+        weigh
+      ];
+      description = "Peer protocol per BOLT #2";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  ppad-bolt3 = callPackage (
+    {
+      mkDerivation,
+      base,
+      base16-bytestring,
+      bytestring,
+      criterion,
+      deepseq,
+      ppad-ripemd160,
+      ppad-secp256k1,
+      ppad-sha256,
+      tasty,
+      tasty-hunit,
+      weigh,
+    }:
+    mkDerivation {
+      pname = "ppad-bolt3";
+      version = "0.0.1";
+      sha256 = "01yd0bwdipx2nid1mgwnhgwy1yz2vvngjiii4b2fn9x88f0ld3ry";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        ppad-ripemd160
+        ppad-secp256k1
+        ppad-sha256
+      ];
+      testHaskellDepends = [
+        base
+        base16-bytestring
+        bytestring
+        tasty
+        tasty-hunit
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+        weigh
+      ];
+      description = "Bitcoin transaction formats per BOLT #3";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ppad-bolt4 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      criterion,
+      deepseq,
+      ppad-aead,
+      ppad-base16,
+      ppad-chacha,
+      ppad-fixed,
+      ppad-secp256k1,
+      ppad-sha256,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      weigh,
+    }:
+    mkDerivation {
+      pname = "ppad-bolt4";
+      version = "0.0.1";
+      sha256 = "0z5f4bfdbgn4zsi7ax3vniyms7k1pb8vakqfhkpmwp23kfvj88k5";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        ppad-aead
+        ppad-chacha
+        ppad-fixed
+        ppad-secp256k1
+        ppad-sha256
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        ppad-base16
+        ppad-secp256k1
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+        weigh
+      ];
+      description = "BOLT4 (onion routing) for Lightning Network";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ppad-bolt5 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      criterion,
+      deepseq,
+      ppad-bolt3,
+      ppad-sha256,
+      ppad-tx,
+      QuickCheck,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      weigh,
+    }:
+    mkDerivation {
+      pname = "ppad-bolt5";
+      version = "0.0.1";
+      sha256 = "14w7mm6g0lw6drybngkbmx9h9fq2ckzhd1c1mnfkdkp3flxkci28";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        ppad-bolt3
+        ppad-sha256
+        ppad-tx
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        ppad-bolt3
+        ppad-tx
+        QuickCheck
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+        ppad-bolt3
+        ppad-tx
+        weigh
+      ];
+      description = "On-chain transaction handling per BOLT #5";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ppad-bolt7 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      criterion,
+      deepseq,
+      ppad-base16,
+      ppad-bolt1,
+      ppad-sha256,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      weigh,
+    }:
+    mkDerivation {
+      pname = "ppad-bolt7";
+      version = "0.0.1";
+      sha256 = "100fcmpbcxh964ccw2dlspyr3hlhag78bzqrmfqyzv08hidw73bh";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        deepseq
+        ppad-bolt1
+        ppad-sha256
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        ppad-base16
+        ppad-bolt1
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+        ppad-bolt1
+        weigh
+      ];
+      description = "Routing gossip per BOLT #7";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ppad-bolt8 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      criterion,
+      deepseq,
+      ppad-aead,
+      ppad-base16,
+      ppad-hkdf,
+      ppad-secp256k1,
+      ppad-sha256,
+      QuickCheck,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      weigh,
+    }:
+    mkDerivation {
+      pname = "ppad-bolt8";
+      version = "0.0.1";
+      sha256 = "0a1czgibq2md57fq23p2aky51wq378ggkm4si2j4nqbpz5nip3ab";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        ppad-aead
+        ppad-hkdf
+        ppad-secp256k1
+        ppad-sha256
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        ppad-base16
+        QuickCheck
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+        weigh
+      ];
+      description = "Encrypted and authenticated transport per BOLT #8";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ppad-bolt9 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      criterion,
+      deepseq,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      weigh,
+    }:
+    mkDerivation {
+      pname = "ppad-bolt9";
+      version = "0.0.1";
+      sha256 = "0221y19pk032kppcjpppl34gawc0sccw4m899m2rwi2zqzgjs6n2";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        deepseq
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+        weigh
+      ];
+      description = "Feature flags per BOLT #9";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   ppad-chacha = callPackage (
     {
       mkDerivation,
@@ -549247,6 +555177,53 @@ self: {
     }
   ) { };
 
+  ppad-tx = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      criterion,
+      deepseq,
+      ppad-base16,
+      ppad-sha256,
+      QuickCheck,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      weigh,
+    }:
+    mkDerivation {
+      pname = "ppad-tx";
+      version = "0.1.0";
+      sha256 = "1ygm98x4s675l5ry3xl681pgz4g0rwal2n520zlylg4ccai470xy";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        ppad-base16
+        ppad-sha256
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        ppad-base16
+        QuickCheck
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+        weigh
+      ];
+      description = "Minimal Bitcoin transaction primitives";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   ppm = callPackage (
     {
       mkDerivation,
@@ -549402,7 +555379,7 @@ self: {
     }
   ) { };
 
-  pqueue_1_6_0_0 = callPackage (
+  pqueue_1_7_0_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -549415,10 +555392,8 @@ self: {
     }:
     mkDerivation {
       pname = "pqueue";
-      version = "1.6.0.0";
-      sha256 = "1bg9z0m062lggmzkrq29vz75d7mxxmx9ka1862j7qszj9gqmqnw6";
-      revision = "1";
-      editedCabalFile = "1g2xnsh8h8dddgagpivnbns5h7yzmwyhwcxwya6a0pdlisfi8rdm";
+      version = "1.7.0.0";
+      sha256 = "15fdy8swm144byl7qnrvl679mmcf5q71m1akfnhl14sd6d3lypr3";
       libraryHaskellDepends = [
         base
         deepseq
@@ -549438,7 +555413,7 @@ self: {
         tasty-bench
       ];
       description = "Reliable, persistent, fast priority queues";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -550464,8 +556439,8 @@ self: {
     }:
     mkDerivation {
       pname = "prelate";
-      version = "0.8.0.0";
-      sha256 = "1qx4s7v5lx7bbfscnccjsh25lgxdvjr975ddqd2hsm5ls8qbag5p";
+      version = "0.9.0.0";
+      sha256 = "06bsz3jfi40dqnzwxka7k914y8gyy3i08naw36nsypakfgb376ag";
       libraryHaskellDepends = [
         aeson
         base
@@ -552564,6 +558539,8 @@ self: {
       ];
       description = "Bindings to the primecount library";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { inherit (pkgs) primecount; };
 
@@ -554113,7 +560090,7 @@ self: {
     }
   ) { };
 
-  process_1_6_27_0 = callPackage (
+  process_1_6_28_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -554124,8 +560101,8 @@ self: {
     }:
     mkDerivation {
       pname = "process";
-      version = "1.6.27.0";
-      sha256 = "14xnd4kv3bdbcc6fza6ccnrccc65as0vnzr3dg8g6q1msckg97pf";
+      version = "1.6.28.0";
+      sha256 = "0sqmcci9xsfrzv84c4s7mhsdilqah06kkpaygq4jq3kmbxsipinn";
       libraryHaskellDepends = [
         base
         deepseq
@@ -556512,6 +562489,8 @@ self: {
       pname = "prometheus-client";
       version = "1.1.1";
       sha256 = "1j248vy67j0wqfbh5wgqxa4l99ynsf9r2651wghqc7b5973rww3a";
+      revision = "1";
+      editedCabalFile = "0x2b7bq2k7k8ww6aza330xpamgy1accabljan7fz0f78v32pm1js";
       libraryHaskellDepends = [
         atomic-primops
         base
@@ -557712,8 +563691,8 @@ self: {
     }:
     mkDerivation {
       pname = "proto-lens";
-      version = "0.7.1.6";
-      sha256 = "13jwrqynj0yq5j5gb4z84b7j5jr0d862cqyyqsdix673wvhsw7dx";
+      version = "0.7.1.7";
+      sha256 = "0fhmwxamwbdzvl4maw5l2hv15qrywqzyyn70f1jg01qdp6j2d62w";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         base
@@ -557757,8 +563736,8 @@ self: {
     }:
     mkDerivation {
       pname = "proto-lens-arbitrary";
-      version = "0.1.2.14";
-      sha256 = "1a80kr9l05q5isfqx5ya9yi0rwybjdnjl0hmdxfd2x7gpvv4rlza";
+      version = "0.1.2.15";
+      sha256 = "1zs9qgs13z1v02ksjdr03y3bjl4xl7rcz27d4g2021q81rfa60if";
       libraryHaskellDepends = [
         base
         bytestring
@@ -557928,8 +563907,8 @@ self: {
     }:
     mkDerivation {
       pname = "proto-lens-optparse";
-      version = "0.1.1.13";
-      sha256 = "1v9xm0zd8gc63hsxs3gz44v2mvgl998878c9yijf25fk3rg4d9mi";
+      version = "0.1.1.14";
+      sha256 = "0lyxzlxhcazwcck3nalip0l03fbpg6i8hcrzis6329nw9f2c16sz";
       libraryHaskellDepends = [
         base
         optparse-applicative
@@ -557956,8 +563935,8 @@ self: {
     }:
     mkDerivation {
       pname = "proto-lens-protobuf-types";
-      version = "0.7.2.2";
-      sha256 = "1k0idwvscsbyrlfz1fz5zvhdbi7l7i1qa6qnh1clhgp04avkwsk4";
+      version = "0.7.2.3";
+      sha256 = "0fp241gbaxnv5qj313rndrs622b1n8pg5i3i3my70vvqa8w0d4q6";
       setupHaskellDepends = [
         base
         Cabal
@@ -557998,8 +563977,8 @@ self: {
     }:
     mkDerivation {
       pname = "proto-lens-protoc";
-      version = "0.9.0.0";
-      sha256 = "077cwkznz9yg2lsha5gywalam4s0ccqpfplansvk5yvcajdqprmc";
+      version = "0.9.0.1";
+      sha256 = "0ip42sn4hf62pjy0rs1jbrnv5ihwrp0f2y0z4llnkc3lr8w46gji";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -558042,8 +564021,8 @@ self: {
     }:
     mkDerivation {
       pname = "proto-lens-runtime";
-      version = "0.7.0.7";
-      sha256 = "09gdpgsyf58h1xhbw2hzcxsv25yqhmmvp0z63fxcd20zr0fykxnh";
+      version = "0.7.0.8";
+      sha256 = "0f3cs61fy2567wvkxim25wdyb5czb17la2sb1va5s33di2551895";
       libraryHaskellDepends = [
         base
         bytestring
@@ -558077,8 +564056,8 @@ self: {
     }:
     mkDerivation {
       pname = "proto-lens-setup";
-      version = "0.4.0.9";
-      sha256 = "1j1cq7bdv0lgi9hzx9ncmn0vy5gykmfqg51cwzykri2k8623dcaw";
+      version = "0.4.0.10";
+      sha256 = "0azn06zd8xjp1nqrb1jkjxhn8r7rzndgwh4qq87p4r4chjlf0bs5";
       libraryHaskellDepends = [
         base
         bytestring
@@ -559877,6 +565856,60 @@ self: {
     }
   ) { };
 
+  ptr_0_16_8_8 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      cereal,
+      contravariant,
+      criterion,
+      profunctors,
+      QuickCheck,
+      quickcheck-instances,
+      rerebase,
+      strict-list,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      text,
+      time,
+      vector,
+    }:
+    mkDerivation {
+      pname = "ptr";
+      version = "0.16.8.8";
+      sha256 = "041m1k68f4mwgbz0l2c8h2c849ckmj697nl7l7pq36m0sm2ff8im";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        contravariant
+        profunctors
+        strict-list
+        text
+        time
+        vector
+      ];
+      testHaskellDepends = [
+        cereal
+        QuickCheck
+        quickcheck-instances
+        rerebase
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        cereal
+        criterion
+        rerebase
+      ];
+      description = "Experimental abstractions for operations on pointers";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   ptr-peeker = callPackage (
     {
       mkDerivation,
@@ -559924,8 +565957,6 @@ self: {
       ];
       description = "High-performance composable binary data deserializers";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -562741,6 +568772,59 @@ self: {
     }
   ) { };
 
+  pusher-http-haskell_2_1_0_23 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      base16-bytestring,
+      bytestring,
+      crypton,
+      hashable,
+      hspec,
+      http-client,
+      http-client-tls,
+      http-types,
+      QuickCheck,
+      ram,
+      text,
+      time,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "pusher-http-haskell";
+      version = "2.1.0.23";
+      sha256 = "0khqarh5jsn7ha7byrlhmg4wj105iy2b6nf2xbk9pgvvkisgixa8";
+      libraryHaskellDepends = [
+        aeson
+        base
+        base16-bytestring
+        bytestring
+        crypton
+        hashable
+        http-client
+        http-client-tls
+        http-types
+        ram
+        text
+        time
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        hspec
+        QuickCheck
+        text
+        unordered-containers
+      ];
+      description = "Haskell client library for the Pusher Channels HTTP API";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   pusher-ws = callPackage (
     {
       mkDerivation,
@@ -564333,8 +570417,6 @@ self: {
       ];
       description = "QR code library in pure Haskell";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -564364,7 +570446,6 @@ self: {
       ];
       description = "Converts a qrcode-core image to JuicyPixels";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -564554,8 +570635,8 @@ self: {
     }:
     mkDerivation {
       pname = "qtah-generator";
-      version = "0.9.0";
-      sha256 = "1ajpibrvlada2savl3ihn1hgwgikmmlif8gpxbfi92cgvf17j3gw";
+      version = "0.9.1";
+      sha256 = "0g9kayqi8gpa89r3fnd80jvkwlkgzwdwsw50xf51qxi6v9v7jwz0";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -565709,8 +571790,6 @@ self: {
       ];
       description = "Convenient SQL query language for Haskell (but only for single tables)";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -565747,8 +571826,8 @@ self: {
     }:
     mkDerivation {
       pname = "quic";
-      version = "0.3.0";
-      sha256 = "0rqa4wq1s3s2bs2zcl7bvmiqpsb2zabvlv46w5pbijsj6aamjrx5";
+      version = "0.3.2";
+      sha256 = "16g5dizm5gf1qidjl7njijpnn6svg9q2zw4ldry3z7klaq4ghsq8";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -565787,6 +571866,8 @@ self: {
         hspec
         network
         QuickCheck
+        ram
+        stm
         tls
         unix-time
       ];
@@ -566478,6 +572559,47 @@ self: {
     }
   ) { };
 
+  quickcheck-groups_0_0_1_6 = callPackage (
+    {
+      mkDerivation,
+      base,
+      groups,
+      hspec,
+      hspec-discover,
+      hspec-quickcheck-classes,
+      pretty-show,
+      QuickCheck,
+      quickcheck-classes,
+      semigroupoids,
+    }:
+    mkDerivation {
+      pname = "quickcheck-groups";
+      version = "0.0.1.6";
+      sha256 = "1jcn3nmm3l3xj753hksx2301wx3qb5i1f98yi6x2ifzfni9x974l";
+      libraryHaskellDepends = [
+        base
+        groups
+        pretty-show
+        QuickCheck
+        quickcheck-classes
+        semigroupoids
+      ];
+      testHaskellDepends = [
+        base
+        groups
+        hspec
+        hspec-quickcheck-classes
+        QuickCheck
+        quickcheck-classes
+      ];
+      testToolDepends = [ hspec-discover ];
+      doHaddock = false;
+      description = "Testing group class instances with QuickCheck";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   quickcheck-higherorder = callPackage (
     {
       mkDerivation,
@@ -566617,6 +572739,8 @@ self: {
       pname = "quickcheck-instances";
       version = "0.4";
       sha256 = "1wr7czlr1sk6l6gfka712qf28mnddrnmzl8fsahw16afrqpzwa7v";
+      revision = "2";
+      editedCabalFile = "1a92kzr8i8gb9klvnzv5af5wvqbxcq76w36xz25d082arfl9dlks";
       libraryHaskellDepends = [
         array
         base
@@ -566777,6 +572901,58 @@ self: {
     }
   ) { };
 
+  quickcheck-monoid-subclasses_0_3_0_7 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      commutative-semigroups,
+      containers,
+      hspec,
+      hspec-discover,
+      hspec-quickcheck-classes,
+      monoid-subclasses,
+      pretty-show,
+      QuickCheck,
+      quickcheck-classes,
+      semigroupoids,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "quickcheck-monoid-subclasses";
+      version = "0.3.0.7";
+      sha256 = "110d5m636396mmdafmidccqvwgq8a7xgs6dy782b5082cy7g9ddf";
+      libraryHaskellDepends = [
+        base
+        containers
+        monoid-subclasses
+        pretty-show
+        QuickCheck
+        quickcheck-classes
+        semigroupoids
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        commutative-semigroups
+        containers
+        hspec
+        hspec-quickcheck-classes
+        monoid-subclasses
+        QuickCheck
+        quickcheck-classes
+        text
+        vector
+      ];
+      testToolDepends = [ hspec-discover ];
+      doHaddock = false;
+      description = "Testing monoid subclass instances with QuickCheck";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   quickcheck-poly = callPackage (
     {
       mkDerivation,
@@ -566915,6 +573091,57 @@ self: {
     }
   ) { };
 
+  quickcheck-quid_0_0_1_9 = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      deepseq,
+      extra,
+      fmt,
+      hashable,
+      hspec,
+      hspec-discover,
+      hspec-quickcheck-classes,
+      pretty-simple,
+      primes,
+      QuickCheck,
+      quickcheck-classes,
+      text,
+    }:
+    mkDerivation {
+      pname = "quickcheck-quid";
+      version = "0.0.1.9";
+      sha256 = "0gzkxf3jhc5gpnwia70chakpgwzrl9bhfv83fycksc99q7qn433v";
+      libraryHaskellDepends = [
+        base
+        containers
+        deepseq
+        extra
+        hashable
+        QuickCheck
+        text
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        fmt
+        hspec
+        hspec-quickcheck-classes
+        pretty-simple
+        primes
+        QuickCheck
+        quickcheck-classes
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
+      doHaddock = false;
+      description = "Quasi-unique identifiers for QuickCheck";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   quickcheck-regex = callPackage (
     {
       mkDerivation,
@@ -569441,8 +575668,8 @@ self: {
     }:
     mkDerivation {
       pname = "railroad";
-      version = "0.1.1.1";
-      sha256 = "0jhjmzy8ym7136hfxbw49dkq7i4ixkckbvij3frnw0samh7acawk";
+      version = "0.1.1.2";
+      sha256 = "0bgq1wdggvpxvxmdiaml5wg3rna2bj7s6l7332f7shv3m4pnwpff";
       libraryHaskellDepends = [
         base
         effectful
@@ -569947,10 +576174,8 @@ self: {
     }:
     mkDerivation {
       pname = "ralist";
-      version = "0.4.0.0";
-      sha256 = "1axn2mh1jiz5d39ygf0hg7a0bkywnld4j8jjkflycks1yr7mxha1";
-      revision = "1";
-      editedCabalFile = "10i40p8xp4zm50lq3g0k6crsqg4rrwq12wkjpqqin9dsppw5085n";
+      version = "0.4.1.0";
+      sha256 = "0rlxr0p8v44f19p9mk3p6v7cg8j3qcv4c34iv0qf90g3khq8ybf3";
       libraryHaskellDepends = [
         base
         deepseq
@@ -569968,8 +576193,6 @@ self: {
       ];
       description = "Random access list with a list compatible interface";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -570006,8 +576229,8 @@ self: {
     }:
     mkDerivation {
       pname = "ram";
-      version = "0.21.1";
-      sha256 = "0gkr63maq8z15306l5qq8h0j1yaxrldn5ih8fncpppd1q37nwxj8";
+      version = "0.22.0";
+      sha256 = "05ax0g99h0rngw8hl2vz1wrjz5p1jbka8ybh7fgrs0kfqc8l0zig";
       libraryHaskellDepends = [
         base
         bytestring
@@ -570731,8 +576954,8 @@ self: {
     }:
     mkDerivation {
       pname = "random-mhs";
-      version = "1.3.2.1";
-      sha256 = "0i7xwdpghss1r5sd3nrsfwri6x624anfsn8c8pdqy7cd9kqq179y";
+      version = "1.3.2.2";
+      sha256 = "15waqqimyhbgnhiyb3109cskv2qcl6y3zdjps0qpdsr6884kixkb";
       libraryHaskellDepends = [
         base
         bytestring
@@ -571089,36 +577312,106 @@ self: {
       mkDerivation,
       base,
       Cabal,
+      containers,
+      deepseq,
+      doctest,
       free,
       parsec,
       QuickCheck,
       random,
+      tasty-bench,
       test-framework,
       test-framework-quickcheck2,
     }:
     mkDerivation {
       pname = "range";
-      version = "0.3.0.2";
-      sha256 = "0kvb5bl4k2gwm0hd71plwh7hmwbgk17g77iq39d7lqw4nmlg3j0k";
+      version = "0.3.2.2";
+      sha256 = "0f2rwmdv78dlxmj07zjpgnxak1b8qcf9lgbrj4zrz41858a1c3h5";
       libraryHaskellDepends = [
         base
+        deepseq
         free
         parsec
       ];
       testHaskellDepends = [
         base
         Cabal
+        containers
+        deepseq
+        doctest
         free
+        parsec
         QuickCheck
         random
         test-framework
         test-framework-quickcheck2
       ];
+      benchmarkHaskellDepends = [
+        base
+        deepseq
+        free
+        parsec
+        tasty-bench
+      ];
       description = "An efficient and versatile range library";
       license = lib.licenses.mit;
     }
   ) { };
 
+  range_1_0_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      Cabal,
+      containers,
+      deepseq,
+      doctest,
+      free,
+      parsec,
+      QuickCheck,
+      random,
+      tasty-bench,
+      test-framework,
+      test-framework-quickcheck2,
+    }:
+    mkDerivation {
+      pname = "range";
+      version = "1.0.0.0";
+      sha256 = "1cjb8cjs2jj437lhbpjmn0pgym6k9c33f1j5qjs1b7s4p1cgd0pc";
+      libraryHaskellDepends = [
+        base
+        containers
+        deepseq
+        free
+        parsec
+      ];
+      testHaskellDepends = [
+        base
+        Cabal
+        containers
+        deepseq
+        doctest
+        free
+        parsec
+        QuickCheck
+        random
+        test-framework
+        test-framework-quickcheck2
+      ];
+      benchmarkHaskellDepends = [
+        base
+        containers
+        deepseq
+        free
+        parsec
+        tasty-bench
+      ];
+      description = "An efficient and versatile range library";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   range-set-list = callPackage (
     {
       mkDerivation,
@@ -573713,6 +580006,8 @@ self: {
       ];
       description = "Bindings to the re2 regular expression library";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { inherit (pkgs) re2; };
 
@@ -575320,7 +581615,7 @@ self: {
       ];
       description = "Animation library based on SVGs";
       license = lib.licenses.publicDomain;
-      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.Ai-Ya-Ya ];
     }
   ) { };
 
@@ -575401,8 +581696,7 @@ self: {
       ];
       description = "SVG file loader and serializer";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      maintainers = [ lib.maintainers.Ai-Ya-Ya ];
     }
   ) { };
 
@@ -575669,7 +581963,9 @@ self: {
       containers,
       deepseq,
       fin,
+      HUnit,
       mtl,
+      prettyprinter,
       QuickCheck,
       tasty,
       tasty-hunit,
@@ -575678,14 +581974,16 @@ self: {
     }:
     mkDerivation {
       pname = "rebound";
-      version = "0.1.1.0";
-      sha256 = "0qg2z0fj79iyygdvi0dy7bcbgkffvnxxvspfdq30hlwhjw3h5zxn";
+      version = "0.1.2.0";
+      sha256 = "0p3cm6sdqh3q895jywk0sm7s38aw8rmxv283nx90giri5ql0r4wa";
       libraryHaskellDepends = [
         base
         containers
         deepseq
         fin
+        HUnit
         mtl
+        prettyprinter
         QuickCheck
         vec
       ];
@@ -575698,6 +581996,7 @@ self: {
         tasty-hunit
         tasty-quickcheck
       ];
+      doHaddock = false;
       description = "A variable binding library based on well-scoped de Bruijn indices";
       license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
@@ -578623,7 +584922,6 @@ self: {
       ];
       description = "ClasshSS defined element builders for Reflex";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -584444,8 +590742,8 @@ self: {
       pname = "repa";
       version = "3.4.2.0";
       sha256 = "1rqwmpslwqhrwgkpsqhx3hm4z41vfl35h7qkdxds44125d54kwcq";
-      revision = "1";
-      editedCabalFile = "1hihmk2flpwjpy0mbrg2c40iv4vp2zp5ygw4fqbcqr3cjq8jkibz";
+      revision = "2";
+      editedCabalFile = "0mz21phd96rm9gkzvnwzsbxdzf1gx51kna5b9nqj7990nzvxkryi";
       libraryHaskellDepends = [
         base
         bytestring
@@ -585022,8 +591320,8 @@ self: {
     }:
     mkDerivation {
       pname = "repl-alliance";
-      version = "0.1.0.0";
-      sha256 = "09jnk151s9phvrif2kg97m7p983qhb41bp72f31qk0pcxvj3l48m";
+      version = "0.1.0.1";
+      sha256 = "1wwa12i3dyf68mvnz0918jwns5mwjhmpxs66bm5ryrnsg343rzwd";
       libraryHaskellDepends = [
         auto-export
         auto-extract
@@ -585667,8 +591965,8 @@ self: {
       pname = "req";
       version = "3.13.4";
       sha256 = "0s80kl29b7d35v044yvkfa6ja40k4sm3wh26qpnscqzv2n6w8zzk";
-      revision = "7";
-      editedCabalFile = "0m0ba98f0fykda9258m8xr2g7gx9l251gj3csipyrk52m1kb53lx";
+      revision = "8";
+      editedCabalFile = "0jb09p3kxvnkpn9s3am2kwaz4z4hx461ixlp79fkhcpfzakziis0";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -586461,6 +592759,7 @@ self: {
       description = "High performance variable binders";
       license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -591100,6 +597399,43 @@ self: {
     }
   ) { };
 
+  riichi-scoring = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      mtl,
+      tasty,
+      tasty-hunit,
+    }:
+    mkDerivation {
+      pname = "riichi-scoring";
+      version = "0.3.1.0";
+      sha256 = "1cfa2i9ng40mjnfmbsgpjy2ijh6lcr1xzmhd2yhfs915g45glsbp";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        containers
+        mtl
+      ];
+      executableHaskellDepends = [
+        base
+        containers
+        mtl
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        tasty
+        tasty-hunit
+      ];
+      description = "A CLI tool for interpreting and scoring Riichi Mahjong hands";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "riichi";
+    }
+  ) { };
+
   ring-buffer = callPackage (
     {
       mkDerivation,
@@ -591381,8 +597717,8 @@ self: {
     }:
     mkDerivation {
       pname = "rio-prettyprint";
-      version = "0.1.8.0";
-      sha256 = "05naj6sfw5lz5zi6xbn3445vx8dva57sziqs5gxfnagn2my56m5i";
+      version = "0.1.9.0";
+      sha256 = "1pdflm8aldg0lbyaq2gdzdlp3aa69wprlj8rpsa79n5s9bm1avvz";
       libraryHaskellDepends = [
         aeson
         annotated-wl-pprint
@@ -593795,8 +600131,6 @@ self: {
       ];
       description = "RON";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -593916,7 +600250,6 @@ self: {
       ];
       description = "Replicated Data Types (RON-RDT)";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -593957,6 +600290,7 @@ self: {
       description = "RON-Schema";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -594003,6 +600337,7 @@ self: {
       description = "RON Storage";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -594797,6 +601132,8 @@ self: {
           pname = "rounded";
           version = "1.1.1";
           sha256 = "0d3ybivsnd3ykxjss7aqby0b0qx8kjw07r7afqnicafmz2ccyzh4";
+          revision = "1";
+          editedCabalFile = "100cy7plffwydn65a6k65gjss0sgiksqq9643wx93k53yjcqysq0";
           libraryHaskellDepends = [
             base
             ghc-prim
@@ -596076,8 +602413,6 @@ self: {
       ];
       description = "Streaming parser/renderer for the RSS standard";
       license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -597667,6 +604002,34 @@ self: {
     }
   ) { };
 
+  safe-coloured-text_0_4_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      text,
+      validity,
+      validity-bytestring,
+      validity-text,
+    }:
+    mkDerivation {
+      pname = "safe-coloured-text";
+      version = "0.4.0.0";
+      sha256 = "0dzak2y7wzhb4k0yr7n8762wj8z96nhzpzsw3cmlrwwrfx4fw8ym";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        text
+        validity
+        validity-bytestring
+        validity-text
+      ];
+      description = "Safely output coloured text";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   safe-coloured-text-gen = callPackage (
     {
       mkDerivation,
@@ -597703,6 +604066,52 @@ self: {
     }
   ) { };
 
+  safe-coloured-text-gen_0_0_0_4 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      genvalidity,
+      genvalidity-bytestring,
+      genvalidity-sydtest,
+      genvalidity-text,
+      path,
+      path-io,
+      safe-coloured-text,
+      safe-coloured-text-parsing,
+      sydtest,
+      sydtest-discover,
+      text,
+    }:
+    mkDerivation {
+      pname = "safe-coloured-text-gen";
+      version = "0.0.0.4";
+      sha256 = "0s6cmr33gn9g9akvi56cv0924z2j2mfvjdgj7ilagl9i7jh2x24v";
+      libraryHaskellDepends = [
+        base
+        genvalidity
+        genvalidity-bytestring
+        genvalidity-text
+        safe-coloured-text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        genvalidity-sydtest
+        path
+        path-io
+        safe-coloured-text
+        safe-coloured-text-parsing
+        sydtest
+        text
+      ];
+      testToolDepends = [ sydtest-discover ];
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { safe-coloured-text-parsing = null; };
+
   safe-coloured-text-layout = callPackage (
     {
       mkDerivation,
@@ -601809,7 +608218,7 @@ self: {
     }
   ) { };
 
-  sbp_6_3_2 = callPackage (
+  sbp_6_3_3 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -601838,8 +608247,8 @@ self: {
     }:
     mkDerivation {
       pname = "sbp";
-      version = "6.3.2";
-      sha256 = "0fvdmflixagy971pv302aq9hfdjlphgvjymrnqkwndzjv2znldrh";
+      version = "6.3.3";
+      sha256 = "0y8bp4cnm3kqc64qgmkvpj1gvln197sprbm9hchdzychnp54mx8i";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -602023,7 +608432,7 @@ self: {
     }
   ) { inherit (pkgs) z3; };
 
-  sbv_13_6 = callPackage (
+  sbv_14_0 = callPackage (
     {
       mkDerivation,
       array,
@@ -602063,8 +608472,8 @@ self: {
     }:
     mkDerivation {
       pname = "sbv";
-      version = "13.6";
-      sha256 = "14znf1fl5ab5m1i3109qgzv8lmz17ir77bpc9cvw4s4qymq7i4k9";
+      version = "14.0";
+      sha256 = "05marjjn7ngh80lw5m1nkjyi2kilknbg0h1sjipbbjnsjp0bn3yr";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         array
@@ -602506,8 +608915,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "SCALE v2.0 codec for Haskell Web3 library.";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -603127,6 +609534,36 @@ self: {
     }
   ) { };
 
+  scfg = callPackage (
+    {
+      mkDerivation,
+      base,
+      hspec,
+      megaparsec,
+      temporary,
+      text,
+    }:
+    mkDerivation {
+      pname = "scfg";
+      version = "1.0.0";
+      sha256 = "1gv9va64hwmx90q8z44vksn58wnha6hfkdmvsnh6bdb2804092w9";
+      libraryHaskellDepends = [
+        base
+        megaparsec
+        text
+      ];
+      testHaskellDepends = [
+        base
+        hspec
+        megaparsec
+        temporary
+        text
+      ];
+      description = "SCFG parser for Haskell";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   scgi = callPackage (
     {
       mkDerivation,
@@ -606037,24 +612474,24 @@ self: {
     {
       mkDerivation,
       base,
+      directory,
       filepath,
       process,
       tasty,
       tasty-hunit,
-      temporary,
       text,
     }:
     mkDerivation {
       pname = "scripths";
-      version = "0.2.0.2";
-      sha256 = "1jy61b2w27x3k2jcfwns6f9jnj8x3cfvbgvm3xzca3s5w05wfxjp";
+      version = "0.3.1.0";
+      sha256 = "1prxmgq44rh8l2qrq77pz1xnn02jd2wqyanlimmh2dv5z38cpmk4";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
+        directory
         filepath
         process
-        temporary
         text
       ];
       executableHaskellDepends = [
@@ -608110,8 +614547,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Bindings for secp256k1";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { inherit (pkgs) secp256k1; };
 
@@ -609149,16 +615584,13 @@ self: {
       semigroupoids,
       tagged,
       these,
-      transformers,
       unordered-containers,
       vector,
     }:
     mkDerivation {
       pname = "semialign";
-      version = "1.3.1";
-      sha256 = "1xwx1icyggjbjflgn75bsqw34dmpsd15qqmz13ljxv7zak17ps36";
-      revision = "2";
-      editedCabalFile = "1swx9cwxbgkp9dj49fcqxncq8lx19sh4k9k4hlqgac1jwjlibrfz";
+      version = "1.3.1.1";
+      sha256 = "023sc13r86spp82r1bcch9lmsjnaaqk6x6bjmz1j5515gwpggqcc";
       libraryHaskellDepends = [
         base
         containers
@@ -609168,7 +615600,6 @@ self: {
         semigroupoids
         tagged
         these
-        transformers
         unordered-containers
         vector
       ];
@@ -611647,8 +618078,8 @@ self: {
       pname = "servant";
       version = "0.20.3.0";
       sha256 = "00k6pwqxpyjp5qm5pjl8qb75iqmpql5iv3ac43xdvikcixffcwzj";
-      revision = "2";
-      editedCabalFile = "0wvq6jj6js7sxq1rrn4v6749zfwkz3cl8dsypf5cvbpkz1qp4d7j";
+      revision = "3";
+      editedCabalFile = "15qvrb3kx5z0m2yzp4870hmdfykynd3il5747j4433y29v8vxcvc";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -611936,10 +618367,8 @@ self: {
     }:
     mkDerivation {
       pname = "servant-auth";
-      version = "0.4.2.0";
-      sha256 = "0h71v9n3vd1ca9kav2b6w53wnk950hxlgp3hcnhyk7yd9aph4nwx";
-      revision = "1";
-      editedCabalFile = "1nzarwir9sncdi2fgsjl6yvq83mx0gj9z3l5d47nl15yzmblgyx4";
+      version = "0.4.9.2";
+      sha256 = "0f7gv1p8b2g87r507df1l876vrfdbrgmba6l9v1rim3bhqy2ysay";
       libraryHaskellDepends = [
         aeson
         base
@@ -611981,10 +618410,8 @@ self: {
     }:
     mkDerivation {
       pname = "servant-auth-client";
-      version = "0.4.2.0";
-      sha256 = "1pvqiygnwnkj6y4mi03qnpjlp305cjmpzp7nrqmc2p6qwnl2l4q9";
-      revision = "2";
-      editedCabalFile = "1cbsy3kpbwqliyc59fcwxgl5x31gigawl8zb4zhlv5afnq6inm3q";
+      version = "0.4.9.2";
+      sha256 = "0wfpg3l46qpxbbl3zdfwg6jbc89dk3pqh215s2l87ng4pmwg8ry4";
       libraryHaskellDepends = [
         base
         bytestring
@@ -612313,10 +618740,8 @@ self: {
     }:
     mkDerivation {
       pname = "servant-auth-server";
-      version = "0.4.9.1";
-      sha256 = "04sy2g81pp0pr31xi6h1hqm199z6r4xv3fy2x307dlydxmdm8qb3";
-      revision = "1";
-      editedCabalFile = "0n29r1359vs9pl5rk7d7yh33i821qn9bcmrbfd4ddxl4n3sy27v1";
+      version = "0.4.9.2";
+      sha256 = "1qwzfqgfrs59q9m63ikqvam745jbz8206617r5blhgsds95m6jsp";
       libraryHaskellDepends = [
         aeson
         base
@@ -617407,8 +623832,8 @@ self: {
       pname = "servant-server";
       version = "0.20.3.0";
       sha256 = "05crwklbncd393zq00gi04zgnfyy2wk31s0xf5hy6yjrsbshlmih";
-      revision = "1";
-      editedCabalFile = "1z2h1gmxphwd76chyah405ww4ciyxq7rvggghr6lh0z1m3p2k90h";
+      revision = "3";
+      editedCabalFile = "0ydamm9ljkj55y3yraahsccx8r3hwvfhzjy67k0kimgagdbz3alc";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -618222,6 +624647,88 @@ self: {
     }
   ) { };
 
+  servant-swagger_1_2_3 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      base,
+      base-compat,
+      bytestring,
+      Cabal,
+      cabal-doctest,
+      directory,
+      doctest,
+      filepath,
+      hspec,
+      hspec-discover,
+      http-media,
+      insert-ordered-containers,
+      lens,
+      lens-aeson,
+      QuickCheck,
+      servant,
+      singleton-bool,
+      swagger2,
+      template-haskell,
+      text,
+      time,
+      unordered-containers,
+      utf8-string,
+      vector,
+    }:
+    mkDerivation {
+      pname = "servant-swagger";
+      version = "1.2.3";
+      sha256 = "1pw6cp8bf93djyziyfcanasvil86b6yif55wmsvimy8bgwhnk901";
+      setupHaskellDepends = [
+        base
+        Cabal
+        cabal-doctest
+      ];
+      libraryHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        base-compat
+        bytestring
+        hspec
+        http-media
+        insert-ordered-containers
+        lens
+        QuickCheck
+        servant
+        singleton-bool
+        swagger2
+        text
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        base-compat
+        directory
+        doctest
+        filepath
+        hspec
+        lens
+        lens-aeson
+        QuickCheck
+        servant
+        swagger2
+        template-haskell
+        text
+        time
+        utf8-string
+        vector
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   servant-swagger-tags = callPackage (
     {
       mkDerivation,
@@ -618309,8 +624816,8 @@ self: {
       pname = "servant-swagger-ui-core";
       version = "0.3.5";
       sha256 = "0ckvrwrb3x39hfl2hixcj3fhibh0vqsh6y7n1lsm25yvzfrg02zd";
-      revision = "12";
-      editedCabalFile = "1fl9g99iaiibh4355h8l2vk3xsmv7gb9fpg9s6i5a7f12as8lw5q";
+      revision = "13";
+      editedCabalFile = "1s6klk85hzvg337hyxgfi1764j2138rnb8b8kkhs36xz9g5jd75m";
       libraryHaskellDepends = [
         aeson
         base
@@ -618462,6 +624969,75 @@ self: {
     }
   ) { };
 
+  servant-tower-hs = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      hs-opentelemetry-api,
+      hs-opentelemetry-exporter-in-memory,
+      hs-opentelemetry-sdk,
+      hspec,
+      hspec-discover,
+      http-client,
+      http-types,
+      mtl,
+      servant,
+      servant-client,
+      servant-client-core,
+      servant-server,
+      stm,
+      text,
+      tower-hs,
+      unagi-chan,
+      uuid,
+      warp,
+    }:
+    mkDerivation {
+      pname = "servant-tower-hs";
+      version = "0.1.2.0";
+      sha256 = "05zrfpbm4f26m08w5an9611ymhvpbjllh8dqh72csjhf47llq66p";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        hs-opentelemetry-api
+        http-types
+        mtl
+        servant-client
+        servant-client-core
+        text
+        tower-hs
+        uuid
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        hs-opentelemetry-api
+        hs-opentelemetry-exporter-in-memory
+        hs-opentelemetry-sdk
+        hspec
+        hspec-discover
+        http-client
+        http-types
+        servant
+        servant-client
+        servant-client-core
+        servant-server
+        stm
+        text
+        tower-hs
+        unagi-chan
+        warp
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Use tower-hs middleware with servant clients";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   servant-tracing = callPackage (
     {
       mkDerivation,
@@ -620304,6 +626880,7 @@ self: {
       mkDerivation,
       alex,
       array,
+      async,
       base,
       bytestring,
       cmdargs,
@@ -620312,34 +626889,63 @@ self: {
       filepath,
       happy,
       mtl,
+      process,
+      QuickCheck,
       split,
       table-layout,
+      tasty,
+      tasty-golden,
+      tasty-hunit,
+      tasty-quickcheck,
       text,
+      unix,
       uuid,
     }:
     mkDerivation {
       pname = "setdown";
-      version = "0.1.1.0";
-      sha256 = "01kb0bw6f0rzs76r5mifmizx22az3w0kjkfsxmhcjfnxkhwiv5z7";
-      isLibrary = false;
+      version = "0.2.0.0";
+      sha256 = "1h5gpf75qr5cnjsc9q4w624lcqvnfkzya0j813ab3vndigk4xpw9";
+      isLibrary = true;
       isExecutable = true;
-      executableHaskellDepends = [
+      libraryHaskellDepends = [
         array
+        async
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        mtl
+        split
+        text
+        uuid
+      ];
+      libraryToolDepends = [
+        alex
+        happy
+      ];
+      executableHaskellDepends = [
         base
         bytestring
         cmdargs
         containers
         directory
         filepath
-        mtl
-        split
         table-layout
         text
-        uuid
+        unix
       ];
-      executableToolDepends = [
-        alex
-        happy
+      testHaskellDepends = [
+        base
+        bytestring
+        filepath
+        process
+        QuickCheck
+        tasty
+        tasty-golden
+        tasty-hunit
+        tasty-quickcheck
+        text
       ];
       description = "Treating files as sets to perform rapid set manipulation";
       license = lib.licenses.bsd3;
@@ -623462,6 +630068,54 @@ self: {
     }
   ) { };
 
+  shared-resource-cache = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      focus,
+      hashable,
+      hspec,
+      list-t,
+      resourcet,
+      stm,
+      stm-containers,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "shared-resource-cache";
+      version = "0.2.0.5";
+      sha256 = "0x6vh518jihrg59jrm4mr3j6z0y7y670vdqxpynnqxd1jb73hdmy";
+      libraryHaskellDepends = [
+        base
+        focus
+        hashable
+        list-t
+        resourcet
+        stm
+        stm-containers
+        text
+        time
+      ];
+      testHaskellDepends = [
+        async
+        base
+        focus
+        hashable
+        hspec
+        list-t
+        resourcet
+        stm
+        stm-containers
+        text
+        time
+      ];
+      description = "A thread-safe cache for sharing resources across threads with automatic expiry";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   sharedio = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -624496,11 +631150,14 @@ self: {
       base,
       bytestring,
       containers,
+      deepseq,
       effectful,
       effectful-core,
       generic-lens,
       hs-opentelemetry-api,
+      hs-opentelemetry-exporter-in-memory,
       hs-opentelemetry-propagator-w3c,
+      hs-opentelemetry-semantic-conventions,
       hspec,
       lens,
       memory,
@@ -624518,18 +631175,20 @@ self: {
     }:
     mkDerivation {
       pname = "shibuya-core";
-      version = "0.1.0.0";
-      sha256 = "0nrp8fisd8mh7h92mjgz1nz62aq508pg8kg09sik4gza9730ivh4";
+      version = "0.3.0.0";
+      sha256 = "0jzpy01g4sgg8z6h34qz8fk0fjbncpmw3pf06aykg046ipkj8v0r";
       libraryHaskellDepends = [
         aeson
         base
         bytestring
         containers
+        deepseq
         effectful
         effectful-core
         generic-lens
         hs-opentelemetry-api
         hs-opentelemetry-propagator-w3c
+        hs-opentelemetry-semantic-conventions
         lens
         nqe
         stm
@@ -624547,6 +631206,7 @@ self: {
         bytestring
         effectful
         hs-opentelemetry-api
+        hs-opentelemetry-exporter-in-memory
         hspec
         memory
         nqe
@@ -624557,6 +631217,8 @@ self: {
         text
         time
         unliftio
+        unordered-containers
+        vector
       ];
       description = "Supervised queue processing framework for Haskell";
       license = lib.meta.getLicenseFromSpdxId "MIT";
@@ -624565,6 +631227,75 @@ self: {
     }
   ) { };
 
+  shibuya-kafka-adapter = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      bytestring,
+      containers,
+      effectful-core,
+      hs-opentelemetry-api,
+      hw-kafka-client,
+      hw-kafka-streamly,
+      kafka-effectful,
+      process,
+      random,
+      shibuya-core,
+      stm,
+      streamly,
+      streamly-core,
+      tasty,
+      tasty-hunit,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "shibuya-kafka-adapter";
+      version = "0.2.0.0";
+      sha256 = "00b9dd5298j9yrj2dxyrnm02nq5hqddwik2z3i7gid0rrqqfdb73";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        effectful-core
+        hs-opentelemetry-api
+        hw-kafka-client
+        hw-kafka-streamly
+        kafka-effectful
+        shibuya-core
+        stm
+        streamly
+        streamly-core
+        text
+        time
+      ];
+      testHaskellDepends = [
+        async
+        base
+        bytestring
+        containers
+        effectful-core
+        hs-opentelemetry-api
+        hw-kafka-client
+        kafka-effectful
+        process
+        random
+        shibuya-core
+        stm
+        streamly
+        streamly-core
+        tasty
+        tasty-hunit
+        text
+        time
+      ];
+      description = "Kafka adapter for the Shibuya queue processing framework";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   shibuya-metrics = callPackage (
     {
       mkDerivation,
@@ -624587,8 +631318,8 @@ self: {
     }:
     mkDerivation {
       pname = "shibuya-metrics";
-      version = "0.1.0.0";
-      sha256 = "0nic5mfs0908l37sh50hdyfzjck4ifnj8mjb1yd2aaqa9xx3zl6f";
+      version = "0.3.0.0";
+      sha256 = "1rj7jqsc1973b8ivglqhmwn33v39yvs3sc9q0k6glqrja0wwgpjh";
       libraryHaskellDepends = [
         aeson
         async
@@ -624642,8 +631373,8 @@ self: {
     }:
     mkDerivation {
       pname = "shibuya-pgmq-adapter";
-      version = "0.1.0.0";
-      sha256 = "1n8hd1cm3sjx04za2zvqaj14hpp2f1w07r85mf5pn3y4s75d06ry";
+      version = "0.3.0.0";
+      sha256 = "0d9h23zvzapkclwk0bbpz6wqmcgs7a871rm27i5x4hhins2ix626";
       libraryHaskellDepends = [
         aeson
         base
@@ -625429,14 +632160,13 @@ self: {
       tasty-quickcheck,
       temporary,
       text,
-      unordered-containers,
       utf8-string,
       vector,
     }:
     mkDerivation {
       pname = "shower";
-      version = "0.2.0.4";
-      sha256 = "0xjh9qhnl94d6pkg52lc3xw1gi1vflc7rs52xh6wj1dahm0nknkr";
+      version = "0.2.0.5";
+      sha256 = "0p4f6k8f9l9lzip6fkp2dw85c7pbjyhq8xnhi2xd46ss2dmi4r92";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -625458,12 +632188,11 @@ self: {
         tasty-quickcheck
         temporary
         text
-        unordered-containers
         utf8-string
         vector
       ];
       description = "Clean up the formatting of 'show' output";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "shower";
     }
   ) { };
@@ -626016,69 +632745,6 @@ self: {
     }
   ) { };
 
-  sigmacord = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      async,
-      base,
-      base64-bytestring,
-      bytestring,
-      containers,
-      data-default,
-      emoji,
-      http-api-data,
-      http-client,
-      iso8601-time,
-      MonadRandom,
-      mtl,
-      network,
-      req,
-      safe-exceptions,
-      scientific,
-      text,
-      time,
-      unliftio,
-      unordered-containers,
-      websockets,
-      wuss,
-    }:
-    mkDerivation {
-      pname = "sigmacord";
-      version = "1.0.0";
-      sha256 = "0y6v35b7sx93nx3jccglylzzax6axb83yrv18h79zhjwh18vl9ch";
-      libraryHaskellDepends = [
-        aeson
-        async
-        base
-        base64-bytestring
-        bytestring
-        containers
-        data-default
-        emoji
-        http-api-data
-        http-client
-        iso8601-time
-        MonadRandom
-        mtl
-        network
-        req
-        safe-exceptions
-        scientific
-        text
-        time
-        unliftio
-        unordered-containers
-        websockets
-        wuss
-      ];
-      description = "Write Discord Bots in Haskell";
-      license = "GPL";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
-    }
-  ) { };
-
   sign = callPackage (
     {
       mkDerivation,
@@ -629394,8 +636060,8 @@ self: {
     }:
     mkDerivation {
       pname = "simplest-sqlite";
-      version = "0.1.0.9";
-      sha256 = "1kf619q0j24i0s9zzh148fk3h0avjngs73k5y08ml983bpb1wg9f";
+      version = "0.1.1.1";
+      sha256 = "1ha7pda01i8scj3scwz0wrv0x5csj48ljn5z7f5v4islfxyllfch";
       libraryHaskellDepends = [
         base
         bytestring
@@ -631489,7 +638155,7 @@ self: {
     }
   ) { };
 
-  skeletest_0_3_7 = callPackage (
+  skeletest_0_4_2 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -631498,6 +638164,7 @@ self: {
       base,
       containers,
       data-default,
+      deepseq,
       Diff,
       directory,
       exceptions,
@@ -631510,16 +638177,18 @@ self: {
       pretty,
       process,
       recover-rtti,
+      strip-ansi-escape,
       template-haskell,
       terminal-size,
       text,
+      time,
       transformers,
       unliftio,
     }:
     mkDerivation {
       pname = "skeletest";
-      version = "0.3.7";
-      sha256 = "0jnwn3x0gmjavik130941d7qng8q4i20rjnhsminfirgp166bw6x";
+      version = "0.4.2";
+      sha256 = "0bbmaw4yaxvmiidzqyd86z60lf07ispi7cidrxv2x2ads4nkv82x";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -631528,6 +638197,7 @@ self: {
         ansi-terminal
         base
         containers
+        deepseq
         Diff
         directory
         exceptions
@@ -631540,9 +638210,11 @@ self: {
         pretty
         process
         recover-rtti
+        strip-ansi-escape
         template-haskell
         terminal-size
         text
+        time
         transformers
         unliftio
       ];
@@ -631560,6 +638232,7 @@ self: {
         filepath
         process
         text
+        transformers
         unliftio
       ];
       description = "Batteries-included, opinionated test framework";
@@ -635389,6 +642062,8 @@ self: {
       pname = "smtp-mail";
       version = "0.5.0.1";
       sha256 = "1xcs3k3p5p4qgr77icizk154fysf63c2cj04l4k2dz2bnzz1f9ih";
+      revision = "1";
+      editedCabalFile = "116i18fpizjqarn8sbqcykh5l1idd4imdq83akzrjpq9qjd00dq3";
       libraryHaskellDepends = [
         array
         base
@@ -636610,8 +643285,8 @@ self: {
       pname = "snap-server";
       version = "1.1.2.1";
       sha256 = "0znadz0av6k31s8d175904d2kajxayl38sva3dqh5ckdfkymfx54";
-      revision = "5";
-      editedCabalFile = "0hpbnxbyfsngnx816i92hccimbsc1zx7smajjzaz58647cxkgm1y";
+      revision = "6";
+      editedCabalFile = "1h316bkladv72wpxa0xsp0l5djlvl2pjvjdjbx26ja4pk9isc3zg";
       configureFlags = [ "-fopenssl" ];
       isLibrary = true;
       isExecutable = true;
@@ -638924,11 +645599,12 @@ self: {
       mkDerivation,
       base,
       bytestring,
+      time,
     }:
     mkDerivation {
       pname = "snappy-hs";
-      version = "0.1.0.5";
-      sha256 = "0pclgy7jj7p569sdsa0qhvgpqp2k2x8qdbrybgwgg6adv7axgihx";
+      version = "0.1.1.0";
+      sha256 = "11d693qpqqlsl3gfd1ms68falcw5gx4h2bd72qrm5ld8z83gmfij";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -638938,11 +645614,14 @@ self: {
       executableHaskellDepends = [
         base
         bytestring
+        time
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
       ];
-      testHaskellDepends = [ base ];
       description = "Snappy compression library";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      mainProgram = "snappy-hs";
     }
   ) { };
 
@@ -639757,6 +646436,8 @@ self: {
       pname = "soap-tls";
       version = "0.2.0.0";
       sha256 = "0bi5pwv49bx0hpsamr6nk9nxzx6b1cyq9rd8g9hbmz44v3n9kyqr";
+      revision = "1";
+      editedCabalFile = "150p892bj671z9fdjcsa3sqvxymdjm4bx6xi6i3i0w6vj9k5iyn8";
       libraryHaskellDepends = [
         base
         configurator
@@ -642066,9 +648747,10 @@ self: {
       directory,
       download-curl,
       fast-logger,
-      filepath-bytestring,
-      hxt-unicode,
+      file-io,
+      filepath,
       mtl,
+      os-string,
       process,
       socket,
       systemd,
@@ -642076,13 +648758,13 @@ self: {
       tasty-expected-failure,
       tasty-hunit,
       text,
-      transformers,
       unix,
+      utf8-string,
     }:
     mkDerivation {
       pname = "spacecookie";
-      version = "1.0.0.3";
-      sha256 = "1kzzbq22dk277jcx04w154y4vwa92zmnf40jcbgiihkz5rvisix0";
+      version = "1.1.0.1";
+      sha256 = "0r39gggkk2dqxzbq73lwky733l3ag61kqj2p9iwwwrzxwq96mzg1";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -642091,14 +648773,12 @@ self: {
         base
         bytestring
         containers
-        directory
-        filepath-bytestring
-        hxt-unicode
+        filepath
         mtl
+        os-string
         socket
         text
-        transformers
-        unix
+        utf8-string
       ];
       executableHaskellDepends = [
         aeson
@@ -642108,13 +648788,14 @@ self: {
         containers
         directory
         fast-logger
-        filepath-bytestring
-        mtl
+        file-io
+        filepath
+        os-string
         socket
         systemd
         text
-        transformers
         unix
+        utf8-string
       ];
       testHaskellDepends = [
         attoparsec
@@ -642123,7 +648804,8 @@ self: {
         containers
         directory
         download-curl
-        filepath-bytestring
+        filepath
+        os-string
         process
         tasty
         tasty-expected-failure
@@ -644937,6 +651619,31 @@ self: {
     }
   ) { };
 
+  sport = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      bytestring,
+      stm,
+      unix,
+    }:
+    mkDerivation {
+      pname = "sport";
+      version = "0.2.0.0";
+      sha256 = "17s0gp4cdgkphxz6gl0jw2s0ml97mp8z41jd3dgg1fsw82xg7yx1";
+      libraryHaskellDepends = [
+        async
+        base
+        bytestring
+        stm
+        unix
+      ];
+      description = "UNIX serial port";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   spotify = callPackage (
     {
       mkDerivation,
@@ -645654,10 +652361,13 @@ self: {
   sq = callPackage (
     {
       mkDerivation,
+      adjunctions,
       aeson,
       async,
       async-pool,
       attoparsec,
+      attoparsec-aeson,
+      attoparsec-iso8601,
       base,
       binary,
       bytestring,
@@ -645675,13 +652385,18 @@ self: {
       exceptions,
       filepath,
       foldl,
+      generics-sop,
       hedgehog,
+      integer-logarithms,
+      network-uri,
       profunctors,
       ref-tf,
       resource-pool,
       resourcet,
       resourcet-extra,
       safe-exceptions,
+      scientific,
+      sop-core,
       stm,
       streaming,
       tasty,
@@ -645691,15 +652406,18 @@ self: {
       text,
       time,
       transformers,
+      uuid-types,
     }:
     mkDerivation {
       pname = "sq";
-      version = "0.0.2";
-      sha256 = "0ar5ga9n390r8jc5njm6mdrag73xx25xd02ld76zybjd2y78v8w4";
+      version = "0.1";
+      sha256 = "06gykqsfqdfpxnffjksf4ghy43qcraqyivmsyc4k2ysxmywgq8ry";
       libraryHaskellDepends = [
+        adjunctions
         aeson
-        async
         attoparsec
+        attoparsec-aeson
+        attoparsec-iso8601
         base
         binary
         bytestring
@@ -645714,18 +652432,24 @@ self: {
         exceptions
         filepath
         foldl
+        generics-sop
+        integer-logarithms
+        network-uri
         profunctors
         ref-tf
         resource-pool
         resourcet
         resourcet-extra
         safe-exceptions
+        scientific
+        sop-core
         stm
         streaming
         template-haskell
         text
         time
         transformers
+        uuid-types
       ];
       testHaskellDepends = [
         aeson
@@ -645741,11 +652465,14 @@ self: {
         resourcet
         resourcet-extra
         safe-exceptions
+        scientific
+        sop-core
         tasty
         tasty-hedgehog
         tasty-hunit
         text
         time
+        uuid-types
       ];
       benchmarkHaskellDepends = [
         async
@@ -647260,8 +653987,8 @@ self: {
     }:
     mkDerivation {
       pname = "srtree";
-      version = "2.0.1.6";
-      sha256 = "0y4caqlmnfb0vc0cn4gcszasjkmaxvp16g096fxkai15p6d7wwsz";
+      version = "2.0.1.8";
+      sha256 = "0zd1p3097nwlqkp9m7ql225j89r0hax9r0279ccn626fm9yrfjpp";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -647986,8 +654713,8 @@ self: {
     }:
     mkDerivation {
       pname = "stable-marriage";
-      version = "0.2.1.2";
-      sha256 = "1hkhwvmcp0c7c1r009ag7jb1km3zbakbg4plg6h5f0hhmc07yjzs";
+      version = "0.2.2.0";
+      sha256 = "0wrd0j5xrc6iqnnxnbhq7gjq5mzn5xlzh1xy1wy4bk7bp0d6w5nd";
       libraryHaskellDepends = [
         base
         ghc-prim
@@ -650502,6 +657229,64 @@ self: {
     }
   ) { };
 
+  stacker = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      ansi-terminal,
+      base,
+      bytestring,
+      containers,
+      directory,
+      file-embed,
+      filepath,
+      optparse-applicative,
+      process,
+      tasty,
+      tasty-golden,
+      temporary,
+      text,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "stacker";
+      version = "0.0.0.0";
+      sha256 = "1x9xcgyf2fc91iaj8jq9d14ivg2bim1qryxfmgfz0wriqzh6yfpc";
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        aeson
+        ansi-terminal
+        base
+        containers
+        directory
+        file-embed
+        filepath
+        optparse-applicative
+        process
+        text
+        yaml
+      ];
+      executableHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        bytestring
+        directory
+        process
+        tasty
+        tasty-golden
+        temporary
+        text
+      ];
+      description = "Bump snapshots in stack.yaml files";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "stacker";
+      broken = true;
+    }
+  ) { };
+
   staf = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -652348,8 +659133,8 @@ self: {
     }:
     mkDerivation {
       pname = "status-notifier-item";
-      version = "0.3.2.10";
-      sha256 = "0xyfb1ffq8bhjc20j05myb1ijdxim030ax17xryjf2nfrxfq19hd";
+      version = "0.3.2.13";
+      sha256 = "046zsxxwwinqzisw7sfq6bp1a5liphq42lavfxs2rqhrw6v8gw78";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -653205,6 +659990,41 @@ self: {
     }
   ) { };
 
+  stim-parser = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      HUnit,
+      megaparsec,
+      mtl,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "stim-parser";
+      version = "0.1.0.0";
+      sha256 = "1v7zd8cfklaafr9a97jrk9scxms5n0kqmmh6smdlgjb6iyzjs4rs";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        containers
+        megaparsec
+        mtl
+        unordered-containers
+      ];
+      executableHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        HUnit
+        megaparsec
+        mtl
+      ];
+      description = "A parser combinator library for STIM quantum circuit files";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   stitch = callPackage (
     {
       mkDerivation,
@@ -653847,6 +660667,57 @@ self: {
     }
   ) { };
 
+  stm-ringbuffer = callPackage (
+    {
+      mkDerivation,
+      array,
+      async,
+      base,
+      deepseq,
+      dlist,
+      generic-random,
+      hspec,
+      QuickCheck,
+      random,
+      stm,
+      tasty,
+      tasty-bench,
+    }:
+    mkDerivation {
+      pname = "stm-ringbuffer";
+      version = "0.1.0.0";
+      sha256 = "17y6m5yl1dl6clq3vcnkysav2jlj2s3nvyjsc7vn0ckmc6qvfqcw";
+      libraryHaskellDepends = [
+        array
+        base
+        dlist
+        stm
+      ];
+      testHaskellDepends = [
+        async
+        base
+        generic-random
+        hspec
+        QuickCheck
+        random
+        stm
+      ];
+      benchmarkHaskellDepends = [
+        async
+        base
+        deepseq
+        random
+        stm
+        tasty
+        tasty-bench
+      ];
+      description = "Ring buffer implementation in STM";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   stm-sbchan = callPackage (
     {
       mkDerivation,
@@ -661573,18 +668444,15 @@ self: {
       mkDerivation,
       base,
       bytestring,
-      conduit,
       containers,
       deepseq,
       dlist,
-      drinkery,
-      gauge,
-      machines,
+      fusion-plugin,
       mtl,
-      pipes,
       random,
-      streaming,
-      streamly,
+      streamly-core,
+      tasty,
+      tasty-bench,
       template-haskell,
       text,
       transformers,
@@ -661592,25 +668460,30 @@ self: {
     }:
     mkDerivation {
       pname = "streaming-benchmarks";
-      version = "0.3.0";
-      sha256 = "0cy65d1aph2wk3yc7kj8ywq40f8jgpx72isywnnw2sg9jz9jnd85";
-      isLibrary = false;
-      isExecutable = true;
+      version = "0.4.1";
+      sha256 = "0knl3dqz361kfp4p2y4kvngijyhv0m3hkkc9wdzkywkzh09fmilh";
+      libraryHaskellDepends = [
+        base
+        deepseq
+        mtl
+        random
+        tasty
+        tasty-bench
+        template-haskell
+        transformers
+      ];
       benchmarkHaskellDepends = [
         base
         bytestring
-        conduit
         containers
         deepseq
         dlist
-        drinkery
-        gauge
-        machines
+        fusion-plugin
         mtl
-        pipes
         random
-        streaming
-        streamly
+        streamly-core
+        tasty
+        tasty-bench
         template-haskell
         text
         transformers
@@ -662675,8 +669548,8 @@ self: {
       pname = "streamly";
       version = "0.11.0";
       sha256 = "1ha7rr6038k1hikfhg2bi0ican8b9yf1gcbaf82b4889wymy7xyc";
-      revision = "1";
-      editedCabalFile = "1h3vpy61p7ivc5cqjlpabz1z97vxf0c7npzkdwnk2jhabsl8wx2d";
+      revision = "2";
+      editedCabalFile = "0b7yp4ha7h2zgjhm36allq8s0a67mbk73ckx2al5d7vn1qcdm236";
       libraryHaskellDepends = [
         atomic-primops
         base
@@ -662984,6 +669857,8 @@ self: {
       pname = "streamly-core";
       version = "0.3.0";
       sha256 = "1qycnqxc7icqfd2y06rg7bgymigmrcmm75q7l7m2c92ssh5rbv4q";
+      revision = "1";
+      editedCabalFile = "1hjdwsc0yk4z5lhvaxnv5yw70qlpccfrbm2s4di53fz4g5r80xh0";
       libraryHaskellDepends = [
         base
         containers
@@ -663027,8 +669902,8 @@ self: {
     }:
     mkDerivation {
       pname = "streamly-examples";
-      version = "0.3.0";
-      sha256 = "1jha5ay5ympy1hmz02f0jsqhv6k0qma2bv6iycriss076gr529rl";
+      version = "0.3.1";
+      sha256 = "0yfckhymdzkfgr8ip9bkchic6xh0fn5v17palpn81xw2vbwj78vd";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -663099,8 +669974,8 @@ self: {
     }:
     mkDerivation {
       pname = "streamly-fsevents";
-      version = "0.1.0";
-      sha256 = "1dsbhp5x4m05sqr27xlgfhvd5h4zvf8gf49v55x2384i33g28hnw";
+      version = "0.1.1";
+      sha256 = "0k2zsiz89slsp6vv1cf4i61dj7h69hyn50pj5mlix63vl52iw8w8";
       libraryHaskellDepends = [
         base
         containers
@@ -663116,7 +669991,7 @@ self: {
         streamly-core
         temporary
       ];
-      description = "File system event notification API";
+      description = "File system event notification streams";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -663368,7 +670243,7 @@ self: {
     }
   ) { };
 
-  streamly-process_0_4_0 = callPackage (
+  streamly-process_0_4_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -663383,8 +670258,8 @@ self: {
     }:
     mkDerivation {
       pname = "streamly-process";
-      version = "0.4.0";
-      sha256 = "0kzb372vq18ybisskyqsqkxsvgz5gk51777jhjzlc4pcp6wm4ds9";
+      version = "0.4.1";
+      sha256 = "1dx41jsgyv3xn7hf722gwx7yhn7673xzi5ywpmfx69lsmx35j50y";
       libraryHaskellDepends = [
         base
         exceptions
@@ -663406,7 +670281,7 @@ self: {
         streamly-core
         tasty-bench
       ];
-      description = "Use OS processes as stream transformation functions";
+      description = "Write shell-like command pipelines in Haskell";
       license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -663436,6 +670311,8 @@ self: {
       pname = "streamly-statistics";
       version = "0.2.0";
       sha256 = "02px75d8hjgsc13dnfs3khfszd210xcjj96inlzs6zb1yc39pcfl";
+      revision = "1";
+      editedCabalFile = "19xgh5n4wq583y9aqgkfbqx4459dhbxyd2yyb4hyynakzgkksaph";
       libraryHaskellDepends = [
         base
         containers
@@ -663484,8 +670361,8 @@ self: {
     }:
     mkDerivation {
       pname = "streamly-text";
-      version = "0.1.0";
-      sha256 = "163bmfnrx54qcq4r3dv9shgm1g84m6cxkq9dcmpnypv8j491agzi";
+      version = "0.1.1";
+      sha256 = "10fzdww0qygqpnyvp59m5x7i9ynm38is2zwc2j0ajhgsbjd050kr";
       libraryHaskellDepends = [
         base
         streamly-core
@@ -663500,7 +670377,7 @@ self: {
         temporary
         text
       ];
-      description = "Library for streamly and text interoperation";
+      description = "Efficient conversion between Streamly Arrays and Text";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -664236,6 +671113,40 @@ self: {
     }
   ) { };
 
+  strict-list_1_0_0_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      deepseq,
+      hashable,
+      QuickCheck,
+      rerebase,
+      semigroupoids,
+      tasty,
+      tasty-quickcheck,
+    }:
+    mkDerivation {
+      pname = "strict-list";
+      version = "1.0.0.1";
+      sha256 = "1hz47cid0nfc9dgz5lkmsyi24zms0kzh8i39prm0xz4acmjf9zq5";
+      libraryHaskellDepends = [
+        base
+        deepseq
+        hashable
+        QuickCheck
+        semigroupoids
+      ];
+      testHaskellDepends = [
+        rerebase
+        tasty
+        tasty-quickcheck
+      ];
+      description = "Strict linked list with stack-safe operations";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   strict-mutable-base = callPackage (
     {
       mkDerivation,
@@ -668822,8 +675733,6 @@ self: {
       ];
       description = "An implementation of extensible products and sums";
       license = lib.meta.getLicenseFromSpdxId "MIT";
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -670601,7 +677510,6 @@ self: {
       ];
       description = "Optimise SVGs";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "svgone";
     }
   ) { };
@@ -671120,6 +678028,112 @@ self: {
     }
   ) { };
 
+  swagger2_2_9 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      base,
+      base-compat-batteries,
+      bytestring,
+      Cabal,
+      cabal-doctest,
+      containers,
+      cookie,
+      doctest,
+      generics-sop,
+      Glob,
+      hashable,
+      hspec,
+      hspec-discover,
+      http-media,
+      HUnit,
+      insert-ordered-containers,
+      lens,
+      mtl,
+      network,
+      optics-core,
+      optics-th,
+      QuickCheck,
+      quickcheck-instances,
+      scientific,
+      template-haskell,
+      text,
+      time,
+      transformers,
+      unordered-containers,
+      utf8-string,
+      uuid-types,
+      vector,
+    }:
+    mkDerivation {
+      pname = "swagger2";
+      version = "2.9";
+      sha256 = "1h46nfyqqxl7csc4aw0ihq2b5rkhawzpn4al2kzw4yx1ds09ssr8";
+      revision = "1";
+      editedCabalFile = "0bh27m8f3pix5y6vjpq7ac33m0h2d4qnlvapjqq5b6pba2qr3k02";
+      setupHaskellDepends = [
+        base
+        Cabal
+        cabal-doctest
+      ];
+      libraryHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        base-compat-batteries
+        bytestring
+        containers
+        cookie
+        generics-sop
+        hashable
+        http-media
+        insert-ordered-containers
+        lens
+        mtl
+        network
+        optics-core
+        optics-th
+        QuickCheck
+        scientific
+        template-haskell
+        text
+        time
+        transformers
+        unordered-containers
+        uuid-types
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        base-compat-batteries
+        bytestring
+        containers
+        doctest
+        Glob
+        hashable
+        hspec
+        HUnit
+        insert-ordered-containers
+        lens
+        mtl
+        QuickCheck
+        quickcheck-instances
+        template-haskell
+        text
+        time
+        unordered-containers
+        utf8-string
+        vector
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Swagger 2.0 data model";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   swapper = callPackage (
     {
       mkDerivation,
@@ -674634,6 +681648,70 @@ self: {
     }
   ) { };
 
+  symplectic-chp = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      deepseq,
+      directory,
+      filepath,
+      finite-typelits,
+      hspec,
+      hspec-discover,
+      mtl,
+      primitive,
+      QuickCheck,
+      random,
+      stim-parser,
+      transformers,
+      vector,
+      vector-sized,
+    }:
+    mkDerivation {
+      pname = "symplectic-chp";
+      version = "0.1.0.0";
+      sha256 = "0qbcjmjv2xvknf4jhxpczk3ankm4zfzlqlg4g9lfy5yrz8jv61rv";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        deepseq
+        finite-typelits
+        mtl
+        primitive
+        random
+        transformers
+        vector
+        vector-sized
+      ];
+      executableHaskellDepends = [
+        base
+        containers
+        random
+        stim-parser
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        directory
+        filepath
+        finite-typelits
+        hspec
+        hspec-discover
+        QuickCheck
+        random
+        stim-parser
+        vector
+        vector-sized
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "CHP Clifford simulator using symplectic geometry";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      mainProgram = "symplectic-chp";
+    }
+  ) { };
+
   symtegration = callPackage (
     {
       mkDerivation,
@@ -674728,6 +681806,7 @@ self: {
       filepath,
       fsnotify,
       hspec,
+      katip,
       mtl,
       optparse-applicative,
       plexus-protocol,
@@ -674742,8 +681821,8 @@ self: {
     }:
     mkDerivation {
       pname = "synapse-cc";
-      version = "0.2.0";
-      sha256 = "11h1lwjqpmz9dy4dhp67xnbdcxx2ygp6454hqcrsm8fxqkkis4yz";
+      version = "0.3.3";
+      sha256 = "12q1043s6i27g5ilflp686867mwqqlh687hacangzwb30pp2apkl";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -674759,6 +681838,7 @@ self: {
         directory
         filepath
         fsnotify
+        katip
         mtl
         optparse-applicative
         plexus-protocol
@@ -675117,8 +682197,8 @@ self: {
     }:
     mkDerivation {
       pname = "syntactic";
-      version = "3.8.4";
-      sha256 = "13hsv7yr35jaimag4v0c0l56clcdcny4b1m0q6h83qcidcrqxcfc";
+      version = "3.8.5";
+      sha256 = "122cws8ac3rxb2g8m459rbmy4pqabkgdjqdbpzk4h8z8zd82jrvj";
       libraryHaskellDepends = [
         base
         constraints
@@ -675150,8 +682230,6 @@ self: {
       ];
       description = "Generic representation and manipulation of abstract syntax";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -677561,6 +684639,7 @@ self: {
           gi-gtk-layer-shell,
           gi-gtk3,
           gi-pango,
+          gtk-scaling-image,
           gtk-sni-tray,
           gtk-strut,
           gtk3,
@@ -677614,8 +684693,8 @@ self: {
         }:
         mkDerivation {
           pname = "taffybar";
-          version = "6.0.0";
-          sha256 = "1vk3vyms5zzs4mray4a9x90gdl700j6h7x4kayndaqwj418rvdjw";
+          version = "7.0.1";
+          sha256 = "1k2yfcnwms3b0v099ar9ygsx8a439mbbx6fgvpybhb1yi32fn32z";
           isLibrary = true;
           isExecutable = true;
           enableSeparateDataOutput = true;
@@ -677649,6 +684728,7 @@ self: {
             gi-gtk-layer-shell
             gi-gtk3
             gi-pango
+            gtk-scaling-image
             gtk-sni-tray
             gtk-strut
             haskell-gi-base
@@ -679473,37 +686553,48 @@ self: {
     {
       mkDerivation,
       base,
-      cabal-doctest,
-      doctest,
+      directory,
+      filepath,
       finitary,
       finite-typelits,
       hspec,
       microlens,
       MonadRandom,
       nonempty-containers,
+      optparse-applicative,
       QuickCheck,
       quickcheck-classes,
+      random,
+      tasty,
+      tasty-hunit,
       text,
     }:
     mkDerivation {
       pname = "taiwan-id";
-      version = "0.1.0.0";
-      sha256 = "1b9ysrmcv8npp1fhsxhpv205m7kv44y760gbfv6983nhd3hr1m7a";
-      setupHaskellDepends = [
-        base
-        cabal-doctest
-      ];
+      version = "0.1.1.1";
+      sha256 = "17l1c4knwcqpzb82dvxcy6c6sb4cdqgjl8r91jr9ykqj0qc6slz2";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [
         base
         finitary
         finite-typelits
         MonadRandom
         nonempty-containers
+        optparse-applicative
+        QuickCheck
+        random
+        text
+      ];
+      executableHaskellDepends = [
+        base
+        MonadRandom
         text
       ];
       testHaskellDepends = [
         base
-        doctest
+        directory
+        filepath
         finitary
         hspec
         microlens
@@ -679511,11 +686602,16 @@ self: {
         nonempty-containers
         QuickCheck
         quickcheck-classes
+        random
+        tasty
+        tasty-hunit
         text
       ];
-      description = "Implementation of Taiwan's uniform ID number format";
+      doHaddock = false;
+      description = "Library and CLI for working with ID numbers issued in Taiwan";
       license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
+      mainProgram = "taiwan-id";
       broken = true;
     }
   ) { };
@@ -680343,7 +687439,7 @@ self: {
     }
   ) { };
 
-  tar_0_7_0_0 = callPackage (
+  tar_0_7_1_0 = callPackage (
     {
       mkDerivation,
       array,
@@ -680367,10 +687463,8 @@ self: {
     }:
     mkDerivation {
       pname = "tar";
-      version = "0.7.0.0";
-      sha256 = "0dlhf8hhcgl5zvqqsykvg4vwi05b2cy0ml3p6yz4bngqxhnd2jkf";
-      revision = "2";
-      editedCabalFile = "0gx6fvmrgs42m3rkwswmfwmnlqyzsi35w7j7phlh092gwfwynp4b";
+      version = "0.7.1.0";
+      sha256 = "1k5nn0jnxrsw52kav8a21z2qrgcmbhybyfjhadwc6ym39rw8mlfm";
       libraryHaskellDepends = [
         array
         base
@@ -681335,10 +688429,8 @@ self: {
     }:
     mkDerivation {
       pname = "tasty";
-      version = "1.5.3";
-      sha256 = "10076vlklbcyiz7plakrihava5sy3dvwhskjldqzhfl18jvcg82l";
-      revision = "2";
-      editedCabalFile = "04llcf1i3gawdik0bjhxdgls2wkiqlx0gi76nfh784nv2qzxlpbb";
+      version = "1.5.4";
+      sha256 = "1iy6aagi6813anzdf4pygka8ch89wdgzqppdncc4876n3ca20qf7";
       libraryHaskellDepends = [
         ansi-terminal
         base
@@ -689010,6 +696102,8 @@ self: {
       pname = "test-lib";
       version = "0.5";
       sha256 = "1qc86qbq5rljql1010gibp8qd9rgylj8g5kl7jp5yb2ymwx65p92";
+      revision = "1";
+      editedCabalFile = "1jb3id1pah5zpxjhl7kwa21qv5j8y8lz6zsxcd896vxyqkwbmvhw";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -689500,7 +696594,6 @@ self: {
     {
       mkDerivation,
       aeson,
-      aeson-optics,
       async,
       base,
       bytestring,
@@ -689512,24 +696605,24 @@ self: {
       http-types,
       mtl,
       network,
-      optics-core,
       process,
       random,
       resourcet,
+      scientific,
       tasty,
       tasty-discover,
       tasty-hspec,
       tasty-hunit,
       text,
       unliftio-core,
+      vector,
     }:
     mkDerivation {
       pname = "testcontainers";
-      version = "0.5.2.0";
-      sha256 = "0dvzp77gpmiswdnsksw1avxh9b4xn3pvk3q47kqxgvv41rhh5bnd";
+      version = "0.5.3.0";
+      sha256 = "121mg35z25bj7issgizzdn1icdhx6y4vkjppxcxzbrgdj8bajwp1";
       libraryHaskellDepends = [
         aeson
-        aeson-optics
         async
         base
         bytestring
@@ -689539,13 +696632,14 @@ self: {
         http-types
         mtl
         network
-        optics-core
         process
         random
         resourcet
+        scientific
         tasty
         text
         unliftio-core
+        vector
       ];
       testHaskellDepends = [
         base
@@ -690013,7 +697107,7 @@ self: {
     }
   ) { };
 
-  texmath_0_13_1 = callPackage (
+  texmath_0_13_1_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -690036,8 +697130,8 @@ self: {
     }:
     mkDerivation {
       pname = "texmath";
-      version = "0.13.1";
-      sha256 = "0lxk76f23qirxv1h7fw6al3246g4f0mghnzlkx7d3ln4czkmk73g";
+      version = "0.13.1.1";
+      sha256 = "0ws4zqzd5n63mf6622gvimgj23gr4khicx655dcjjm18ypfd9886";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -690258,8 +697352,8 @@ self: {
       pname = "text-ansi";
       version = "0.3.0.1";
       sha256 = "0iiq5zlcjh25mf9b4vlhyc1dwglwh8b03qj1wasbngzvmphvcy00";
-      revision = "2";
-      editedCabalFile = "1bjri84hc9qqp03zjmbrgrwgk989253x7jj2xzwbq579q5yxpj8h";
+      revision = "3";
+      editedCabalFile = "1blqfkv7fizm57jlrlq7cjsbcryck67gwmi2a8c6jq8pxns4ygl1";
       libraryHaskellDepends = [
         base
         text
@@ -691353,10 +698447,8 @@ self: {
     }:
     mkDerivation {
       pname = "text-iso8601";
-      version = "0.1.1";
-      sha256 = "00l2m3xj39mrz7lbmbnir4k9jbn3jm3xa2q6zkh0zr7arsvx5slx";
-      revision = "2";
-      editedCabalFile = "0jaqs685h5zip0vac6wrbz37mw3kvkjsifzr5fcki4wnxxg64yp0";
+      version = "0.1.1.1";
+      sha256 = "0glbxcn2cix6p2rc328iq7zg3f96l8z9j2n2ybnp74sy2g8nhfv0";
       libraryHaskellDepends = [
         base
         integer-conversion
@@ -691380,7 +698472,6 @@ self: {
         base
         tasty-bench
         text
-        time-compat
       ];
       description = "Converting time to and from ISO 8601 text";
       license = lib.licenses.bsd3;
@@ -694956,8 +702047,8 @@ self: {
       pname = "these";
       version = "1.2.1";
       sha256 = "1pp44amwvpl0m762zahg632prlxx0ca2r10n3a0bznjy6qrxkmhp";
-      revision = "2";
-      editedCabalFile = "0dm1gq5phif8v0pfcycxhsrb53hnn63w56jmxlgyl5bcx7npmi9m";
+      revision = "3";
+      editedCabalFile = "0h16r51m20y7vpij90vykddlwg4a8qhg8m7j1vwv7cifa2dfq6ms";
       libraryHaskellDepends = [
         assoc
         base
@@ -694981,8 +702072,8 @@ self: {
       pname = "these-lens";
       version = "1.0.2";
       sha256 = "159dp25rbhcnmpxvvabjl8s9df9mvqi30p81vrmh7kgg86xa050y";
-      revision = "1";
-      editedCabalFile = "07dyn6kqh8apxvzigc64k12h7b0wic8pzy4c5zw4mnsbn8v0l8bh";
+      revision = "2";
+      editedCabalFile = "1pc0papjx537sh6s9ln84kk2a5cvzawabr8ra6v93pqk9xgvgfyj";
       libraryHaskellDepends = [
         base
         lens
@@ -695004,8 +702095,8 @@ self: {
       pname = "these-optics";
       version = "1.0.2";
       sha256 = "0a63xfqj841i7pwdjzg067ixs0lj9ngwfjps6yyk5gyqqmhirqsv";
-      revision = "1";
-      editedCabalFile = "1625hyziyr50syph34nvx91mz2w8d9y64rn7nc0flg2w5csfm8gm";
+      revision = "2";
+      editedCabalFile = "0g2ysbpgh851dc8j84znzds629hkni2adhskywgdzza06dm376vi";
       libraryHaskellDepends = [
         base
         optics-core
@@ -695343,7 +702434,6 @@ self: {
     {
       mkDerivation,
       base,
-      containers,
       ghc-prim,
       hspec,
       hspec-expectations,
@@ -695351,24 +702441,23 @@ self: {
     }:
     mkDerivation {
       pname = "thread-utils-context";
-      version = "0.3.0.4";
-      sha256 = "1z40qlr40iylms4623bhz9m54zln05vrh9iamypy7d2l5fb4y556";
+      version = "0.4.1.0";
+      sha256 = "08xwlx347sys54hyfxww27f48l43689hl01xcpkllyav7waaaq57";
       libraryHaskellDepends = [
         base
-        containers
         ghc-prim
         thread-utils-finalizers
       ];
       testHaskellDepends = [
         base
-        containers
         ghc-prim
         hspec
         hspec-expectations
         thread-utils-finalizers
       ];
+      benchmarkHaskellDepends = [ base ];
       description = "Garbage-collected thread local storage";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -697754,6 +704843,8 @@ self: {
       pname = "time-compat";
       version = "1.9.9";
       sha256 = "09bwvzxd41mmr3vq4az301fziy3aaglhky7bbs2ib76gagnxvylh";
+      revision = "1";
+      editedCabalFile = "1q1javzrcyphpm9kn846vi0a00mi04lvc1via6r0ivl77h61wa8c";
       libraryHaskellDepends = [
         base
         base-orphans
@@ -698153,7 +705244,7 @@ self: {
     }
   ) { };
 
-  time-manager_0_3_1_1 = callPackage (
+  time-manager_0_3_2 = callPackage (
     {
       mkDerivation,
       base,
@@ -698164,8 +705255,8 @@ self: {
     }:
     mkDerivation {
       pname = "time-manager";
-      version = "0.3.1.1";
-      sha256 = "0d76m2qcvcl4pwdj82gvgag13mzsvrbby4s7iz2w6920qkyc31gd";
+      version = "0.3.2";
+      sha256 = "069nxlls9mswhf5xab0vnnk921a0q9v5fja72xmk170a00gfqvbp";
       libraryHaskellDepends = [
         base
         containers
@@ -699590,6 +706681,8 @@ self: {
       pname = "timezone-olson";
       version = "0.2.1";
       sha256 = "10f5843sza2ikj2sg9fjhf5dhnhcidad86cdjmrj1y6zclkiqmdc";
+      revision = "1";
+      editedCabalFile = "07xqp89p7w1a54irxnvmzfw9lcqvwiw60ypxkiwxvawfncvnadg0";
       libraryHaskellDepends = [
         base
         binary
@@ -699616,6 +706709,8 @@ self: {
       pname = "timezone-olson-th";
       version = "0.1.0.11";
       sha256 = "0lpsmjy99l1yqz23dqb31cx08wg19bd4qzfmsqzz7hfmz0dgjqsj";
+      revision = "1";
+      editedCabalFile = "1fji65x33ccb8hsya2ff5rzq8aayrmir7vb40xkpmw826zpq5h7x";
       libraryHaskellDepends = [
         base
         template-haskell
@@ -699639,8 +706734,8 @@ self: {
       pname = "timezone-series";
       version = "0.1.13";
       sha256 = "18n6w7jxwlysq5mvb1sp1z57nyrsgn2ans642fy5rhmpwcavgvr8";
-      revision = "1";
-      editedCabalFile = "1ak05p8z1q2nispv1xw32j7lhfmf3sfj2ibjrxpm347s37fmxnwc";
+      revision = "2";
+      editedCabalFile = "04j9priqhfjcglp5b02spqd8mdj52kglr4hhq84qr6r2ggv01s7l";
       libraryHaskellDepends = [
         base
         deepseq
@@ -699986,6 +707081,43 @@ self: {
     }
   ) { };
 
+  tinycheck = callPackage (
+    {
+      mkDerivation,
+      base,
+      deepseq,
+      generics-sop,
+      tagged,
+      tasty,
+      tasty-bench,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "tinycheck";
+      version = "0.2.0";
+      sha256 = "16s6kp37yxhhsga9a5i4609wawv6k008v4mn8f8h0cpx5f72bvyi";
+      libraryHaskellDepends = [
+        base
+        generics-sop
+        tagged
+        tasty
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        tasty
+      ];
+      benchmarkHaskellDepends = [
+        base
+        deepseq
+        tasty
+        tasty-bench
+      ];
+      description = "A lightweight enumeration-based property testing library";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   tinyfiledialogs = callPackage (
     {
       mkDerivation,
@@ -701167,7 +708299,7 @@ self: {
     }
   ) { };
 
-  tls_2_3_0 = callPackage (
+  tls_2_4_1 = callPackage (
     {
       mkDerivation,
       async,
@@ -701188,6 +708320,7 @@ self: {
       hpke,
       hspec,
       hspec-discover,
+      mlkem,
       mtl,
       network,
       network-run,
@@ -701203,8 +708336,8 @@ self: {
     }:
     mkDerivation {
       pname = "tls";
-      version = "2.3.0";
-      sha256 = "1zjnzj12y1mc5l0ibgc549iwasp6wp2azcgv4n0927yjrayd8gx3";
+      version = "2.4.1";
+      sha256 = "1crv34z1fp7zxp0x1yxhw4hbna9n0va6xlihrxw3zp2274ydihml";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -701221,6 +708354,7 @@ self: {
         data-default
         ech-config
         hpke
+        mlkem
         mtl
         network
         ram
@@ -701242,6 +708376,7 @@ self: {
         ech-config
         hspec
         QuickCheck
+        ram
         serialise
         time-hourglass
       ];
@@ -701412,6 +708547,8 @@ self: {
       pname = "tls-session-manager";
       version = "0.1.0";
       sha256 = "07mxdw9rh74m7l3z1ibwc490kn093w1xhbdm6qi1qfnkz1b199r9";
+      revision = "1";
+      editedCabalFile = "1m2lv0fqznizwiv9kkrybvih9g1dfahbs8l9cvy5knhiv2jkdfnm";
       libraryHaskellDepends = [
         auto-update
         base
@@ -701766,8 +708903,8 @@ self: {
     }:
     mkDerivation {
       pname = "tmp-proc";
-      version = "0.7.2.5";
-      sha256 = "1ixfig07xg3zzb81s9dsrcfrmi5sgwm5rm6izzh1128wr7l9zw1m";
+      version = "0.7.2.6";
+      sha256 = "1rr7mc204m23f83py01ahl9ackscp7b5s5h1zahhjfdfax1rn4wd";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -703025,8 +710162,8 @@ self: {
       pname = "toml-parser";
       version = "2.0.2.0";
       sha256 = "1a71imxdzhkjbbsj39jmj1w9hbp3m0wphd1j2x2a5gm9xvjmx2wy";
-      revision = "1";
-      editedCabalFile = "02mgl73181q92iwzws45ixgr358xs5qpz54xpkpx1spwxx1r4fms";
+      revision = "2";
+      editedCabalFile = "0csppdfb5z7vfff6qsb7k3adzkfmpfcqncy6rkxv23cqz1p7kkyn";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -704518,6 +711655,62 @@ self: {
     }
   ) { };
 
+  tower-hs = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      bytestring,
+      hedis,
+      hs-opentelemetry-api,
+      hspec,
+      hspec-discover,
+      process,
+      profunctors,
+      QuickCheck,
+      stm,
+      testcontainers,
+      text,
+      time,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "tower-hs";
+      version = "0.3.0.1";
+      sha256 = "17g1zrcmvidnla8475hd2964p1qrvpamibrlr92rvbz82f20h8wm";
+      libraryHaskellDepends = [
+        async
+        base
+        hs-opentelemetry-api
+        profunctors
+        stm
+        text
+        time
+        transformers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        bytestring
+        hedis
+        hs-opentelemetry-api
+        hspec
+        hspec-discover
+        process
+        QuickCheck
+        stm
+        testcontainers
+        text
+        time
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Composable service middleware for Haskell, inspired by Rust's Tower";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   toxcore = callPackage (
     {
       mkDerivation,
@@ -705663,9 +712856,7 @@ self: {
       ];
       description = "A command-line tool for live monitoring";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "trackit";
-      broken = true;
     }
   ) { };
 
@@ -710414,6 +717605,69 @@ self: {
     }
   ) { };
 
+  tui-launcher = callPackage (
+    {
+      mkDerivation,
+      base,
+      brick,
+      containers,
+      directory,
+      filepath,
+      optparse-applicative,
+      process,
+      tasty,
+      tasty-hunit,
+      text,
+      tomland,
+      tuispec,
+      unix,
+      vty,
+      vty-crossplatform,
+    }:
+    mkDerivation {
+      pname = "tui-launcher";
+      version = "0.0.1";
+      sha256 = "0rg5zdgswvppibk2q195pm75q65c5i7fa3qdsrx7wjv026xi9jib";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        base
+        brick
+        containers
+        directory
+        filepath
+        optparse-applicative
+        process
+        text
+        tomland
+        unix
+        vty
+        vty-crossplatform
+      ];
+      testHaskellDepends = [
+        base
+        brick
+        containers
+        directory
+        filepath
+        optparse-applicative
+        process
+        tasty
+        tasty-hunit
+        text
+        tomland
+        tuispec
+        unix
+        vty
+        vty-crossplatform
+      ];
+      description = "Small Brick-based terminal launcher";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "tui-launcher";
+    }
+  ) { };
+
   tuispec = callPackage (
     {
       mkDerivation,
@@ -715199,10 +722453,8 @@ self: {
     }:
     mkDerivation {
       pname = "typed-protocols";
-      version = "1.2.0.0";
-      sha256 = "1sxw1m4k8vwp0acdh5q1yrn6k68q7l75aa91qip2cvb0bwqkqsg1";
-      revision = "2";
-      editedCabalFile = "1hacq8s04g3jmm7q31008ab0xlf560byji66030xgplzcd34dc4g";
+      version = "1.2.1.0";
+      sha256 = "0gv4mb9vjnfpsckfhhs5g0jvbdv2fx9jlkfcnlmn2kblgp31jz93";
       libraryHaskellDepends = [
         base
         bytestring
@@ -716631,7 +723883,7 @@ self: {
     }
   ) { };
 
-  typst_0_9 = callPackage (
+  typst_0_9_0_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -716661,10 +723913,8 @@ self: {
     }:
     mkDerivation {
       pname = "typst";
-      version = "0.9";
-      sha256 = "11np3g5l6yqm33j4vkl65pfdcjs2dj7302lyyp9pq2i6lsi7kxmn";
-      revision = "1";
-      editedCabalFile = "1qyhvyfz9dizkclmc5jkq5cmdjms8qmsppy66qn7il2dz7aggbj2";
+      version = "0.9.0.1";
+      sha256 = "013li974rqm125k8kj12mc1j84pzqx4k9rf3nci57mfv4z6wb36v";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -716824,8 +724074,8 @@ self: {
       pname = "tz";
       version = "0.1.3.6";
       sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd";
-      revision = "9";
-      editedCabalFile = "0a2i820w6zpf0vi4ammi4jsq80h072abd5czsxjmisjkwz2rrajp";
+      revision = "10";
+      editedCabalFile = "113bkiafhsadq056yzj96xfp3x6zjk1r5p0v7jl3ck56q259nzw3";
       libraryHaskellDepends = [
         base
         binary
@@ -716882,6 +724132,8 @@ self: {
       pname = "tzdata";
       version = "0.2.20250115.0";
       sha256 = "1h9sn9rngmvk2lqljcmysq9m7nwxlscm65rbzjqik8apsnb9qa53";
+      revision = "1";
+      editedCabalFile = "1dwdvsn34sf9y66ply1vh6cs1j9mz4q60nmwiq66nhmlixk9rnjx";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         base
@@ -717819,8 +725071,8 @@ self: {
     }:
     mkDerivation {
       pname = "uhd";
-      version = "0.1.0.0";
-      sha256 = "10n9mqjar39a9m9dbxfiaj11y5fynzhlcjb6qshykqr2cxzdwbjc";
+      version = "0.1.0.1";
+      sha256 = "0a9gdh28lavxjkf158d4n4l371jbnqva1k8yswc9mrbfgsf70f7i";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -720097,8 +727349,8 @@ self: {
     }:
     mkDerivation {
       pname = "uniform-error";
-      version = "0.1.5.1";
-      sha256 = "0fj8p4s5np1irc7j7i39a1i8a94bp1cjf9nqng74x6nwj139hs4i";
+      version = "0.1.5.2";
+      sha256 = "1kw9chik6gk8w7d471ri5q861cl7n3scjg57s72n5jbw07blwdv1";
       libraryHaskellDepends = [
         base
         data-default
@@ -720147,8 +727399,8 @@ self: {
     }:
     mkDerivation {
       pname = "uniform-fileio";
-      version = "0.1.5.1";
-      sha256 = "1y92wxzgnj25v06mlx3a6dhkqxhbdr4d6dxa71n9g04zzcp2ghk6";
+      version = "0.1.5.2";
+      sha256 = "0w53ixsash6g9fzxlyglx3ghx3nsmjl0a0n36562gj421b3qvz2z";
       libraryHaskellDepends = [
         base
         bytestring
@@ -720440,6 +727692,8 @@ self: {
       ];
       description = "uniform wrapper for shake";
       license = "GPL";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -720590,8 +727844,8 @@ self: {
     }:
     mkDerivation {
       pname = "uniformBase";
-      version = "0.1.5.1";
-      sha256 = "0nxz5c28jjfnfcx4dwl1kk6vpkz1yzhhfxd73457xxfc3z7sfg82";
+      version = "0.1.5.2";
+      sha256 = "0dl5p9avpjbvsnl7ybap55bcpnk5dz4x4z3544fd6x95bidjdw6p";
       libraryHaskellDepends = [
         base
         data-default
@@ -720653,8 +727907,8 @@ self: {
     }:
     mkDerivation {
       pname = "union";
-      version = "0.1.3";
-      sha256 = "1msr9s021c52xgh0665wbyxs7ssrs2w0nr7yz7f7l6kjhrc3sjmr";
+      version = "0.1.3.2";
+      sha256 = "1y4g2xj968dzwg4ljaxnjq6xymsas00h6d44d18g5k7d8afdnp4y";
       libraryHaskellDepends = [
         base
         deepseq
@@ -721784,8 +729038,8 @@ self: {
       pname = "universe-base";
       version = "1.1.4";
       sha256 = "160yyhbvfnl88kbxx4rpmb03b4mqhkig833flqzxq9r96ygmirdf";
-      revision = "1";
-      editedCabalFile = "04kxm2s2gc6g4q4227avyibzx57v9wn9wwglhmwsqzjsv9f3l84a";
+      revision = "2";
+      editedCabalFile = "076r1kbvnw1jdg71gjq84i5bqk3a66fs9h78c00r6hbc59m6c9c9";
       libraryHaskellDepends = [
         base
         containers
@@ -721812,8 +729066,8 @@ self: {
       pname = "universe-dependent-sum";
       version = "1.3.1";
       sha256 = "0nxhw5wbyq0nf6m4kz64815iqwkif8clkg7gd60bbzwzg4wvjgxc";
-      revision = "1";
-      editedCabalFile = "0vd648zkp7v6d9spkgiw55vkpk96y9894ng7jf4wwaw5arf87ma5";
+      revision = "2";
+      editedCabalFile = "1xi189lgx46qq0gfxxp1zfnxn3f6hdjhmn24lng838zb9c94kw6p";
       libraryHaskellDepends = [
         base
         universe-some
@@ -721859,8 +729113,8 @@ self: {
       pname = "universe-instances-extended";
       version = "1.1.4";
       sha256 = "0kvwba4hd4ikwprrcyqh32mvbcy47gs47gc8ssh6m23jlj9rll2h";
-      revision = "1";
-      editedCabalFile = "0zk8j3m73na0zx1wz9axp4s0hbms76h791x2cqr2nlifx3fdjjb3";
+      revision = "2";
+      editedCabalFile = "05psznlnaa0zlzhy3lspri4gv6h4vbg1cihqnkx9hxs1rqp706lj";
       libraryHaskellDepends = [
         adjunctions
         base
@@ -721907,8 +729161,8 @@ self: {
       pname = "universe-reverse-instances";
       version = "1.1.2";
       sha256 = "0kipii0wjsw8zhc8ajr4x7j8jiff4r92bdanpzf6fddzdd6a2ai5";
-      revision = "1";
-      editedCabalFile = "1nrz7jnq2kr397b9ysl8rin135bxd6q6pkngk26rvh17riygnkrb";
+      revision = "2";
+      editedCabalFile = "1vx5kavr03gc86j7h4ichs364964m8g82nrz1x0h8ncc4l50aqgi";
       libraryHaskellDepends = [
         base
         containers
@@ -721926,21 +729180,17 @@ self: {
       some,
       template-haskell,
       th-abstraction,
-      transformers,
       universe-base,
     }:
     mkDerivation {
       pname = "universe-some";
-      version = "1.2.2";
-      sha256 = "1w6jd4mn2dzp9p147xwzaaq32l5zm906i8rd3aisw86chq2ivzzb";
-      revision = "1";
-      editedCabalFile = "0mrvhbgaxlvk28kdkx6z49qczzcv0x6a5v42mrmi1420f4nvfigj";
+      version = "1.2.2.1";
+      sha256 = "1halagqwlmxm68z1hb6v11zn2jxbbvb1rrbs3lcfass9yrhcf6az";
       libraryHaskellDepends = [
         base
         some
         template-haskell
         th-abstraction
-        transformers
         universe-base
       ];
       testHaskellDepends = [
@@ -722948,10 +730198,10 @@ self: {
     }:
     mkDerivation {
       pname = "unliftio-servant-server";
-      version = "0.1.0.1";
-      sha256 = "16ddmcacd1laa5y1k8x1xddhbbfw03xad6yc2hsca4kih1lsiw61";
+      version = "0.1.0.2";
+      sha256 = "1mw0ibq1j538qimm0mkrhcxn1l65rm0bkqbqwfcj6bijlq7h45wb";
       revision = "1";
-      editedCabalFile = "0ihpwclzkh9b1x7v696y9g0jsvcliqdkrwlv7nia4k5yby5r1v50";
+      editedCabalFile = "1jn6kj9grkskbypw2fqnp9g9q3x0n7mpbydf5aw5r4fq6d0904k7";
       libraryHaskellDepends = [
         base
         mtl
@@ -723853,8 +731103,8 @@ self: {
     }:
     mkDerivation {
       pname = "unwitch";
-      version = "2.1.0";
-      sha256 = "020jlm0jrnxfrnaw5dp5fa0hn52m9lyq6aqcyv2zjih3dz6867yn";
+      version = "3.0.0";
+      sha256 = "1jhfgpqsa6iszdwv0ssgsmrz8dn4n11nrdr4igg83z8z36ssxrd9";
       libraryHaskellDepends = [
         base
         bytestring
@@ -726905,16 +734155,13 @@ self: {
       tasty,
       tasty-hunit,
       tasty-quickcheck,
-      text,
       time,
       uuid-types,
     }:
     mkDerivation {
       pname = "uuid";
-      version = "1.3.16";
-      sha256 = "1xhdf8zw2n2h4c0f8xf76c2gsjvldz34zgc4sn6wqpzcnk7pjihs";
-      revision = "3";
-      editedCabalFile = "153pkkljg08pdv6hjdzzq67dzwy0k4c4k68ha110ak4d96iibc6r";
+      version = "1.3.16.1";
+      sha256 = "04xidj4dahwnry0mnkkbpiwclbcx88c18gqnipzcncnkl0g7dbzk";
       libraryHaskellDepends = [
         base
         binary
@@ -726924,7 +734171,6 @@ self: {
         entropy
         network-info
         random
-        text
         time
         uuid-types
       ];
@@ -726932,7 +734178,6 @@ self: {
         base
         bytestring
         QuickCheck
-        random
         tasty
         tasty-hunit
         tasty-quickcheck
@@ -727130,10 +734375,8 @@ self: {
     }:
     mkDerivation {
       pname = "uuid-types";
-      version = "1.0.6";
-      sha256 = "0zimp0v7hx073rcb4y9l463jfg4y3yqxdbmw975d6vrx919xj3by";
-      revision = "3";
-      editedCabalFile = "183dz7p96r7da14064xkvdzxs66gzlxi26xca5m6yrypm20vdhjs";
+      version = "1.0.6.1";
+      sha256 = "091h1ifc1srv803rrkw794xiiha51nglsh61mjv084bip5wg404z";
       libraryHaskellDepends = [
         base
         binary
@@ -727152,7 +734395,6 @@ self: {
         tasty
         tasty-hunit
         tasty-quickcheck
-        template-haskell
       ];
       description = "Type definitions for Universally Unique Identifiers";
       license = lib.licenses.bsd3;
@@ -727901,6 +735143,54 @@ self: {
     }
   ) { };
 
+  validation_1_2_2 = callPackage (
+    {
+      mkDerivation,
+      assoc,
+      base,
+      bifunctors,
+      deepseq,
+      hedgehog,
+      lens,
+      process,
+      profunctors,
+      selective,
+      semigroupoids,
+      semigroups,
+      tagged,
+    }:
+    mkDerivation {
+      pname = "validation";
+      version = "1.2.2";
+      sha256 = "1xdvgp384glpa9qbsq332bb93czzyysgkcp1gz928xz5prabw78a";
+      libraryHaskellDepends = [
+        assoc
+        base
+        bifunctors
+        deepseq
+        lens
+        profunctors
+        selective
+        semigroupoids
+        semigroups
+        tagged
+      ];
+      testHaskellDepends = [
+        assoc
+        base
+        bifunctors
+        hedgehog
+        lens
+        process
+        semigroupoids
+        semigroups
+      ];
+      description = "A data-type like Either but with an accumulating Applicative";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   validation-micro = callPackage (
     {
       mkDerivation,
@@ -728493,6 +735783,58 @@ self: {
     }
   ) { };
 
+  valuations = callPackage (
+    {
+      mkDerivation,
+      adjunctions,
+      base,
+      bifunctors,
+      comonad,
+      containers,
+      contravariant,
+      distributive,
+      doctest,
+      lens,
+      mtl,
+      process,
+      profunctors,
+      selective,
+      semigroupoids,
+      unordered-containers,
+      witherable,
+    }:
+    mkDerivation {
+      pname = "valuations";
+      version = "0.0.6";
+      sha256 = "0nadv6ipri3gby1g2s1kdhccysvpwn0wc97gvfjaz8gcg8l4d6fs";
+      libraryHaskellDepends = [
+        adjunctions
+        base
+        bifunctors
+        comonad
+        containers
+        contravariant
+        distributive
+        lens
+        mtl
+        profunctors
+        selective
+        semigroupoids
+        unordered-containers
+        witherable
+      ];
+      testHaskellDepends = [
+        base
+        process
+      ];
+      testToolDepends = [ doctest ];
+      description = "Valuations";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   value-supply = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -728874,8 +736216,8 @@ self: {
     }:
     mkDerivation {
       pname = "variant";
-      version = "1.0.1";
-      sha256 = "0c3c10il82php0nn9f9j6lcim27hyg8dq3bw4iqxdc3zj34plazs";
+      version = "1.0.2";
+      sha256 = "18nwggg8lyybfzj8ag2k2vjrf26srjqc3rp7sfb3syridcqmrwxg";
       libraryHaskellDepends = [
         base
         deepseq
@@ -730490,8 +737832,8 @@ self: {
       pname = "vector-hashtables";
       version = "0.1.2.1";
       sha256 = "1cdfvrpnia7bgqaw8yg0n23svbsdz72gss0hrkrvc5rwzxwhz49k";
-      revision = "1";
-      editedCabalFile = "0745rz7ym5y39n74skq7qw4lf6bg3ysh6k35sj7775zlbd5drp3l";
+      revision = "2";
+      editedCabalFile = "11j7ikcls0r8lhydc1fiixijw7bz1zw1zi8vj2yg4ydh305ncxzm";
       libraryHaskellDepends = [
         base
         hashable
@@ -735704,6 +743046,29 @@ self: {
     }
   ) { };
 
+  wai-asset-path = callPackage (
+    {
+      mkDerivation,
+      base,
+      text,
+      vault,
+      wai,
+    }:
+    mkDerivation {
+      pname = "wai-asset-path";
+      version = "1.0.0";
+      sha256 = "12c2yz6vbf90xql2f9ga5blk62jy4mgdbsdfpbwd6vkxql8n0jd0";
+      libraryHaskellDepends = [
+        base
+        text
+        vault
+        wai
+      ];
+      description = "assetPath function for WAI";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   wai-cli = callPackage (
     {
       mkDerivation,
@@ -735789,8 +743154,8 @@ self: {
     }:
     mkDerivation {
       pname = "wai-control";
-      version = "0.2.0.0";
-      sha256 = "091plz38ixm4h54hycgyz5g24h2w1wg25bqsbsfyjyhjjzh4a150";
+      version = "0.2.0.1";
+      sha256 = "10qmq4yhfs080gg8j9fi77jy9mscd0zxccnfir0yyggjzlkir6fg";
       libraryHaskellDepends = [
         base
         unliftio-core
@@ -736323,6 +743688,37 @@ self: {
     }
   ) { };
 
+  wai-flash-messages = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      cereal,
+      cereal-text,
+      text,
+      vault,
+      wai,
+      wai-session,
+    }:
+    mkDerivation {
+      pname = "wai-flash-messages";
+      version = "1.0.0";
+      sha256 = "1k7wdx2shkv3bdaam9ayajp6vl13k8sx8zs647rcf31ph1ykingk";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        cereal
+        cereal-text
+        text
+        vault
+        wai
+        wai-session
+      ];
+      description = "Flash messages for wai apps";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   wai-frontend-monadcgi = callPackage (
     {
       mkDerivation,
@@ -737960,8 +745356,8 @@ self: {
     }:
     mkDerivation {
       pname = "wai-middleware-delegate";
-      version = "0.2.0.1";
-      sha256 = "1xqrfi6rqpa8k2iix9mcgyscavjjz3qdpm3gp1dijvyxfbwwp95m";
+      version = "0.2.0.2";
+      sha256 = "1jkhfak7fxf782q5azyyl1zmgpa0kd05x5l2vz9mvb3yk85n4wfv";
       libraryHaskellDepends = [
         async
         base
@@ -738307,6 +745703,59 @@ self: {
     }
   ) { };
 
+  wai-middleware-openapi = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      filepath,
+      hspec,
+      http-media,
+      http-types,
+      insert-ordered-containers,
+      lens,
+      mtl,
+      openapi3,
+      text,
+      wai,
+      wai-extra,
+    }:
+    mkDerivation {
+      pname = "wai-middleware-openapi";
+      version = "0.1.0.0";
+      sha256 = "1riil7v5xlv7vpq049vfq61dg5k994fnr29ldlji44mdqvkffmql";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        filepath
+        http-media
+        http-types
+        insert-ordered-containers
+        lens
+        mtl
+        openapi3
+        text
+        wai
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        hspec
+        http-types
+        insert-ordered-containers
+        lens
+        openapi3
+        text
+        wai
+        wai-extra
+      ];
+      description = "TODO";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   wai-middleware-preprocessor = callPackage (
     {
       mkDerivation,
@@ -739095,6 +746544,67 @@ self: {
     }
   ) { };
 
+  wai-request-params = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      base,
+      bytestring,
+      deepseq,
+      hspec,
+      http-types,
+      scientific,
+      string-conversions,
+      text,
+      time,
+      uuid,
+      vault,
+      vector,
+      wai,
+      wai-extra,
+    }:
+    mkDerivation {
+      pname = "wai-request-params";
+      version = "1.0.0";
+      sha256 = "1r0rapyscvq5vikbj0vfwrzyrm71fi10g1fgynka4islfql94dyn";
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        bytestring
+        deepseq
+        http-types
+        scientific
+        string-conversions
+        text
+        time
+        uuid
+        vault
+        vector
+        wai
+        wai-extra
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        hspec
+        http-types
+        scientific
+        string-conversions
+        text
+        time
+        uuid
+        vault
+        wai
+        wai-extra
+      ];
+      description = "Generic parameter parsing for WAI requests";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   wai-request-spec = callPackage (
     {
       mkDerivation,
@@ -739714,6 +747224,74 @@ self: {
     }
   ) { };
 
+  wai-session-clientsession-deferred = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      cereal,
+      clientsession,
+      transformers,
+      wai-session-maybe,
+    }:
+    mkDerivation {
+      pname = "wai-session-clientsession-deferred";
+      version = "1.0.0";
+      sha256 = "05s7bv409rd7clrggq4f9wwbzrzq9ykc6qzcwdav47xkx2kk8p1l";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        cereal
+        clientsession
+        transformers
+        wai-session-maybe
+      ];
+      description = "Session store based on clientsession with deferred decryption";
+      license = "unknown";
+    }
+  ) { };
+
+  wai-session-maybe = callPackage (
+    {
+      mkDerivation,
+      base,
+      blaze-builder,
+      bytestring,
+      bytestring-builder,
+      containers,
+      cookie,
+      entropy,
+      http-types,
+      StateVar,
+      time,
+      transformers,
+      vault,
+      wai,
+    }:
+    mkDerivation {
+      pname = "wai-session-maybe";
+      version = "1.0.0";
+      sha256 = "0bb8sm399dsl6ngqc4d7wabp41pny3rlld02l50lwknhnwazhs6b";
+      libraryHaskellDepends = [
+        base
+        blaze-builder
+        bytestring
+        bytestring-builder
+        containers
+        cookie
+        entropy
+        http-types
+        StateVar
+        time
+        transformers
+        vault
+        wai
+      ];
+      description = "Flexible session middleware for WAI";
+      license = "unknown";
+    }
+  ) { };
+
   wai-session-mysql = callPackage (
     {
       mkDerivation,
@@ -740794,7 +748372,7 @@ self: {
     }
   ) { };
 
-  warp_3_4_12 = callPackage (
+  warp_3_4_13 = callPackage (
     {
       mkDerivation,
       array,
@@ -740808,7 +748386,6 @@ self: {
       criterion,
       crypton-x509,
       directory,
-      ghc-prim,
       hashable,
       hspec,
       hspec-discover,
@@ -740833,10 +748410,8 @@ self: {
     }:
     mkDerivation {
       pname = "warp";
-      version = "3.4.12";
-      sha256 = "10kha4imjn2c86ssqj68xyg5ylns8hiiwpyx0zvadhkjbg9r1k83";
-      revision = "1";
-      editedCabalFile = "0k717j5csxxksrrq08zix7nxp1pgzgrd72m3nhsjps7iqh3lwi74";
+      version = "3.4.13";
+      sha256 = "1dlcv9grnkswxwndb0qpn6qw5qlwx5h6hgz7jkw24ad8kkxn098x";
       libraryHaskellDepends = [
         array
         async
@@ -740847,7 +748422,6 @@ self: {
         case-insensitive
         containers
         crypton-x509
-        ghc-prim
         hashable
         http-date
         http-types
@@ -740876,7 +748450,6 @@ self: {
         containers
         crypton-x509
         directory
-        ghc-prim
         hashable
         hspec
         http-client
@@ -740908,7 +748481,6 @@ self: {
         containers
         criterion
         crypton-x509
-        ghc-prim
         hashable
         http-date
         http-types
@@ -741126,6 +748698,7 @@ self: {
       bytestring,
       network,
       recv,
+      stm,
       streaming-commons,
       tls,
       tls-session-manager,
@@ -741134,15 +748707,14 @@ self: {
     }:
     mkDerivation {
       pname = "warp-tls";
-      version = "3.4.13";
-      sha256 = "0xxcd5202qcvd1jkiaj85gd8r3www3p7mxwf2j92awvg75jh9lsi";
-      revision = "2";
-      editedCabalFile = "00ff52l030bhc49yclngjkn6p17zv28ycyxkdpmaiic1cipzbkaa";
+      version = "3.4.14";
+      sha256 = "04xpp6mdpc4xap9sfip1x7y3lcrzn4q0zlv4afl0s6q98n6c0m4m";
       libraryHaskellDepends = [
         base
         bytestring
         network
         recv
+        stm
         streaming-commons
         tls
         tls-session-manager
@@ -741649,8 +749221,8 @@ self: {
     }:
     mkDerivation {
       pname = "waterfall-cad";
-      version = "0.6.1.0";
-      sha256 = "1hhybkznqrp4ziab2ww6ai4xmr8p3h75s1kkngk1a81dpkn76a31";
+      version = "0.6.2.1";
+      sha256 = "0x5zcnvdkgj1hpk858yx2371xzrmbc7c495iv2jb0y4ynmpm1bmi";
       libraryHaskellDepends = [
         base
         filepath
@@ -741684,8 +749256,8 @@ self: {
     }:
     mkDerivation {
       pname = "waterfall-cad-examples";
-      version = "0.6.1.0";
-      sha256 = "06hqfgxn6x9k4g389zvpb5ll58j0lshn25qqz4n9r36pqr7yqa7a";
+      version = "0.6.2.1";
+      sha256 = "0flfqyy5dxh99lyv34crqa1r46zisjclxq9plzfw47xg6vnvqdxy";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -741738,8 +749310,8 @@ self: {
     }:
     mkDerivation {
       pname = "waterfall-cad-svg";
-      version = "0.6.1.0";
-      sha256 = "1i8jna60yf4vzipgfxl5zpgb4ig54cym2v3p966gixqw24kc57qb";
+      version = "0.6.2.1";
+      sha256 = "1n0pl8g2axl0n8qwbgqp43jr0vlk0sbphzfhiiv7kyrq11fwwv13";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -742672,8 +750244,8 @@ self: {
     }:
     mkDerivation {
       pname = "web-rep";
-      version = "0.14.0.1";
-      sha256 = "1ws7hyk85jwzpy6dvq7giryq8i3d04xxn4px66jlfg9pi1b1rz1x";
+      version = "0.14.1.0";
+      sha256 = "19lpn31y7q8ckrhpybksf77xvvnn4agynl3zfz39f3rqqanbbmv4";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -743220,7 +750792,6 @@ self: {
       ];
       description = "Haskell Web3 library";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -743265,7 +750836,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Fixed size big integers for Haskell Web3 library";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -743328,7 +750898,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Cryptograhical primitives for Haskell Web3 library";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -743425,7 +750994,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Ethereum support for Haskell Web3 library";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -743556,7 +751124,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Polkadot support for Haskell Web3 library";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -743594,7 +751161,6 @@ self: {
       ];
       description = "Node connection provider for Haskell Web3 library";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -743669,7 +751235,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Solidity language for Haskell Web3 library";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -743711,7 +751276,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Tools for working with Crypto/Web3";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -745177,8 +752741,8 @@ self: {
       pname = "webgear-core";
       version = "1.5.0";
       sha256 = "1f5dy707rcb25n0w5ld210vczaa3az2y6xvg5jn7gwsxs23a8b3k";
-      revision = "1";
-      editedCabalFile = "0yrwdb3cnfqkhfasi7c5hhsaw44xvvsm0nmrkjyhz3fy2h9xpn4d";
+      revision = "2";
+      editedCabalFile = "072av65fzm4fpmsaqjc2d7h3h523w73phpx4nhxwkw9vzvvsg0qy";
       libraryHaskellDepends = [
         arrows
         base
@@ -745257,6 +752821,8 @@ self: {
       pname = "webgear-openapi";
       version = "1.5.0";
       sha256 = "0amwhdbb1va8c7ham34zbjpd5azwvwsl5d4i7xyfkq8gzry9vji6";
+      revision = "1";
+      editedCabalFile = "1zgpwzqgxj690qgyasxybzl5s7hy4zs2ihnsq9xmh6ylp0h95cf3";
       libraryHaskellDepends = [
         arrows
         base
@@ -745379,8 +752945,8 @@ self: {
       pname = "webgear-server";
       version = "1.5.0";
       sha256 = "1srr5kblk1b59jyrkidh9js4yax8dvjyici283z25yk2lnqijc2y";
-      revision = "1";
-      editedCabalFile = "0wx2qlwkk6yxnpfxy9261fwn7xkykcll7636ls6kxvc5ybwyn5h6";
+      revision = "2";
+      editedCabalFile = "13vcrl4rspbgv37fila9b6x2xhqnj0smi8fmdrp2ypn4148wfj44";
       libraryHaskellDepends = [
         aeson
         arrows
@@ -745472,6 +753038,8 @@ self: {
       pname = "webgear-swagger";
       version = "1.5.0";
       sha256 = "0vgd506yqfj02l6a25wfwi03xxf6nyg9gkh2phq85g88v22brwpf";
+      revision = "1";
+      editedCabalFile = "1lb6q57drmixijnkq4hzn27y4xshn5ls8i06cqs2qhkkj7gcjsf3";
       libraryHaskellDepends = [
         arrows
         base
@@ -745533,6 +753101,8 @@ self: {
       pname = "webgear-swagger-ui";
       version = "1.5.0";
       sha256 = "02larl8s6b9i1rkbw6gflyz0pn8ba80yd0i6w73mifkma7m39zxi";
+      revision = "1";
+      editedCabalFile = "1b6rarcx1my050nr51p73wak9d4jqkyjv46apnidzl58czj602bc";
       libraryHaskellDepends = [
         base
         bytestring
@@ -746166,8 +753736,8 @@ self: {
       pname = "websockets";
       version = "0.13.0.0";
       sha256 = "1da95b71akggyikbxdmja3gcaqrz8sp6ri5jrsyavc2ickvi9y4s";
-      revision = "5";
-      editedCabalFile = "0nm0lj8cv5z5y2d0bz0rfl3bz100swhind4wn95b7q2ma2x80dlv";
+      revision = "6";
+      editedCabalFile = "0nx7zz7mj4q1aj3v4hdlr5ssw6hm6fvrgs1lfmigcvhc75myrw7a";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -748509,6 +756079,46 @@ self: {
     }
   ) { };
 
+  wild-bind_0_1_2_15 = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      hspec,
+      hspec-discover,
+      microlens,
+      QuickCheck,
+      semigroups,
+      stm,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "wild-bind";
+      version = "0.1.2.15";
+      sha256 = "04m4rvyz6w84kfvgzvv4963x41jm6bq5mlzjmi2wp0adjp2n8gz0";
+      libraryHaskellDepends = [
+        base
+        containers
+        semigroups
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        hspec
+        microlens
+        QuickCheck
+        stm
+        transformers
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Dynamic key binding framework";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   wild-bind-indicator = callPackage (
     {
       mkDerivation,
@@ -749184,8 +756794,8 @@ self: {
     }:
     mkDerivation {
       pname = "witch";
-      version = "1.3.0.9";
-      sha256 = "05a2fn013qcyqcj4mb2qz79rv59ajwz06dn39m6iw3k7d9vwn9cv";
+      version = "1.3.1.0";
+      sha256 = "15pkybgf02cjrigj0n9r4yjrir3py4ap8chhqm9r3snpzy1a5jsd";
       libraryHaskellDepends = [
         base
         bytestring
@@ -750857,8 +758467,8 @@ self: {
     }:
     mkDerivation {
       pname = "wordify";
-      version = "0.6.0.0";
-      sha256 = "16gqsp7krynnn35qvv821959yl5mh1lrhz7dxsfvdaib10cxfwlj";
+      version = "0.7.0.0";
+      sha256 = "1cvf00c4lrkl8759w05ng70408dh2cagazydla7knxiypc71k1wd";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -752030,6 +759640,130 @@ self: {
     }
   ) { };
 
+  wreq_0_5_4_5 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      attoparsec,
+      authenticate-oauth,
+      base,
+      base16-bytestring,
+      base64-bytestring,
+      bytestring,
+      Cabal,
+      cabal-doctest,
+      case-insensitive,
+      containers,
+      crypton,
+      directory,
+      doctest,
+      exceptions,
+      filepath,
+      hashable,
+      http-client,
+      http-client-tls,
+      http-types,
+      HUnit,
+      lens,
+      lens-aeson,
+      mime-types,
+      network-info,
+      psqueues,
+      QuickCheck,
+      ram,
+      snap-core,
+      snap-server,
+      template-haskell,
+      temporary,
+      test-framework,
+      test-framework-hunit,
+      test-framework-quickcheck2,
+      text,
+      time,
+      time-locale-compat,
+      transformers,
+      unix-compat,
+      unordered-containers,
+      uuid,
+      vector,
+    }:
+    mkDerivation {
+      pname = "wreq";
+      version = "0.5.4.5";
+      sha256 = "1gpxksm8idq75lwkqwgzkq3fszaas59xlwi3na1q7ck4wxjlqap8";
+      isLibrary = true;
+      isExecutable = true;
+      setupHaskellDepends = [
+        base
+        Cabal
+        cabal-doctest
+      ];
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        authenticate-oauth
+        base
+        base16-bytestring
+        bytestring
+        case-insensitive
+        containers
+        crypton
+        exceptions
+        hashable
+        http-client
+        http-client-tls
+        http-types
+        lens
+        lens-aeson
+        mime-types
+        psqueues
+        ram
+        template-haskell
+        text
+        time
+        time-locale-compat
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        base64-bytestring
+        bytestring
+        case-insensitive
+        containers
+        directory
+        doctest
+        filepath
+        hashable
+        http-client
+        http-types
+        HUnit
+        lens
+        lens-aeson
+        network-info
+        QuickCheck
+        snap-core
+        snap-server
+        temporary
+        test-framework
+        test-framework-hunit
+        test-framework-quickcheck2
+        text
+        time
+        transformers
+        unix-compat
+        unordered-containers
+        uuid
+        vector
+      ];
+      description = "An easy-to-use HTTP client library";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   wreq-effectful = callPackage (
     {
       mkDerivation,
@@ -753760,13 +761494,11 @@ self: {
       HUnit,
       MissingH,
       optparse-applicative,
-      text,
-      unordered-containers,
     }:
     mkDerivation {
       pname = "wyvern-diagrams";
-      version = "0.4.1.0";
-      sha256 = "06vgmv4r9spq4q94paawyklm2h45aj330z75l7vkh889wma8g8jx";
+      version = "0.4.2.0";
+      sha256 = "0nb9pc2cq0kx54m20544ss7ii0a3wn1d6n48ng3hrlhzx7zgvzk0";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -753778,8 +761510,6 @@ self: {
         diagrams-svg
         MissingH
         optparse-applicative
-        text
-        unordered-containers
       ];
       executableHaskellDepends = [
         base
@@ -754007,7 +761737,7 @@ self: {
     }
   ) { };
 
-  x509-ocsp_0_5_1_0 = callPackage (
+  x509-ocsp_0_5_2_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -754023,8 +761753,8 @@ self: {
     }:
     mkDerivation {
       pname = "x509-ocsp";
-      version = "0.5.1.0";
-      sha256 = "1zmiz7pssxqk2zpcyh68c6yinl31k4021lcm7myyz71s5b3akcri";
+      version = "0.5.2.1";
+      sha256 = "1lwffxfiqkjrglib2rfjihngaym93sgbch7yhmyzw6cdhg8i2wf8";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         base
@@ -754689,8 +762419,8 @@ self: {
     }:
     mkDerivation {
       pname = "xdg-desktop-entry";
-      version = "0.1.1.3";
-      sha256 = "0kbj76fxmkk4wc0rvw916kw6lryzjiw4m74cz9jhrwmgaap38z4b";
+      version = "0.1.1.4";
+      sha256 = "199jbayp6ng2hdjkgwp3ng3111r6abiw9rar4ngx3mr9d06dyb67";
       libraryHaskellDepends = [
         base
         directory
@@ -768993,6 +776723,52 @@ self: {
     }
   ) { };
 
+  yesod-vite = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      blaze-html,
+      bytestring,
+      containers,
+      hspec,
+      HUnit,
+      text,
+      yesod-core,
+      yesod-static,
+      yesod-test,
+    }:
+    mkDerivation {
+      pname = "yesod-vite";
+      version = "0.2.0.0";
+      sha256 = "1ax40bbhl8d7mw0ahvpqv7gh9sf8jk6ghckdv6ki21gldmq540mg";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        text
+        yesod-core
+        yesod-static
+      ];
+      testHaskellDepends = [
+        base
+        blaze-html
+        bytestring
+        hspec
+        HUnit
+        text
+        yesod-core
+        yesod-static
+        yesod-test
+      ];
+      description = "An integration of vitejs with Yesod";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   yesod-websockets = callPackage (
     {
       mkDerivation,
@@ -770581,6 +778357,68 @@ self: {
     }
   ) { };
 
+  ymonad = callPackage (
+    {
+      mkDerivation,
+      base,
+      binary,
+      bytestring,
+      containers,
+      directory,
+      effectful,
+      filepath,
+      hxt,
+      network,
+      process,
+      relude,
+      stm,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "ymonad";
+      version = "0.1.0.0";
+      sha256 = "10hf4n0dnxz39whranf1vxc5nd6d45lbjrzvw59scqigp2rlnsz5";
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        base
+        binary
+        bytestring
+        containers
+        directory
+        effectful
+        filepath
+        hxt
+        network
+        process
+        relude
+        stm
+        text
+        time
+      ];
+      executableHaskellDepends = [
+        base
+        binary
+        bytestring
+        containers
+        directory
+        effectful
+        filepath
+        hxt
+        network
+        process
+        relude
+        stm
+        text
+        time
+      ];
+      description = "The Wayland Yutani-Monad";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
+    }
+  ) { };
+
   yocto = callPackage (
     {
       mkDerivation,
@@ -775039,8 +782877,8 @@ self: {
     }:
     mkDerivation {
       pname = "zwirn";
-      version = "0.2.2.0";
-      sha256 = "1sxb21fz53h5l6hm1lab9w7y4j3k8i1cg9ccbyq10hqgj84xdkvc";
+      version = "0.2.2.1";
+      sha256 = "1588djfl7vh1bz2r4cjhsw82xyx9f30y04fjbrzl06hfzi1yy25a";
       isLibrary = false;
       isExecutable = true;
       libraryHaskellDepends = [
diff --git a/pkgs/development/haskell-modules/patches/basement-ghcjs.patch b/pkgs/development/haskell-modules/patches/basement-ghcjs.patch
new file mode 100644
index 000000000000..aa858a9c9b48
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/basement-ghcjs.patch
@@ -0,0 +1,11 @@
+diff --git a/basement.cabal b/basement.cabal
+index f85f617..1484ad7 100644
+--- a/basement.cabal
++++ b/basement.cabal
+@@ -156,4 +156,5 @@ library
+   else
+     cpp-options: -DARCH_IS_UNKNOWN_ENDIAN
+   include-dirs:      cbits
+-  c-sources:         cbits/foundation_mem.c
++  if !os(ghcjs)
++    c-sources:       cbits/foundation_mem.c
diff --git a/pkgs/development/haskell-modules/patches/foundation-ghcjs.patch b/pkgs/development/haskell-modules/patches/foundation-ghcjs.patch
new file mode 100644
index 000000000000..1b2cd33d63ab
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/foundation-ghcjs.patch
@@ -0,0 +1,14 @@
+diff --git a/foundation.cabal b/foundation.cabal
+index d33d874..654488b 100644
+--- a/foundation.cabal
++++ b/foundation.cabal
+@@ -169,7 +169,8 @@ library
+                      Foundation.System.Bindings.Hs
+ 
+   include-dirs:      cbits
+-  c-sources:         cbits/foundation_random.c
++  if !os(ghcjs)
++    c-sources:       cbits/foundation_random.c
+                      cbits/foundation_network.c
+                      cbits/foundation_time.c
+                      cbits/foundation_utf8.c
diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index 2b0d720c7df7..d16c97bad0ae 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -41,13 +41,14 @@
   # Unfree optional dependency for hdf4 and hdf5
   enableSzip ? false,
   szip,
+  libaec,
   enableHDF4 ? true,
   hdf4,
   hdf4-forced ? null,
   enableHDF5 ? true,
   # HDF5 format version (API version) 1.10 and 1.12 is not fully compatible
   # Specify if the API version should default to 1.10
-  # netcdf currently depends on hdf5 with `usev110Api=true`
+  # netcdf currently depends on hdf5 with `apiVersion = "v110"`
   # If you wish to use HDF5 API version 1.12 (`useHdf5v110Api=false`),
   # you will need to turn NetCDF off.
   useHdf5v110Api ? true,
@@ -81,15 +82,17 @@ let
     else
       hdf5.override (
         {
-          usev110Api = useHdf5v110Api;
           mpiSupport = enableMPI;
           inherit mpi;
           szipSupport = enableSzip;
-          inherit szip;
+          inherit libaec;
         }
         // lib.optionalAttrs enableMPI {
           cppSupport = false;
         }
+        // lib.optionalAttrs useHdf5v110Api {
+          apiVersion = "v110";
+        }
       );
   netcdf-custom =
     if netcdf-forced != null then
diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix
index c0b55e875cae..b282891a0cb8 100644
--- a/pkgs/development/interpreters/luajit/2.0.nix
+++ b/pkgs/development/interpreters/luajit/2.0.nix
@@ -9,13 +9,13 @@
 callPackage ./default.nix {
   # The patch version is the timestamp of the git commit,
   # obtain via `cat $(nix-build -A luajit_2_0.src)/.relver`
-  version = "2.0.1741557863";
+  version = "2.0.1774896119";
 
   src = fetchFromGitHub {
     owner = "LuaJIT";
     repo = "LuaJIT";
-    rev = "85c3f2fb6f59276ebf07312859a69d6d5a897f62";
-    hash = "sha256-5UIZ650M/0W08iX1ajaHvDbNgjbzZJ1akVwNbiDUeyY=";
+    rev = "e4c7d8b38040518d42599eef8ddb5e67aa967a9c";
+    hash = "sha256-nioJxKo6msQQTP4skMEFDh6xD2cekOEXbMRFus73XuI=";
   };
 
   extraMeta = {
diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix
index 2db105bb6327..84c188166673 100644
--- a/pkgs/development/interpreters/luajit/2.1.nix
+++ b/pkgs/development/interpreters/luajit/2.1.nix
@@ -8,13 +8,13 @@
 callPackage ./default.nix {
   # The patch version is the timestamp of the git commit,
   # obtain via `cat $(nix-build -A luajit_2_1.src)/.relver`
-  version = "2.1.1741730670";
+  version = "2.1.1774638290";
 
   src = fetchFromGitHub {
     owner = "LuaJIT";
     repo = "LuaJIT";
-    rev = "538a82133ad6fddfd0ca64de167c4aca3bc1a2da";
-    hash = "sha256-3DhNqVdojsWDo8mKJXIyTqFODIiKzThcAzHPdnoJaVM=";
+    rev = "fbb36bb6bfa88716a47c58bcf9ce9f2ef752abac";
+    hash = "sha256-BqH66q38mJpIYJgPiSPt7I0B3VLBvuDRRTiMJ7ldkBI=";
   };
 
   inherit self passthruFun;
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index b40972d7696f..e923e238bcaa 100644
--- a/pkgs/development/interpreters/php/generic.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -28,7 +28,6 @@ let
       systemdLibs,
       system-sendmail,
       valgrind,
-      xcbuild,
       writeShellScript,
       common-updater-scripts,
       curl,
@@ -240,8 +239,7 @@ let
             libtool
             pkg-config
             re2c
-          ]
-          ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
+          ];
 
           buildInputs =
             # PCRE extension
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 4e1c533bfea9..0003136de90b 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
         sourceVersion = {
           major = "3";
           minor = "13";
-          patch = "12";
+          patch = "13";
           suffix = "";
         };
-        hash = "sha256-KoTNMd2Njqiq/3XeZvwbSwEn3VeZqlCmSumjE4hbRZM=";
+        hash = "sha256-Krkf9AF4PMymT3XRDIgulXvf1g4r9acvhCF5Nym3inE=";
       };
     };
 
@@ -79,10 +79,10 @@
       sourceVersion = {
         major = "3";
         minor = "14";
-        patch = "3";
+        patch = "4";
         suffix = "";
       };
-      hash = "sha256-qX1VSemtgf4XFZ7QLGh3StXSZscvjZoLWpw3H+hdkCs=";
+      hash = "sha256-2SPFEwPjjiSRNvwb3zVo1W7LAyFO/e9IUWF209f6rvg=";
       inherit passthruFun;
     };
 
@@ -92,9 +92,9 @@
         major = "3";
         minor = "15";
         patch = "0";
-        suffix = "a7";
+        suffix = "a8";
       };
-      hash = "sha256-j1kMQot/DUBt+Si4Vzfno6+ijt3U0UGUEOqAloftHqc=";
+      hash = "sha256-KPG2NYYJBC68yBSI7CRWlRn1CAS7B9wjzHB7KBsDHGk=";
       inherit passthruFun;
     };
 
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index a8d37f457f3d..dd4bfcb45b7d 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -21,7 +21,6 @@
   rustc,
   which,
   zip,
-  xcbuild,
 
   # runtime
   icu75,
@@ -32,6 +31,9 @@
   libiconv,
 }:
 
+let
+  apple-sdk = (if (lib.versionAtLeast version "140") then apple-sdk_15 else apple-sdk_14);
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "spidermonkey";
   inherit version;
@@ -87,9 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (lib.versionAtLeast version "128") [
     rust-cbindgen
     rustPlatform.bindgenHook
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    xcbuild
   ];
 
   buildInputs = [
@@ -100,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
-    (if (lib.versionAtLeast version "140") then apple-sdk_15 else apple-sdk_14)
+    apple-sdk
   ];
 
   depsBuildBuild = [
@@ -129,6 +128,9 @@ stdenv.mkDerivation (finalAttrs: {
     # https://bugzilla.mozilla.org/show_bug.cgi?id=1957023
     "--includedir=${placeholder "dev"}/include"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    "--with-macos-sdk=${apple-sdk.sdkroot}"
+  ]
   ++ [
     "--disable-jemalloc"
     "--disable-strip"
diff --git a/pkgs/development/interpreters/tcl/tcl-requires-check-hook.sh b/pkgs/development/interpreters/tcl/tcl-requires-check-hook.sh
index 0027a0c4b386..76c5901f2a33 100644
--- a/pkgs/development/interpreters/tcl/tcl-requires-check-hook.sh
+++ b/pkgs/development/interpreters/tcl/tcl-requires-check-hook.sh
@@ -5,9 +5,28 @@ tclRequiresCheckPhase () {
     echo "Executing tclRequiresCheckPhase"
 
     if [ -n "$tclRequiresCheck" ]; then
-        echo "Check whether the following packages can be required: $tclRequiresCheck"
         export TCLLIBPATH="$out/lib $TCLLIBPATH" # Redundant if tcl-package-hook is also used
-        tclsh <<<'exit [catch {foreach req $env(tclRequiresCheck) {package require $req}}]'
+        tclsh <<'EOF'
+          if {[info exists env(NIX_ATTRS_JSON_FILE)]} {
+            set nix_attrs_json_file [open $env(NIX_ATTRS_JSON_FILE)]
+            set nix_attrs_json [read $nix_attrs_json_file]
+            close $nix_attrs_json_file
+            # Normally we'd use one of tcllib/tdom/rl_json/yajl-tcl to parse JSON,
+            # however we don't want to introduce a circular dependency,
+            # so we rely on the JSON capabilities of the builtin sqlite package
+            # https://wiki.tcl-lang.org/page/SQLite+extension+JSON1
+            package require sqlite3
+            sqlite3 db :memory: -readonly 1
+            set packages_to_check [db eval {
+              select value from json_each(jsonb_extract($nix_attrs_json, '$.tclRequiresCheck'))
+            }]
+            db close
+          } else {
+            set packages_to_check $env(tclRequiresCheck)
+          }
+          puts "Check whether the following packages can be required: $packages_to_check"
+          exit [catch {foreach pkg $packages_to_check {package require $pkg}}]
+EOF
     fi
 }
 
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 0e82e63014c1..cd003aecd13e 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -30,8 +30,8 @@ let
     hash = "sha256-1w4OSlz88D2pnZVXQcI4uyX+triNK0NXzlsyt7GGSLU=";
   };
   v8 = {
-    version = "8.0.1";
-    hash = "sha256-eA5fP/uZqF5+jDDt4tHArGqyt7zbrLZ21v+Lchr8OS8=";
+    version = "8.1";
+    hash = "sha256-FdKhhCveEo5UodEoyUh3aBHABv3OT2VXmwBXE1ce3p0=";
   };
 in
 
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 6310aff338aa..0b9142ed67a9 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -452,6 +452,8 @@ stdenv.mkDerivation (
       ]
       ++ optionals (lib.versionAtLeast version "5.1") [
         ./nvccflags-cpp14.patch
+      ]
+      ++ optionals (lib.versionAtLeast version "5.1" && lib.versionOlder version "8.1") [
         (fetchpatch2 {
           name = "unbreak-hardcoded-tables.patch";
           url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1d47ae65bf6df91246cbe25c997b25947f7a4d1d";
diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix
index ce0e59f1d52f..4e63c082a5ad 100644
--- a/pkgs/development/libraries/gtksourceview/5.x.nix
+++ b/pkgs/development/libraries/gtksourceview/5.x.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtksourceview";
-  version = "5.18.0";
+  version = "5.20.0";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz";
-    hash = "sha256-BRp4/jj3kzKAR+W81thVxkJcC0gMINlDIXnjVnQsasA=";
+    hash = "sha256-44vNI/UrhurfD+TYveaY46jKECMiuLTPGlGsKUpEjBs=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix
index 00ba528081ac..e97f986af205 100644
--- a/pkgs/development/libraries/icu/make-icu.nix
+++ b/pkgs/development/libraries/icu/make-icu.nix
@@ -143,6 +143,7 @@ let
 
           substituteInPlace "$dev/bin/icu-config" \
             ${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements}
+          substituteInPlace "$out/lib/pkgconfig/icu-uc.pc" --replace-fail "$out/lib" "$dev/lib"
         ''
       );
 
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index a7c3b193c9d0..294e7a81d5e4 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libiconv";
-  version = "1.18";
+  version = "1.19";
 
   src = fetchurl {
     url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Owj19Pm064LxUacEC/1v5sb7ki7+SxZZxm6pMydpZeg=";
+    sha256 = "sha256-iN2WqMBGTsoUT8eRrmDNMc2O54Mh5nOX4l/AlcShmqY=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index 90912e673a0c..fa54acb89b07 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchurl,
-  fetchpatch,
   replaceVars,
   meson,
   ninja,
@@ -20,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libpeas";
-  version = "1.36.0";
+  version = "1.38.1";
 
   outputs = [
     "out"
@@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libpeas/${lib.versions.majorMinor version}/libpeas-${version}.tar.xz";
-    sha256 = "KXy5wszNjoYXYj0aPoQVtFMLjlqJPjUnu/0e3RMje0w=";
+    sha256 = "sha256-6C/TKK3KwaujS2QTa9/Lus8rMliovE5fSApyUCphGuk=";
   };
 
   patches = [
@@ -40,18 +39,6 @@ stdenv.mkDerivation rec {
         python3.pkgs.pygobject3
       ];
     })
-
-    # girepository: port libpeas ABI to girepository
-    # https://gitlab.gnome.org/GNOME/libpeas/-/issues/58
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/libpeas/-/commit/73e25b6059d2fdc090a3feb8341ff902c3ec0d16.patch";
-      hash = "sha256-xNp/DbLV2mdMiUALdEWE4ssyD3krWmzmJIwgStsNShM=";
-    })
-    # build: handle depending on development releases of GLib
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/libpeas/-/commit/4613accc2e22395bb77bdf612fcdf90bf65f230f.patch";
-      hash = "sha256-VGPLDswH3St/SzS19iHr5dA/ywzDsXhd7FMUg4rII9U=";
-    })
   ];
 
   depsBuildBuild = [
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index be187c33ffc4..52a3ab58ad61 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -46,31 +46,14 @@ let
       };
     };
     libxml2 = callPackage ./common.nix {
-      version = "2.15.1";
+      version = "2.15.2";
       src = fetchFromGitLab {
         domain = "gitlab.gnome.org";
         owner = "GNOME";
         repo = "libxml2";
         tag = "v${packages.libxml2.version}";
-        hash = "sha256-FUfYMq5xT2i88JdIw9OtSofraUL3yjsyOVund+mfJKQ=";
+        hash = "sha256-k5dZ75D/BOouYAjrof9Jm2lY29XZhOqS1kudDGmGY9Q=";
       };
-      extraPatches = [
-        (fetchpatch {
-          name = "CVE-2026-0990.patch";
-          url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/1961208e958ca22f80a0b4e4c9d71cfa050aa982.patch";
-          hash = "sha256-Df2WLCTsP/ItSzgnVkNjRpLKkBP4xUOXEfCUV9o/Yks=";
-        })
-        (fetchpatch {
-          name = "CVE-2026-0992.patch";
-          url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/f75abfcaa419a740a3191e56c60400f3ff18988d.patch";
-          hash = "sha256-an/PpmsncNwim/pe/zsDx9P6jbuCqvr4QSgTokyDvzw=";
-        })
-        (fetchpatch {
-          name = "CVE-2026-0989.patch";
-          url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/19549c61590c1873468c53e0026a2fbffae428ef.patch";
-          hash = "sha256-YOF5cYdoFQuvsbcAezamglh/RKv8Zq6rm1nfo2/CLzo=";
-        })
-      ];
       extraMeta = {
         maintainers = with lib.maintainers; [
           jtojnar
diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix
index f9ddbfd83d82..44fde80fa51d 100644
--- a/pkgs/development/libraries/mbedtls/3.nix
+++ b/pkgs/development/libraries/mbedtls/3.nix
@@ -1,8 +1,8 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix {
-  version = "3.6.5";
-  hash = "sha256-CAMksh7i4mg5zVTYLB/SZWFVmgQBMhPnislLCD9j7+o=";
+  version = "3.6.6";
+  hash = "sha256-+PW41/c8M/Yz0EVWM4Gt4HTNBMUTU5MayaKVZ+upLIo=";
 
   patches = [
     # Fixes the build with GCC 14 on aarch64.
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index 4c5e9de01c39..12a385c9a946 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ngtcp2";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${finalAttrs.version}/ngtcp2-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-P+q2i4PqGpbXur+mxvYYaYmJ2+HAm9dglpuCJ429GGM=";
+    hash = "sha256-hzVHltWssZvzEMt3vgS9IgDDImWmvnyUuGMeJsjpPKQ=";
   };
 
   outputs = [
diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix
index 6e835d0dc71f..b2f2f54591b3 100644
--- a/pkgs/development/libraries/nss/esr.nix
+++ b/pkgs/development/libraries/nss/esr.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "3.112.3";
-  hash = "sha256-1gOfP3HM1irGuJ+ln6n1toJC46+K5Z7pGm26vSryU7M=";
+  version = "3.112.5";
+  hash = "sha256-+u29CbE5IyapF5w4IeBXDiiNK7usVn30C08G5FWVC88=";
   filename = "esr.nix";
   versionRegex = "NSS_(3)_(112)(?:_(\\d+))?_RTM";
 }
diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index 70353953b642..11d5c376c025 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openexr";
-  version = "3.3.8";
+  version = "3.4.10";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
     rev = "v${version}";
-    hash = "sha256-bJJdfr+OybCl8L27m1uRynGaU1V8D70bSzQjkDuqMDU=";
+    hash = "sha256-jXio+PvagKTR8NjcYIQ/j8LOMNc/0sQBuaixKk/0V3k=";
   };
 
   outputs = [
diff --git a/pkgs/development/libraries/openssl/3.5/openssl-aes-gcm-ppc-remove-localentry-directive.patch b/pkgs/development/libraries/openssl/3.5/openssl-aes-gcm-ppc-remove-localentry-directive.patch
deleted file mode 100644
index 43e6d333844d..000000000000
--- a/pkgs/development/libraries/openssl/3.5/openssl-aes-gcm-ppc-remove-localentry-directive.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 5aaa7e5fdc59e88a13d2911cb86d814d4e2669da Mon Sep 17 00:00:00 2001
-From: Danny Tsen <dtsen@us.ibm.com>
-Date: Wed, 28 Jan 2026 07:23:13 -0500
-Subject: [PATCH] aes-gcm-ppc.pl: Removed .localentry directive
-
-Otherwise there is mixing of  ELFv1 ABI and ELFv2 ABI directives
-and PPC64 big endian builds fail.
-
-Fixes #29815
-
-Signed-off-by: Danny Tsen <dtsen@us.ibm.com>
-
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
-Reviewed-by: Tomas Mraz <tomas@openssl.org>
-MergeDate: Tue Feb  3 08:39:50 2026
-(Merged from https://github.com/openssl/openssl/pull/29827)
----
- crypto/modes/asm/aes-gcm-ppc.pl | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/crypto/modes/asm/aes-gcm-ppc.pl b/crypto/modes/asm/aes-gcm-ppc.pl
-index 68918a9305a2b..fd5dcc22a6117 100644
---- a/crypto/modes/asm/aes-gcm-ppc.pl
-+++ b/crypto/modes/asm/aes-gcm-ppc.pl
-@@ -409,7 +409,6 @@
- ################################################################################
- .align 4
- aes_gcm_crypt_1x:
--.localentry	aes_gcm_crypt_1x,0
- 
- 	cmpdi	5, 16
- 	bge	__More_1x
-@@ -492,7 +491,6 @@
- ################################################################################
- .align 4
- __Process_partial:
--.localentry	__Process_partial,0
- 
- 	# create partial mask
- 	vspltisb 16, -1
-@@ -564,7 +562,6 @@
- .global ppc_aes_gcm_encrypt
- .align 5
- ppc_aes_gcm_encrypt:
--.localentry     ppc_aes_gcm_encrypt,0
- 
- 	SAVE_REGS
- 	LOAD_HASH_TABLE
-@@ -752,7 +749,6 @@
- .global ppc_aes_gcm_decrypt
- .align 5
- ppc_aes_gcm_decrypt:
--.localentry	ppc_aes_gcm_decrypt, 0
- 
- 	SAVE_REGS
- 	LOAD_HASH_TABLE
-@@ -1032,7 +1028,6 @@
- .size   ppc_aes_gcm_decrypt,.-ppc_aes_gcm_decrypt
- 
- aes_gcm_out:
--.localentry	aes_gcm_out,0
- 
- 	mr	3, 11			# return count
- 
diff --git a/pkgs/development/libraries/openssl/3.6/mingw-define-netreset.patch b/pkgs/development/libraries/openssl/3.6/mingw-define-netreset.patch
deleted file mode 100644
index 6da9be22ff72..000000000000
--- a/pkgs/development/libraries/openssl/3.6/mingw-define-netreset.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3d04d5b678c2f95975d1639dc21398b79308af54 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alexander=20Hansen=20F=C3=A6r=C3=B8y?= <ahf@torproject.org>
-Date: Wed, 28 Jan 2026 17:55:02 +0100
-Subject: [PATCH] Explicitly define `SIO_UDP_NETRESET` for MinGW builds.
-
-This patch explicitly defines the value `SIO_UDP_NETRESET` according to
-both what Windows and ReactOS does.
-
-Fixes: #29818.
----
- ssl/quic/quic_reactor.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/ssl/quic/quic_reactor.c b/ssl/quic/quic_reactor.c
-index a754f285bbe2b..d8ac969d02a69 100644
---- a/ssl/quic/quic_reactor.c
-+++ b/ssl/quic/quic_reactor.c
-@@ -76,6 +76,12 @@ void ossl_quic_reactor_cleanup(QUIC_REACTOR *rtor)
- }
- 
- #if defined(OPENSSL_SYS_WINDOWS)
-+
-+/* Work around for MinGW builds. */
-+#if defined(__MINGW32__) && !defined(SIO_UDP_NETRESET)
-+#  define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR, 15)
-+#endif
-+
- /*
-  * On Windows recvfrom() may return WSAECONNRESET when destination port
-  * used in preceding call to sendto() is no longer reachable. The reset
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index bfbfe1de963e..2401b143436e 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -437,8 +437,8 @@ in
   };
 
   openssl_3 = common {
-    version = "3.0.19";
-    hash = "sha256-+lpBQ7iq4YvlPvLzyvKaLgdHQwuLx00y2IM1uUq2MHI=";
+    version = "3.0.20";
+    hash = "sha256-yAoB38cOzk3CEWiTLDdzkELUBNRszIGlmG3XUxTs2m8=";
 
     patches = [
       # Support for NIX_SSL_CERT_FILE, motivation:
@@ -467,8 +467,8 @@ in
   };
 
   openssl_3_5 = common {
-    version = "3.5.5";
-    hash = "sha256-soyRUyqLZaH5g7TCi3SIF05KAQCOKc6Oab14nyi8Kok=";
+    version = "3.5.6";
+    hash = "sha256-3q58gMupnEtPlA7K2zwzOLE8t3QYQJI45X1/MfKjtzY=";
 
     patches = [
       # Support for NIX_SSL_CERT_FILE, motivation:
@@ -486,18 +486,10 @@ in
         else
           ./3.5/use-etc-ssl-certs.patch
       )
-
-      # Don't cause ELF ABI mismatch on powerpc64
-      # https://github.com/openssl/openssl/issues/29815
-      ./3.5/openssl-aes-gcm-ppc-remove-localentry-directive.patch
     ]
     ++ lib.optionals stdenv.hostPlatform.isMinGW [
       ./3.5/fix-mingw-linking.patch
-    ]
-    ++
-      # https://cygwin.com/cgit/cygwin-packages/openssl/plain/openssl-3.0.18-skip-dllmain-detach.patch?id=219272d762128451822755e80a61db5557428598
-      # and also https://github.com/openssl/openssl/pull/29321
-      lib.optional stdenv.hostPlatform.isCygwin ./openssl-3.0.18-skip-dllmain-detach.patch;
+    ];
 
     withDocs = true;
 
@@ -507,8 +499,8 @@ in
   };
 
   openssl_3_6 = common {
-    version = "3.6.1";
-    hash = "sha256-sb/tzVson/Iq7ofJ1gD1FXZ+v0X3cWjLbWTyMfUYqC4=";
+    version = "3.6.2";
+    hash = "sha256-qvUaH+BkOE+BHa6utOxNznNA7IvYkwJ+7mdq8x6DoE8=";
 
     patches = [
       # Support for NIX_SSL_CERT_FILE, motivation:
@@ -526,20 +518,7 @@ in
         else
           ./3.5/use-etc-ssl-certs.patch
       )
-
-      # Don't cause ELF ABI mismatch on powerpc64
-      # https://github.com/openssl/openssl/issues/29815
-      ./3.5/openssl-aes-gcm-ppc-remove-localentry-directive.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMinGW [
-      # Fix from https://github.com/openssl/openssl/pull/29826
-      # Merged, will be in 3.6.2
-      ./3.6/mingw-define-netreset.patch
-    ]
-    ++
-      # https://cygwin.com/cgit/cygwin-packages/openssl/plain/openssl-3.0.18-skip-dllmain-detach.patch?id=219272d762128451822755e80a61db5557428598
-      # and also https://github.com/openssl/openssl/pull/29321
-      lib.optional stdenv.hostPlatform.isCygwin ./openssl-3.0.18-skip-dllmain-detach.patch;
+    ];
 
     withDocs = true;
 
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index d195d42a6d56..a340abb9ed00 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -88,6 +88,7 @@
   wayland-scanner,
   # options
   qttranslations ? null,
+  fetchpatch,
 }:
 
 let
@@ -244,6 +245,17 @@ stdenv.mkDerivation {
     ./qmlimportscanner-import-path.patch
     # don't pass qtbase's QML directory to qmlimportscanner if it's empty
     ./skip-missing-qml-directory.patch
+
+    # backport crash fix
+    (fetchpatch {
+      url = "https://github.com/qt/qtbase/commit/1466f88633b2c29a6159a0c2eacd0c0d6601aa5e.diff";
+      hash = "sha256-ubDAXF47SYagRAJ5SYyBxXl2PiHjAZo3xlYPDz1jRYM=";
+    })
+    # another crash fix
+    (fetchpatch {
+      url = "https://github.com/qt/qtbase/commit/515cbbacfba9f4259c9c3b0714a31222c2b4c879.diff";
+      hash = "sha256-93tzp4O7dZxRZv7ilN/gbQSVmaeOGmxpYgM7aomN0n8=";
+    })
   ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 799e4927f6c6..6274578cfcdf 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -195,8 +195,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/OpenMathLib/OpenBLAS/commit/7086a1b075ca317e12cfe79d40a32ad342a30496.patch";
       hash = "sha256-pA3HK2f2MJr/+h/uale7edIYk/KH194EscYFcsujPXY=";
     })
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
     # This commit led to miscompilation of certain ASIMD extensions code paths.
     # There was an attempted fix in upstream but this still leaves some scipy tests failing.
     (fetchpatch {
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 4b90274ef3b2..c00e0ef9d3f4 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   meson,
+  mdbook,
   pkg-config,
   ninja,
   wayland-scanner,
@@ -23,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayland";
-  version = "1.24.0";
+  version = "1.25.0";
 
   src = fetchurl {
     url =
       with finalAttrs;
       "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz";
-    hash = "sha256-gokkh6Aa1nszTsqDtUMXp8hqA6ic+trP71IR8RpdBTY=";
+    hash = "sha256-wGXwQK/f8xd2gGAPJJcn5Boa/CL8zyciLxX1MG+qHwM=";
   };
 
   postPatch = lib.optionalString withDocumentation ''
@@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxslt
     xmlto
     python3
+    mdbook
     docbook_xml_dtd_45
     docbook_xsl
   ];
diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index 9de406ee736d..83399f8ec787 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -395,7 +395,6 @@ let
         systems = [
           "frugal-uuid"
           "frugal-uuid/non-frugal"
-          "frugal-uuid/benchmark"
           "frugal-uuid/test"
         ];
         lispLibs =
diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
index 100175d5e508..3c8900103c7c 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   ocaml,
-  version ? "2.1.0",
+  version ? "2.1.1",
 }:
 
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
       {
         "1.0.4" = "sha256-XCqT1Er4o4mWosD4D715cP5HUfEEvkcMr6BpNT/ABMA=";
         "1.3.0" = "sha256-joGA9XO0QPanqMII2rLK5KgjhP7HMtInhNG7bmQWjLs=";
-        "2.1.0" = "sha256-iBTGFM1D1S/R68ivWjHZElwhTEmPpgVmDk7Rlf+ENOk=";
+        "2.1.1" = "sha256-Bbk40d709UxHgXjxmCgig0UQQx7ZjyrGfLTZCqEg1rY=";
       }
       ."${version}";
   };
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 84e3199959be..9b76c5565090 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -50,14 +50,14 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.13.4";
+  version = "3.13.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiohttp";
     tag = "v${version}";
-    hash = "sha256-/MpN8Lvdm6ZN18eLip0YXHEFzJqRsWWyx1HHfqTmjqA=";
+    hash = "sha256-bAP1/a2COHbe+39KY3GHXSo1Iq9x9xX8O2mLhmFlMlE=";
   };
 
   postPatch = ''
@@ -139,6 +139,8 @@ buildPythonPackage rec {
     "test_uvloop_secure_https_proxy"
     # Cannot connect to host example.com:443 ssl:default [Could not contact DNS servers]
     "test_tcp_connector_ssl_shutdown_timeout_passed_to_create_connection"
+    # Fails with http.cookies.CookieError: Control characters are not allowed in cookies
+    "test_parse_set_cookie_headers_uses_unquote_with_octal"
   ]
   ++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix
index 345d287f9c1a..275ec8412c7a 100644
--- a/pkgs/development/python-modules/attrs/default.nix
+++ b/pkgs/development/python-modules/attrs/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "attrs";
-  version = "25.4.0";
+  version = "26.1.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FtWWm4fwhZ7zOkizXVWsG+bkKuSdXoU7WX23DDXFfhE=";
+    hash = "sha256-0DzricsyKo/XBtT7kZQHN7ZkKqNpmP4TCpvJbJhe/zI=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix
index 19c121c08e5f..f24d76be680b 100644
--- a/pkgs/development/python-modules/brother/default.nix
+++ b/pkgs/development/python-modules/brother/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "brother";
-  version = "6.0.0";
+  version = "6.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "bieniu";
     repo = "brother";
     tag = version;
-    hash = "sha256-kvR4891kaZFHKZhtgrrgtGJZUIwoYE5CsGUEQM7eKvs=";
+    hash = "sha256-coV2jOxxqwP5LTh9QvyRvBcgVDENEm/IP9LRJu/Me+c=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index 79944b0dbc2d..5764651403a0 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -13,20 +13,21 @@
   pytest-xdist,
   pytestCheckHook,
   setuptools,
+  uv,
   virtualenv,
   wheel,
 }:
 
 buildPythonPackage rec {
   pname = "build";
-  version = "1.4.2";
+  version = "1.4.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "build";
     tag = version;
-    hash = "sha256-wPTiiBaPBy8hsxJHhoeohsqoaMG7VXN5Vv7+PK9ZaO4=";
+    hash = "sha256-QprU0sXL6FL0rSVJwu8cYpcPlnYKzKAbkyDaTV778js=";
   };
 
   build-system = [ flit-core ];
@@ -59,6 +60,7 @@ buildPythonPackage rec {
         pytest-xdist
         pytestCheckHook
         setuptools
+        uv
         virtualenv
         wheel
       ];
@@ -79,8 +81,11 @@ buildPythonPackage rec {
         "test_output"
         "test_wheel_metadata"
         # Tests require network access to run pip install
-        "test_verbose_output"
+        "test_logging_output"
+        "test_pythonpath_does_not_interfere_with_outer_pip"
         "test_requirement_installation"
+        "test_verbose_logging_output"
+        "test_verbose_output"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # Expects Apple's Python and its quirks
diff --git a/pkgs/development/python-modules/cadwyn/default.nix b/pkgs/development/python-modules/cadwyn/default.nix
index fcf64ad1879d..48146c35e02f 100644
--- a/pkgs/development/python-modules/cadwyn/default.nix
+++ b/pkgs/development/python-modules/cadwyn/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cadwyn";
-  version = "6.0.1";
+  version = "6.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zmievsa";
     repo = "cadwyn";
     tag = finalAttrs.version;
-    hash = "sha256-wvwR4JCPvWoWSdkK61oDmQWNq2UnDZMRlWxo1GLznjk=";
+    hash = "sha256-vkW3ZSIRuIDVQCHMsZrBEs+VBW55kn0dE2nMXqL5XmU=";
   };
 
   disabled = pythonAtLeast "3.14";
diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix
index 577e1f3d105f..5137ceb0e83f 100644
--- a/pkgs/development/python-modules/charset-normalizer/default.nix
+++ b/pkgs/development/python-modules/charset-normalizer/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage rec {
   pname = "charset-normalizer";
-  version = "3.4.4";
+  version = "3.4.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "charset_normalizer";
     tag = version;
-    hash = "sha256-MtSBKG8bXUsgEPyXxMRBPPFI8mfuIETy6UVshe7yqGg=";
+    hash = "sha256-dOdJ4f98smCYdskp3BwtQG6aOyK+2a73+x580FKRWDk=";
   };
 
   postPatch = ''
     substituteInPlace _mypyc_hook/backend.py \
-      --replace-fail "mypy>=1.4.1,<=1.18.2" "mypy"
+      --replace-fail "mypy>=1.4.1,<=1.20" "mypy"
   '';
 
   build-system = [
diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix
index 0e5acae0cdf0..4a97fa41a0cb 100644
--- a/pkgs/development/python-modules/contourpy/default.nix
+++ b/pkgs/development/python-modules/contourpy/default.nix
@@ -10,6 +10,7 @@
   ninja,
   nukeReferences,
   pybind11,
+  pkg-config,
 
   # propagates
   numpy,
@@ -50,6 +51,10 @@ let
       meson
       ninja
       nukeReferences
+      pkg-config
+    ];
+
+    buildInputs = [
       pybind11
     ];
 
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index d5f2eb5d2711..729c1801daa7 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -21,19 +21,19 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "46.0.6";
+  version = "48.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyca";
     repo = "cryptography";
     tag = version;
-    hash = "sha256-b6wQnPEf18ViqQVch+Jg1w0Cn372QKxLknD9rL4JjxY=";
+    hash = "sha256-S1oOLou6tE1atqZ6HXwVQDps9BnjiEpRdoZY5VQm+Kg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-5ElDEl7MdcQfu/hy+POSBcvkNCFAMo6La5s6uRhZ/fM=";
+    hash = "sha256-mp+1Fw8xNBJD1DM8obAqYBP8erxXiP768+ifqRN1Uqs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 705466ed4d33..42ae35c663dc 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   cryptography,
-  fetchpatch2,
   uv-build,
 }:
 
@@ -14,11 +13,6 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/vectors";
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "uv_build>=0.7.19,<0.9.0" "uv_build>=0.7.19,<0.11.0"
-  '';
-
   build-system = [ uv-build ];
 
   # No tests included
diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix
index d2845bb7a70a..5a4e475d7645 100644
--- a/pkgs/development/python-modules/diofant/default.nix
+++ b/pkgs/development/python-modules/diofant/default.nix
@@ -3,14 +3,12 @@
   buildPythonPackage,
   cython,
   fetchFromGitHub,
-  fetchpatch,
   gmpy2,
   hypothesis,
   mpmath,
   numpy,
   pexpect,
   pytest-cov-stub,
-  pytest-timeout,
   pytest-xdist,
   pytestCheckHook,
   scipy,
@@ -29,14 +27,6 @@ buildPythonPackage rec {
     hash = "sha256-uQvAYSURDhuAKcX0WVMk4y2ZXiiq0lPZct/7A5n5t34=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "remove-pip-from-build-dependencies.patch";
-      url = "https://github.com/diofant/diofant/commit/117e441808faa7c785ccb81bf211772d60ebdec3.patch";
-      hash = "sha256-MYk1Ku4F3hAv7+jJQLWhXd8qyKRX+QYuBzPfYWT0VbU=";
-    })
-  ];
-
   build-system = [ setuptools-scm ];
 
   dependencies = [ mpmath ];
diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix
index 146c8d029191..3a7274793a2b 100644
--- a/pkgs/development/python-modules/django/5.nix
+++ b/pkgs/development/python-modules/django/5.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.2.13";
+  version = "5.2.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django";
     repo = "django";
     tag = version;
-    hash = "sha256-8tRDExsCtyEonz+e18PYnfhb8qmgZNeBWUjg+LbB39U=";
+    hash = "sha256-gb/4WL2VLoqRucpXuKyPsMSwKZ6gaxy5JA7QTeeazjk=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix
index d55affdc2484..1a267eeb6b78 100644
--- a/pkgs/development/python-modules/exceptiongroup/default.nix
+++ b/pkgs/development/python-modules/exceptiongroup/default.nix
@@ -2,11 +2,11 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   flit-scm,
   pytestCheckHook,
   pythonAtLeast,
   pythonOlder,
-  isPy313,
   typing-extensions,
 }:
 
@@ -22,14 +22,19 @@ buildPythonPackage rec {
     hash = "sha256-3WInufN+Pp6vB/Gik6e8V1a34Dr/oiH3wDMB+2lHRMM=";
   };
 
-  # CPython fixed https://github.com/python/cpython/issues/141732 in
-  # https://github.com/python/cpython/pull/141736, but exceptiongroup 1.3.1,
-  # including its test suite, still matches the old repr behavior.
-  # The CPython fix has only been backported to 3.13 so far, where it was
-  # first included in version 3.13.12, so we only need to patch for 3.13
-  # and 3.15+.
-  # Upstream issue: https://github.com/agronholm/exceptiongroup/issues/154
-  patches = lib.optional (isPy313 || pythonAtLeast "3.15") ./match-repr-fix.patch;
+  patches = [
+    # CPython fixed https://github.com/python/cpython/issues/141732 in
+    # https://github.com/python/cpython/pull/141736 (backported to Python 3.13+),
+    # but exceptiongroup 1.3.1, including its test suite, still matches the old
+    # repr behavior.
+    # Upstream issue: https://github.com/agronholm/exceptiongroup/issues/154
+    # Upstream PR: https://github.com/agronholm/exceptiongroup/pull/155
+    (fetchpatch {
+      name = "match-repr-fix.patch";
+      url = "https://github.com/agronholm/exceptiongroup/commit/0c6cfbf677f6b50df17311cfdad01e9ff17310aa.patch";
+      hash = "sha256-EeYu1/JKYRDwdq8+n38RrdogipNzX0ate1trDs1Z3c0=";
+    })
+  ];
 
   build-system = [ flit-scm ];
 
diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix
index b9e53f4471c5..761190abda5c 100644
--- a/pkgs/development/python-modules/executing/default.nix
+++ b/pkgs/development/python-modules/executing/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonAtLeast,
 
   # build-system
   setuptools,
@@ -11,7 +10,6 @@
   # tests
   asttokens,
   littleutils,
-  rich,
   pytestCheckHook,
 }:
 
@@ -36,8 +34,7 @@ buildPythonPackage rec {
     asttokens
     littleutils
     pytestCheckHook
-  ]
-  ++ lib.optionals (pythonAtLeast "3.11") [ rich ];
+  ];
 
   disabledTests = [
     # requires ipython, which causes a circular dependency
diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index bc40f7acb728..9d5aea8559e5 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -14,6 +14,7 @@
 
   # tests
   anyio,
+  a2wsgi,
   dirty-equals,
   flask,
   inline-snapshot,
@@ -21,6 +22,8 @@
   pwdlib,
   pyjwt,
   pytest-asyncio,
+  pytest-xdist,
+  pytest-timeout,
   pytestCheckHook,
   sqlalchemy,
   trio,
@@ -42,14 +45,14 @@
 
 buildPythonPackage rec {
   pname = "fastapi";
-  version = "0.128.0";
+  version = "0.135.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiangolo";
     repo = "fastapi";
     tag = version;
-    hash = "sha256-qUTSqTe9mQzfuwqsTCQY6u7Tcnh9XNy4tr5o0/qFFLs=";
+    hash = "sha256-sE5d+MgmP9L+MUosRBsR+KSJkcC9i2EOOtKHq0sXjRM=";
   };
 
   build-system = [ pdm-backend ];
@@ -99,6 +102,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     anyio
+    a2wsgi
     dirty-equals
     flask
     inline-snapshot
@@ -107,6 +111,8 @@ buildPythonPackage rec {
     pyjwt
     pytestCheckHook
     pytest-asyncio
+    pytest-xdist
+    pytest-timeout
     trio
     sqlalchemy
   ]
@@ -132,6 +138,8 @@ buildPythonPackage rec {
     # Don't test docs and examples
     "docs_src"
     "tests/test_tutorial/test_sql_databases"
+    "tests/test_tutorial/test_static_files"
+    "tests/test_tutorial/test_custom_docs_ui"
     # Infinite recursion with strawberry-graphql
     "tests/test_tutorial/test_graphql/test_tutorial001.py"
   ];
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index 7b3539a3de72..229941de5daf 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -7,8 +7,10 @@
   cryptography,
   flask,
   freezegun,
+  gitUpdater,
   grpcio,
   mock,
+  packaging,
   pyasn1-modules,
   pyjwt,
   pyopenssl,
@@ -20,25 +22,28 @@
   responses,
   rsa,
   setuptools,
+  urllib3,
 }:
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "2.47.0";
+  version = "2.50.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
-    repo = "google-auth-library-python";
-    tag = "v${version}";
-    hash = "sha256-kgiqKeS8NTlz56yYKE8U/eKFQjHD6CJHOH5IKLgOeDk=";
+    repo = "google-cloud-python";
+    tag = "google-auth-v${version}";
+    hash = "sha256-Z3TsDEtDDfXO23gOlmEM5O4a9qS2+fTB7g0vJ4dOFH4=";
   };
 
+  sourceRoot = "${src.name}/packages/google-auth";
+
   build-system = [ setuptools ];
 
   dependencies = [
+    cryptography
     pyasn1-modules
-    rsa
   ];
 
   optional-dependencies = {
@@ -46,20 +51,23 @@ buildPythonPackage rec {
       aiohttp
       requests
     ];
+    cryptography = [ cryptography ];
     enterprise_cert = [
-      cryptography
       pyopenssl
     ];
     pyopenssl = [
-      cryptography
       pyopenssl
     ];
     pyjwt = [
-      cryptography
       pyjwt
     ];
     reauth = [ pyu2f ];
     requests = [ requests ];
+    rsa = [ rsa ];
+    urllib3 = [
+      packaging
+      urllib3
+    ];
   };
 
   pythonRelaxDeps = [ "cachetools" ];
@@ -78,10 +86,7 @@ buildPythonPackage rec {
   ++ lib.concatAttrValues optional-dependencies;
 
   disabledTestPaths = [
-    "samples/"
     "system_tests/"
-    # Requires a running aiohttp event loop
-    "tests_async/"
 
     # cryptography 44 compat issue
     "tests/transport/test__mtls_helper.py::TestDecryptPrivateKey::test_success"
@@ -94,14 +99,18 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "google-auth-v";
+  };
+
   meta = {
     description = "Google Auth Python Library";
     longDescription = ''
       This library simplifies using Google's various server-to-server
       authentication mechanisms to access Google APIs.
     '';
-    homepage = "https://github.com/googleapis/google-auth-library-python";
-    changelog = "https://github.com/googleapis/google-auth-library-python/blob/${src.tag}/CHANGELOG.md";
+    homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-auth";
+    changelog = "https://github.com/googleapis/google-cloud-python/blob/${src.tag}/packages/google-auth/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };
diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix
index d820a754c9a8..1009f856611f 100644
--- a/pkgs/development/python-modules/graphql-core/default.nix
+++ b/pkgs/development/python-modules/graphql-core/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
-  pytest-benchmark,
+  pytest-describe,
   pytest-asyncio,
   pytestCheckHook,
 }:
@@ -23,6 +23,10 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail ', "setuptools>=59,<81"' ""
+
+    # avoid big pytest-benchmark dependency
+    substituteInPlace setup.cfg \
+      --replace-fail "addopts = --benchmark-disable" ""
   '';
 
   build-system = [
@@ -31,11 +35,13 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-asyncio
-    pytest-benchmark
+    pytest-describe
     pytestCheckHook
   ];
 
-  pytestFlags = [ "--benchmark-disable" ];
+  disabledTestPaths = [
+    "tests/benchmarks"
+  ];
 
   pythonImportsCheck = [ "graphql" ];
 
diff --git a/pkgs/development/python-modules/httpx-curl-cffi/default.nix b/pkgs/development/python-modules/httpx-curl-cffi/default.nix
new file mode 100644
index 000000000000..8420f97e8c99
--- /dev/null
+++ b/pkgs/development/python-modules/httpx-curl-cffi/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pdm-backend,
+  curl-cffi,
+  httpx,
+  typing-extensions,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "httpx-curl-cffi";
+  version = "0.1.5";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "httpx_curl_cffi";
+    inherit (finalAttrs) version;
+    hash = "sha256-F37plo6doUJAcBeBbMP7CKsoGxNPdzqTWbakZQpsgfM=";
+  };
+
+  build-system = [
+    pdm-backend
+  ];
+
+  dependencies = [
+    curl-cffi
+    httpx
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [
+    "httpx_curl_cffi"
+  ];
+
+  meta = {
+    description = "Httpx transport for curl_cffi (python bindings for curl-impersonate";
+    homepage = "https://pypi.org/project/httpx-curl-cffi";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ xanderio ];
+  };
+})
diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix
index aefe7334db73..9d4cbee7e5a1 100644
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/pkgs/development/python-modules/idna/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "idna";
-  version = "3.11";
+  version = "3.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kjd";
     repo = "idna";
     tag = "v${version}";
-    hash = "sha256-4mnWOit+lrZnVslVyfalt6lv7qSYpLlyvET553SplJU=";
+    hash = "sha256-D72KUEwiFA/LdU/xE3sN+Abc6NpAsIlGSdB07V1nk68=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix
index e7b40504dfbb..56968ab958bb 100644
--- a/pkgs/development/python-modules/inline-snapshot/default.nix
+++ b/pkgs/development/python-modules/inline-snapshot/default.nix
@@ -6,7 +6,6 @@
   dirty-equals,
   executing,
   fetchFromGitHub,
-  freezegun,
   hatchling,
   hypothesis,
   isort,
@@ -17,7 +16,6 @@
   pytest-xdist,
   pytestCheckHook,
   rich,
-  time-machine,
   typing-extensions,
 }:
 
@@ -47,7 +45,6 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    freezegun
     hypothesis
     isort
     pydantic
@@ -55,7 +52,6 @@ buildPythonPackage rec {
     pytest-mock
     pytest-xdist
     pytestCheckHook
-    time-machine
   ]
   ++ lib.concatAttrValues optional-dependencies;
 
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 658a63c8ed85..048f45f75c29 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonAtLeast,
   fetchFromGitHub,
 
   # build-system
@@ -16,16 +15,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "jedi";
-  version = "0.19.2";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "davidhalter";
     repo = "jedi";
-    rev = "v${version}";
-    hash = "sha256-2nDQJS6LIaq91PG3Av85OMFfs1ZwId00K/kvog3PGXE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-D0Zy8HJYq5l8Wp1M+J7p8Z+EBY/R5tYFa2uMYiqLIT8=";
     fetchSubmodules = true;
   };
 
@@ -42,38 +41,25 @@ buildPythonPackage rec {
     export HOME=$TMPDIR
   '';
 
-  disabledTests = [
-    # sensitive to platform, causes false negatives on darwin
-    "test_import"
-  ]
-  ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [
-    # InvalidPythonEnvironment: The python binary is potentially unsafe.
-    "test_create_environment_executable"
-    # AssertionError: assert ['', '.1000000000000001'] == ['', '.1']
-    "test_dict_keys_completions"
-    # AssertionError: assert ['', '.1000000000000001'] == ['', '.1']
-    "test_dict_completion"
-  ];
-
-  disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [
-    # Jedi.api.environment.InvalidPythonEnvironment: The python binary is potentially unsafe
-    "test/test_inference/test_sys_path.py::test_venv_and_pths"
-    "test/test_api/test_environment.py::test_create_environment_venv_path"
-    "test/test_api/test_environment.py::test_create_environment_executable"
-    # can't find system env nor venv
-    "test/test_api/test_environment.py::test_find_system_environments"
-    "test/test_api/test_environment.py::test_scanning_venvs"
-    # https://github.com/davidhalter/jedi/issues/2064
-    "test/test_api/test_interpreter.py::test_string_annotation"
-    # type repr mismatch: Union[Type, int] vs Type | int
-    "test/test_inference/test_mixed.py::test_compiled_signature_annotation_string"
-  ];
+  disabledTests =
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      # sensitive to platform, causes false negatives on darwin
+      "test_import"
+    ]
+    ++ lib.optionals stdenv.targetPlatform.useLLVM [
+      # InvalidPythonEnvironment: The python binary is potentially unsafe.
+      "test_create_environment_executable"
+      # AssertionError: assert ['', '.1000000000000001'] == ['', '.1']
+      "test_dict_keys_completions"
+      # AssertionError: assert ['', '.1000000000000001'] == ['', '.1']
+      "test_dict_completion"
+    ];
 
   meta = {
+    changelog = "https://github.com/davidhalter/jedi/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     description = "Autocompletion tool for Python that can be used for text editors";
     homepage = "https://github.com/davidhalter/jedi";
-    changelog = "https://github.com/davidhalter/jedi/blob/${version}/CHANGELOG.rst";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix
index d64699d43500..520c2e38b8a9 100644
--- a/pkgs/development/python-modules/jmespath/default.nix
+++ b/pkgs/development/python-modules/jmespath/default.nix
@@ -1,31 +1,41 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   hypothesis,
   pytestCheckHook,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "jmespath";
-  version = "1.0.1";
-  format = "setuptools";
+  version = "1.1.0";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-kCYbIG1t79WP3V6F9Hi/YzopAXmJBr4q04kVDFxg7b4=";
+  src = fetchFromGitHub {
+    owner = "jmespath";
+    repo = "jmespath.py";
+    tag = finalAttrs.version;
+    hash = "sha256-DtRMWKE1LeD+NAmMJOISfBo5w9HJW7XFeQp7A3NjkjE=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook
   ];
 
+  enabledTestPaths = [
+    "tests"
+  ];
+
   meta = {
     homepage = "https://github.com/jmespath/jmespath.py";
+    changelog = "https://github.com/jmespath/jmespath.py/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document";
     mainProgram = "jp.py";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix
index 16fd842083c6..342a93b6bd00 100644
--- a/pkgs/development/python-modules/joserfc/default.nix
+++ b/pkgs/development/python-modules/joserfc/default.nix
@@ -36,6 +36,14 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies;
 
+  disabledTests = [
+    # https://github.com/authlib/joserfc/issues/94
+    "test_ECDH_ES_with_EC_key"
+    "test_import_p512_key"
+    "test_ec_incorrect_curve"
+    "test_ES512"
+  ];
+
   pythonImportsCheck = [ "joserfc" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix
index b6be7d4e5171..85cdc1f45b59 100644
--- a/pkgs/development/python-modules/jsonschema-path/default.nix
+++ b/pkgs/development/python-modules/jsonschema-path/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "jsonschema-path";
-  version = "0.4.5";
+  version = "0.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "jsonschema-path";
     tag = version;
-    hash = "sha256-xDNWQddw4ftq762EPvTjyXUEsyRfgs2ffeKVgbWVUs4=";
+    hash = "sha256-abAhWtBnZUeg1VGphfnvxPzSnPM6VjM/XKLPJVIrIXg=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/librt/default.nix b/pkgs/development/python-modules/librt/default.nix
index 15ae4cdcbe15..044a9c742517 100644
--- a/pkgs/development/python-modules/librt/default.nix
+++ b/pkgs/development/python-modules/librt/default.nix
@@ -5,18 +5,19 @@
   setuptools,
   mypy-extensions,
   python,
+  pytest,
 }:
 
 buildPythonPackage rec {
   pname = "librt";
-  version = "0.7.8";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mypyc";
     repo = "librt";
     tag = "v${version}";
-    hash = "sha256-FlLilZQMsXAYfreBAfYoutCEww8IVoU7jjxvvJr8pTk=";
+    hash = "sha256-RZGaOq8hmkwekCs1fKshDrx3vmHdJl/wI3IO9ZLH5rc=";
   };
 
   # https://github.com/mypyc/librt/blob/v0.7.8/.github/workflows/buildwheels.yml#L90-L93
@@ -30,6 +31,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     mypy-extensions
+    pytest
   ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 3f737f14eef7..ff7fb38852a5 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -76,13 +76,13 @@ let
 in
 
 buildPythonPackage rec {
-  version = "3.10.8";
+  version = "3.10.9";
   pname = "matplotlib";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ipk3LBnVa801zwWic4MIdY0yuertI3GJjY9b0z8ISqM=";
+    hash = "sha256-/WZQjoxod9mOWGZUtgigRW241+ilRuseJgDv2VcwI1g=";
   };
 
   env.XDG_RUNTIME_DIR = "/tmp";
diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix
index 9ce81605053d..b7e6d1eb180b 100644
--- a/pkgs/development/python-modules/mohawk/default.nix
+++ b/pkgs/development/python-modules/mohawk/default.nix
@@ -22,8 +22,8 @@ buildPythonPackage rec {
     (fetchpatch2 {
       # https://github.com/kumar303/mohawk/pull/59
       name = "nose-to-pytest.patch";
-      url = "https://github.com/kumar303/mohawk/compare/b7899166880e890f01cf2531b5686094ba08df8f...66157c7efbf6b0d18c30a9ffe5dfd84bef27bd3a.patch";
-      hash = "sha256-w3sP5XeBqOwoPGsWzYET4djYwuKPaS4OOlC3HBPD0NI=";
+      url = "https://github.com/kumar303/mohawk/compare/b7899166880e890f01cf2531b5686094ba08df8f...66157c7efbf6b0d18c30a9ffe5dfd84bef27bd3a.diff?full_index=1";
+      hash = "sha256-wUA62sHuZuyarVU3NjLy3XqTW0kZeUzfiw2vitkcfLg=";
     })
   ];
 
diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix
index a78d24afe9d2..01c2299b1d8c 100644
--- a/pkgs/development/python-modules/mpmath/default.nix
+++ b/pkgs/development/python-modules/mpmath/default.nix
@@ -5,25 +5,31 @@
   gmpy2,
   isPyPy,
   setuptools,
+  setuptools-scm,
   pytestCheckHook,
-
+  pytest-xdist,
+  hypothesis,
+  pexpect,
   # Reverse dependency
   sage,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mpmath";
-  version = "1.3.0";
-  format = "setuptools";
+  version = "1.4.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mpmath";
     repo = "mpmath";
-    tag = version;
-    hash = "sha256-9BGcaC3TyolGeO65/H42T/WQY6z5vc1h+MA+8MGFChU=";
+    tag = finalAttrs.version;
+    hash = "sha256-ykfKrpDri+4n9Y26S7nFl6nF0CV6V0A11ijmt8/apvg=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   optional-dependencies = {
     gmpy = lib.optionals (!isPyPy) [ gmpy2 ];
@@ -33,7 +39,12 @@ buildPythonPackage rec {
     inherit sage;
   };
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-xdist
+    hypothesis
+    pexpect
+  ];
 
   meta = {
     homepage = "https://mpmath.org/";
@@ -42,4 +53,4 @@ buildPythonPackage rec {
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index e3cbdc382901..bbbbb99d5e96 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   gitUpdater,
   pythonAtLeast,
   isPyPy,
@@ -34,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "1.19.1";
+  version = "1.20.1";
   pyproject = true;
 
   # relies on several CPython internals
@@ -44,7 +43,7 @@ buildPythonPackage rec {
     owner = "python";
     repo = "mypy";
     tag = "v${version}";
-    hash = "sha256-REUJgYd00qr36hoHevkJEWK/+2hE/caymjD/asqa6eI=";
+    hash = "sha256-MQZZyGu6xFh3wO+0lWED+mingjK92v/onljtp9gylmM=";
   };
 
   passthru.updateScript = gitUpdater {
@@ -104,9 +103,15 @@ buildPythonPackage rec {
   ++ lib.concatAttrValues optional-dependencies;
 
   disabledTests = [
-    # fails with typing-extensions>=4.10
-    # https://github.com/python/mypy/issues/17005
-    "test_runtime_typing_objects"
+    # A change to the base64 decoder in CPython 3.13.13 and 3.14.4 causes this
+    # test to fail. At the time of writing, upstream skips the test.
+    # Upstream issue: https://github.com/python/mypy/issues/21120
+    # CPython issue: https://github.com/python/cpython/issues/145264
+    "testAllBase64Features_librt_experimental"
+    # https://github.com/python/mypy/issues/21120
+    "testAllBase64Features_librt"
+    # fails to import librt
+    "test_diff_cache_produces_valid_json"
   ]
   ++ lib.optionals (pythonAtLeast "3.12") [
     # requires distutils
@@ -114,6 +119,8 @@ buildPythonPackage rec {
   ];
 
   disabledTestPaths = [
+    # circular dependency on distutils
+    "mypyc/test/test_external.py"
     # fails to find tyoing_extensions
     "mypy/test/testcmdline.py"
     "mypy/test/testdaemon.py"
diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix
index 3e6b5a712564..4fc274257916 100644
--- a/pkgs/development/python-modules/numpy/1.nix
+++ b/pkgs/development/python-modules/numpy/1.nix
@@ -13,7 +13,6 @@
   meson-python,
   mesonEmulatorHook,
   pkg-config,
-  xcbuild,
 
   # native dependencies
   blas,
@@ -79,7 +78,6 @@ buildPythonPackage (finalAttrs: {
     meson-python
     pkg-config
   ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xcbuild.xcrun ]
   ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index bee037126c99..f336a573ca13 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -13,7 +13,6 @@
   meson-python,
   mesonEmulatorHook,
   pkg-config,
-  xcbuild,
 
   # native dependencies
   blas,
@@ -85,7 +84,6 @@ buildPythonPackage (finalAttrs: {
     meson-python
     pkg-config
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ]
   ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
 
   # we default openblas to build with 64 threads
diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix
index 2d69f1f855d7..ebf39f5d92cd 100644
--- a/pkgs/development/python-modules/packaging/default.nix
+++ b/pkgs/development/python-modules/packaging/default.nix
@@ -14,12 +14,12 @@
 let
   packaging = buildPythonPackage rec {
     pname = "packaging";
-    version = "25.0";
+    version = "26.1";
     pyproject = true;
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-1EOHLJjWd79g9qHy+MHLdI6P52LSv50xSLVZkpWw/E8=";
+      hash = "sha256-8EIVK2gcS/rFyuJ0KlXhA9J6suwPPYgDcTa2v+fJxd4=";
     };
 
     nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix
index f38a20297060..14896bdf9925 100644
--- a/pkgs/development/python-modules/parso/default.nix
+++ b/pkgs/development/python-modules/parso/default.nix
@@ -6,16 +6,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "parso";
-  version = "0.8.5";
+  version = "0.8.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "davidhalter";
     repo = "parso";
-    tag = "v${version}";
-    hash = "sha256-faSXCrOkybLr0bboF/8rPV/Humq8s158A3UOpdlYi0I=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vpWoxLIvNt4QQh/r57iAvX3Zebet3mihb5efOWLhYI8=";
   };
 
   build-system = [ setuptools ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python Parser";
     homepage = "https://parso.readthedocs.io/en/latest/";
-    changelog = "https://github.com/davidhalter/parso/blob/${src.tag}/CHANGELOG.rst";
+    changelog = "https://github.com/davidhalter/parso/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix
index dc92386a5c3f..925f2896c54b 100644
--- a/pkgs/development/python-modules/pathspec/default.nix
+++ b/pkgs/development/python-modules/pathspec/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pathspec";
-  version = "0.12.1";
+  version = "1.0.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pILVFQOhqzOxxnpsOBOiaVPb3HHDHayu+ag4xOKfVxI=";
+    hash = "sha256-AhDiroohqRN8DUcFeMsOWVr4ftqm6/Ev8XbxSgLg5kU=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index c02656ed592b..a2c95b8796fe 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -15,7 +15,6 @@
 
   # tests
   pytestCheckHook,
-  pytest-benchmark,
   numpy,
   matplotlib,
   uncertainties,
@@ -54,12 +53,13 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    pytest-benchmark
     matplotlib
     writableTmpDirAsHomeHook
   ];
 
-  pytestFlags = [ "--benchmark-disable" ];
+  disabledTestPaths = [
+    "pint/testsuite/benchmarks"
+  ];
 
   meta = {
     changelog = "https://github.com/hgrecco/pint/blob/${version}/CHANGES";
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index a79b25be092a..7f9c214dfaab 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -74,6 +74,7 @@ buildPythonPackage rec {
     "test_iter_dependencies_after_combine_install_requirements"
     "test_iter_dependencies_after_combine_install_requirements_extras"
     "test_name_collision"
+    "test_build_project_metadata_upgrading_raises_error"
     # Assertion error
     "test_compile_recursive_extras"
     "test_compile_build_targets_setuptools_no_wheel_dep"
diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix
index b4bb2b5ab9cb..41ff1ff2918e 100644
--- a/pkgs/development/python-modules/polars/default.nix
+++ b/pkgs/development/python-modules/polars/default.nix
@@ -41,7 +41,7 @@
 }:
 
 let
-  version = "1.36.1";
+  version = "1.40.1";
 
   # Hide symbols to prevent accidental use
   rust-jemalloc-sys = throw "polars: use polarsMemoryAllocator over rust-jemalloc-sys";
@@ -57,12 +57,12 @@ buildPythonPackage rec {
     owner = "pola-rs";
     repo = "polars";
     tag = "py-${version}";
-    hash = "sha256-0usMg/xQZOzrLf2gIfNFtzj96cYVzq5gFaKTFLqyfK0=";
+    hash = "sha256-QlrEYwoYPALELK3UGBC/92vCBIzFrigJAwU8qxn7Pys=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-20AI4AGSxnmYitQjfwTFwxMBplEqvN4WXPFdoqJBgSg=";
+    hash = "sha256-rmCJ5SY5okvkgfd63yPDO2YOksqAWgKa9nqxTqP7Grw=";
   };
 
   requiredSystemFeatures = [ "big-parallel" ];
diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index caa8eb862cc2..cd9a4d7d6c05 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -32,14 +32,14 @@
 
 let
   pname = "psycopg";
-  version = "3.3.3";
+  version = "3.3.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "psycopg";
     repo = "psycopg";
     tag = version;
-    hash = "sha256-hWiclfvimp6WldcDQPx7RFLx+XYRR9wPagAe0oZg7Pw=";
+    hash = "sha256-hHgswbqaoQRQrUxhNFG6tfmlap1mVUo/OkNsWF686U4=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix
index 788939ad6a7e..dc4a86879a32 100644
--- a/pkgs/development/python-modules/pyasn1/default.nix
+++ b/pkgs/development/python-modules/pyasn1/default.nix
@@ -1,29 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyasn1";
-  version = "0.6.2";
+  version = "0.6.3";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-m1mislun5PgZfbdobAn7M+ZYuYM5+tuCbpUSYpAXgzs=";
+  src = fetchFromGitHub {
+    owner = "pyasn1";
+    repo = "pyasn1";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fHpAJ1WSoLwaWuSMcfHjZmnl8oNhADrdjHaYIEmqQiw=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "pyasn1" ];
 
   meta = {
     description = "Generic ASN.1 library for Python";
     homepage = "https://pyasn1.readthedocs.io";
-    changelog = "https://github.com/etingof/pyasn1/blob/master/CHANGES.rst";
+    changelog = "https://github.com/pyasn1/pyasn1/blob/${finalAttrs.src.tag}/CHANGES.rst";
     license = lib.licenses.bsd2;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index 484718723806..1d2d35271418 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -30,14 +30,14 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "pybind11";
-  version = "3.0.3";
+  version = "3.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q609c2Q1n37OJ9fK0uDcniQZPO2PL+fnWdArV56qR64=";
+    hash = "sha256-QZKnIOopEDsiRFkc1qQ+DaDHoTNuEEgQVeiAL0sQqak=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix
index 8d0196473c09..23dfe6c7a47a 100644
--- a/pkgs/development/python-modules/pyexcel-ods/default.nix
+++ b/pkgs/development/python-modules/pyexcel-ods/default.nix
@@ -29,8 +29,8 @@ buildPythonPackage rec {
     # https://github.com/pyexcel/pyexcel-ods/pull/45
     (fetchpatch2 {
       name = "nose-to-pytest.patch";
-      url = "https://github.com/pyexcel/pyexcel-ods/compare/661d4f0b484ed281128c72e1a2701e2d33fc1879...838b410e800a86c147644568aaa8b2c005d13491.patch";
-      hash = "sha256-1a52VM8yGDEjSFXTq3Di74xwv10d/QskpctOnz9zW1w=";
+      url = "https://github.com/pyexcel/pyexcel-ods/compare/661d4f0b484ed281128c72e1a2701e2d33fc1879...838b410e800a86c147644568aaa8b2c005d13491.diff?full_index=1";
+      hash = "sha256-voBdAjSJIsLEn7Tr44aagJy1FU9vWnBs1bM48zYxujA=";
     })
   ];
 
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index ecdaa3e02e9a..b912d6b04bb8 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pygobject";
-  version = "3.54.5";
+  version = "3.56.2";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/pygobject/${lib.versions.majorMinor version}/pygobject-${version}.tar.gz";
-    hash = "sha256-tmVvY0j1JFYGzxXqSMOEx/BRVsderSBsGyRsgKIvtYU=";
+    hash = "sha256-uBYJiWlUQIHenuztuUrWrFnHfk1XH+cFHxi+vOwHQxM=";
   };
 
   depsBuildBuild = [ pkg-config ];
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index d4df365b9399..46e99e1e4bbf 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pyopenssl";
-  version = "25.3.0";
+  version = "26.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyca";
     repo = "pyopenssl";
     tag = version;
-    hash = "sha256-lNXS3lIGFPeM7DKMFTLBiOWn+AwZtenXF5KGN5DRwO4=";
+    hash = "sha256-3Z9I4T1KPObZebVEMhykeq9yzQ446i9CZ5YwkeqlVTs=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix
index 5d6bd6d8337e..84ee543ffa41 100644
--- a/pkgs/development/python-modules/pyqt/6.x.nix
+++ b/pkgs/development/python-modules/pyqt/6.x.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchzip,
+  fetchPypi,
   pkg-config,
   dbus,
   lndir,
@@ -24,19 +24,15 @@
   withPdf ? true,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyqt6";
-  version = "6.9.0";
+  version = "6.11.0";
   pyproject = true;
 
-  # It looks like a stable release, but is it? Who knows.
-  # It's not on PyPI proper yet, at least, and the current
-  # actually-released version does not build with Qt 6.9,
-  # so we kinda have to use it.
-  # "ffs smdh fam" - K900
-  src = fetchzip {
-    url = "https://web.archive.org/web/20250406083944/https://www.riverbankcomputing.com/pypi/packages/PyQt6/pyqt6-6.9.0.tar.gz";
-    hash = "sha256-UZSbz6MqdNtl2r4N8uvgNjQ+28KCzNFb5yFqPcooT5E=";
+  src = fetchPypi {
+    pname = "pyqt6";
+    inherit (finalAttrs) version;
+    hash = "sha256-Rd1gqmmXbeGRi1zta057aiWr0qkZ7O9f1YJuzHZxiIk=";
   };
 
   patches = [
@@ -66,7 +62,7 @@ buildPythonPackage rec {
     EOF
 
     substituteInPlace pyproject.toml \
-      --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"'
+      --replace-fail 'version = "${finalAttrs.version}"' 'version = "${lib.versions.pad 3 finalAttrs.version}"'
   '';
 
   enableParallelBuilding = true;
@@ -166,4 +162,4 @@ buildPythonPackage rec {
     inherit (mesa.meta) platforms;
     maintainers = with lib.maintainers; [ LunNova ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix
index 60d654973e40..b1fb2450970e 100644
--- a/pkgs/development/python-modules/pysnmp/default.nix
+++ b/pkgs/development/python-modules/pysnmp/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pysnmp";
-  version = "7.1.22";
+  version = "7.1.24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lextudio";
     repo = "pysnmp";
     tag = "v${version}";
-    hash = "sha256-uEOhOVXaz4g1Ciun8x2AT8pRBkKR6uEfu4KJ1XSwouY=";
+    hash = "sha256-jKTU6ivcg13naaKMVmCYtjmi16kh3nAScDN80OR0d+A=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index dac23d2351cd..c86b2b419237 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -26,12 +26,12 @@
 
 buildPythonPackage rec {
   pname = "pytest";
-  version = "9.0.2";
+  version = "9.0.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dRhmUakr2JYR0dn8IPC0NF/YJ8QczVwpmoaKBdcO3xE=";
+    hash = "sha256-uGraUIr4HRnt6yE8aBsdSCRsGpHTBMbIGkJ2dMF+uRw=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix
index a9f0c71dbe7b..45c24cabc838 100644
--- a/pkgs/development/python-modules/python-dotenv/default.nix
+++ b/pkgs/development/python-modules/python-dotenv/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "python-dotenv";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "theskumar";
     repo = "python-dotenv";
     tag = "v${version}";
-    hash = "sha256-YOwe/MHIyGdt6JqiwXwYi1cYxyPkGsBdUhjoG2Ks0y0=";
+    hash = "sha256-MoBt3QsY5u3r852MtVWZS9tFXpyK8aRZlLG3rpzIVrY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix
index b0aeb1264a38..adcbc9e547da 100644
--- a/pkgs/development/python-modules/python-magic/default.nix
+++ b/pkgs/development/python-modules/python-magic/default.nix
@@ -38,6 +38,9 @@ buildPythonPackage rec {
       url = "https://github.com/ahupp/python-magic/commit/3d2405ca80cd39b2a91decd26af81dcf181390a4.patch";
       hash = "sha256-HRsnO9MGfMD9BkJdC4SrEFQ1OZEaXpwakXFLoaCPK94=";
     })
+
+    # Fix test failures due to modified output in file 5.47
+    ./fix-parquet-test.patch
   ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/python-magic/fix-parquet-test.patch b/pkgs/development/python-modules/python-magic/fix-parquet-test.patch
new file mode 100644
index 000000000000..6062b28d30ca
--- /dev/null
+++ b/pkgs/development/python-modules/python-magic/fix-parquet-test.patch
@@ -0,0 +1,20 @@
+--- a/test/python_magic_test.py
++++ b/test/python_magic_test.py
+@@ -93,7 +93,7 @@ class MagicTest(unittest.TestCase):
+                 'magic._pyc_': ('application/octet-stream', 'text/x-bytecode.python', 'application/x-bytecode.python'),
+                 'test.pdf': 'application/pdf',
+                 'test.gz': ('application/gzip', 'application/x-gzip'),
+-                'test.snappy.parquet': 'application/octet-stream',
++                'test.snappy.parquet': ('application/octet-stream', 'application/vnd.apache.parquet'),
+                 'text.txt': 'text/plain',
+                 b'\xce\xbb'.decode('utf-8'): 'text/plain',
+                 b'\xce\xbb': 'text/plain',
+@@ -123,7 +123,7 @@ class MagicTest(unittest.TestCase):
+                      ': Sun Jun 29 01:32:52 2008, from Unix, truncated'
+                      ),
+                 'text.txt': 'ASCII text',
+-                'test.snappy.parquet': ('Apache Parquet', 'Par archive data'),
++                'test.snappy.parquet': ('Apache Parquet', 'Apache Parquet file', 'Par archive data'),
+             }, buf_equals_file=False)
+         finally:
+             del os.environ['TZ']
diff --git a/pkgs/development/python-modules/python-multipart/CVE-2026-40347-part-2.patch b/pkgs/development/python-modules/python-multipart/CVE-2026-40347-part-2.patch
new file mode 100644
index 000000000000..ea8e5b2e95f8
--- /dev/null
+++ b/pkgs/development/python-modules/python-multipart/CVE-2026-40347-part-2.patch
@@ -0,0 +1,106 @@
+Based on upstream d4452a78bbde94995dd3c0d1b4aff3610a5c472f, adjusted
+to apply to 0.0.22
+
+diff --git a/python_multipart/multipart.py b/python_multipart/multipart.py
+index 0f238c2..d2a597e 100644
+--- a/python_multipart/multipart.py
++++ b/python_multipart/multipart.py
+@@ -1418,12 +1418,8 @@ class MultipartParser(BaseParser):
+                     state = MultipartState.END
+ 
+             elif state == MultipartState.END:
+-                # Don't do anything if chunk ends with CRLF.
+-                if c == CR and i + 1 < length and data[i + 1] == LF:
+-                    i += 2
+-                    continue
+-                # Skip data after the last boundary.
+-                self.logger.warning("Skipping data after last boundary")
++                # Silently discard any epilogue data (RFC 2046 section 5.1.1 allows a CRLF and optional
++                # epilogue after the closing boundary). Django and Werkzeug do the same.
+                 i = length
+                 break
+ 
+diff --git a/tests/test_multipart.py b/tests/test_multipart.py
+index 75982b6..3e8dd89 100644
+--- a/tests/test_multipart.py
++++ b/tests/test_multipart.py
+@@ -1,6 +1,5 @@
+ from __future__ import annotations
+ 
+-import logging
+ import os
+ import random
+ import sys
+@@ -722,6 +721,14 @@ single_byte_tests = [
+     "single_field_single_file",
+ ]
+ 
++EPILOGUE_TEST_HEAD = (
++    "--boundary\r\n"
++    'Content-Disposition: form-data; name="file"; filename="filename.txt"\r\n'
++    "Content-Type: text/plain\r\n\r\n"
++    "hello\r\n"
++    "--boundary--"
++).encode("latin-1")
++
+ 
+ def split_all(val: bytes) -> Iterator[tuple[bytes, bytes]]:
+     """
+@@ -1266,7 +1273,7 @@ class TestFormParser(unittest.TestCase):
+         self.assert_file_data(files[0], b"hello")
+ 
+     def test_multipart_parser_data_after_last_boundary(self) -> None:
+-        """This test makes sure that the parser does not handle when there is junk data after the last boundary."""
++        """Parser must short-circuit on arbitrary epilogue data after the closing boundary (no O(N) scan)."""
+         num = 50_000_000
+         data = (
+             "--boundary\r\n"
+@@ -1284,29 +1291,32 @@ class TestFormParser(unittest.TestCase):
+         f = FormParser("multipart/form-data", on_field=Mock(), on_file=on_file, boundary="boundary")
+         f.write(data.encode("latin-1"))
+ 
+-    @pytest.fixture(autouse=True)
+-    def inject_fixtures(self, caplog: pytest.LogCaptureFixture) -> None:
+-        self._caplog = caplog
+-
+-    def test_multipart_parser_data_end_with_crlf_without_warnings(self) -> None:
+-        """This test makes sure that the parser does not handle when the data ends with a CRLF."""
+-        data = (
+-            "--boundary\r\n"
+-            'Content-Disposition: form-data; name="file"; filename="filename.txt"\r\n'
+-            "Content-Type: text/plain\r\n\r\n"
+-            "hello\r\n"
+-            "--boundary--\r\n"
+-        )
++    @parametrize(
++        "chunks",
++        [
++            [EPILOGUE_TEST_HEAD + b"\r\n"],
++            [EPILOGUE_TEST_HEAD + b"\r", b"\n"],
++            [EPILOGUE_TEST_HEAD, b"\r\n"],
++            [EPILOGUE_TEST_HEAD + b"\r\n--boundary\r\nthis is not a valid header\r\n\r\nnot a real part"],
++        ],
++    )
++    def test_multipart_parser_ignores_epilogue(self, chunks: list[bytes]) -> None:
++        """Epilogue data after the closing boundary must be ignored.
+ 
++        Covers both the single-chunk case and the case where trailing CRLF is split across `write()` calls.
++        The final case asserts that epilogue bytes are not parsed or validated.
++        """
+         files: list[File] = []
+ 
+         def on_file(f: FileProtocol) -> None:
+             files.append(cast(File, f))
+ 
+         f = FormParser("multipart/form-data", on_field=Mock(), on_file=on_file, boundary="boundary")
+-        with self._caplog.at_level(logging.WARNING):
+-            f.write(data.encode("latin-1"))
+-            assert len(self._caplog.records) == 0
++        for chunk in chunks:
++            f.write(chunk)
++
++        assert len(files) == 1
++        self.assert_file_data(files[0], b"hello")
+ 
+     def test_max_size_multipart(self) -> None:
+         # Load test data.
diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix
index 5d79c54db215..4781d391f0a2 100644
--- a/pkgs/development/python-modules/python-multipart/default.nix
+++ b/pkgs/development/python-modules/python-multipart/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   hatchling,
   pytestCheckHook,
   mock,
@@ -27,6 +28,15 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-UegnwGxiXQalbp18t1dl2JOQH6BY975cpBa9uo3SOuk=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2026-40347-part-1.patch";
+      url = "https://github.com/Kludex/python-multipart/commit/6a7b76dd2653d99d8e5981d7ff09a4a047750b37.patch";
+      hash = "sha256-W1nyYMMoaf+lsNze3ppPeAXN+swG1dScDibazePSt+k=";
+    })
+    ./CVE-2026-40347-part-2.patch
+  ];
+
   build-system = [ hatchling ];
 
   pythonImportsCheck = [ "python_multipart" ];
diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 86952f3124cc..b786afac484d 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "2026.2.19";
+  version = "2026.4.4";
 in
 buildPythonPackage {
   pname = "regex";
@@ -18,7 +18,7 @@ buildPythonPackage {
     owner = "mrabarnett";
     repo = "mrab-regex";
     tag = version;
-    hash = "sha256-/Uqq/Z1fwn6TKQ6UfYfOUJ6t7njSZyxTAb1lEXPg5f8=";
+    hash = "sha256-vLhukoQc50XOgv74hBQS36w+T+27y5GTTDetZ2JV8r4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 6028e3bf713c..cdecd986e4ef 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -16,7 +16,6 @@
   pythran,
   pkg-config,
   setuptools,
-  xcbuild,
 
   # buildInputs
   # Upstream has support for using Darwin's Accelerate package. However this
@@ -78,6 +77,12 @@ buildPythonPackage (finalAttrs: {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "numpy>=2.0.0,<2.7" numpy
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+    substituteInPlace scipy/meson.build \
+      --replace-fail "r = run_command('xcrun', '-sdk', 'macosx', '--show-sdk-version', check: true)" ""
+    substituteInPlace scipy/meson.build \
+      --replace-fail "sdkVersion = r.stdout().strip()" "sdkVersion = '${stdenv.hostPlatform.darwinSdkVersion}'"
   '';
 
   build-system = [
@@ -88,13 +93,6 @@ buildPythonPackage (finalAttrs: {
     pythran
     pkg-config
     setuptools
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Minimal version required according to:
-    # https://github.com/scipy/scipy/blob/v1.16.0/scipy/meson.build#L238-L244
-    (xcbuild.override {
-      sdkVer = "13.3";
-    })
   ];
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 14448351f538..657d23f35073 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -19,9 +19,17 @@ buildPythonPackage rec {
     hash = "sha256-s/gfJc3yxvCE6cjP03vtIZqNFmoZKR3d7+4gTPk1hQg=";
   };
 
+  patches = [
+    ./reproducible-wheel.patch
+  ];
+
   # Drop dependency on coherent.license, which in turn requires coherent.build
   postPatch = ''
     sed -i "/coherent.licensed/d" pyproject.toml
+
+    # Substitute version for reproducible builds
+    substituteInPlace setuptools/version.py \
+      --replace-fail '@version@' '${version}'
   '';
 
   preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
diff --git a/pkgs/development/python-modules/setuptools/reproducible-wheel.patch b/pkgs/development/python-modules/setuptools/reproducible-wheel.patch
new file mode 100644
index 000000000000..8b2e1881d089
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools/reproducible-wheel.patch
@@ -0,0 +1,13 @@
+diff --git a/setuptools/version.py b/setuptools/version.py
+--- a/setuptools/version.py
++++ b/setuptools/version.py
+@@ -1,6 +1,3 @@
+-from ._importlib import metadata
+-
+-try:
+-    __version__ = metadata.version('setuptools') or '0.dev0+unknown'
+-except Exception:
+-    __version__ = '0.dev0+unknown'
++# Hardcoded for reproducible builds
++# This avoids runtime metadata queries that can vary between builds
++__version__ = '@version@'
diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
index 17e46d263abd..fcfc2e4b9893 100644
--- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sphinx-autodoc-typehints";
-  version = "3.9.9";
+  version = "3.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "sphinx-autodoc-typehints";
     tag = finalAttrs.version;
-    hash = "sha256-TyG63QHuiquofeMkr078FsBVc9TAqPFfzWJ5L9sdqm0=";
+    hash = "sha256-ZdUKD8qUWjndhkqnUVk9NoSFgH/Fl2yG7LKHUB4T9CA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix
index 544d767cbdf4..876482b7f855 100644
--- a/pkgs/development/python-modules/trio-websocket/default.nix
+++ b/pkgs/development/python-modules/trio-websocket/default.nix
@@ -55,6 +55,9 @@ buildPythonPackage rec {
     "test_server_close_timeout"
     "test_server_handler_exit"
     "test_server_open_timeout"
+    # Race condition
+    # https://github.com/python-trio/trio-websocket/issues/202
+    "test_open_websocket_internal_exc"
   ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix
index 3164ac119050..5771c7160515 100644
--- a/pkgs/development/python-modules/trove-classifiers/default.nix
+++ b/pkgs/development/python-modules/trove-classifiers/default.nix
@@ -10,13 +10,13 @@
 let
   self = buildPythonPackage rec {
     pname = "trove-classifiers";
-    version = "2026.1.14.14";
+    version = "2026.4.28.13";
     pyproject = true;
 
     src = fetchPypi {
       pname = "trove_classifiers";
       inherit version;
-      hash = "sha256-AEklRaFAKwnUhYYFuhkOozJD02HisBycKWzga1wzJfM=";
+      hash = "sha256-yFu4pTw95zMNFpm4RO2fuAmmAqCawV3HmtbRpQm+BnY=";
     };
 
     postPatch = ''
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 9f20df52c8ec..a886c3576a41 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -187,8 +187,9 @@ buildPythonPackage rec {
           "ProcessTestsBuilder_SelectReactorTests.test_processEnded"
         ];
         "src/twisted/internet/test/test_tcp.py" = [
-          # marked as flaky on macOS by upstream
-          # https://github.com/twisted/twisted/blob/twisted-25.5.0/src/twisted/internet/test/test_tcp.py
+          # flaky on macOS, suspected kernel bug in socket notifications
+          # https://github.com/twisted/twisted/issues/12151
+          "AbortConnectionTests_AsyncioSelectorReactorTests.test_fullWriteBufferAfterByteExchange"
           "AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbort"
           "AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbortLater"
           # Times out in Hydra on x86_64-darwin
diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix
index b9c451664e0f..b6db24779f12 100644
--- a/pkgs/development/python-modules/tzdata/default.nix
+++ b/pkgs/development/python-modules/tzdata/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "tzdata";
-  version = "2026.1";
+  version = "2026.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Z2WKGQPHWRcwnnU/3DSawO/Ywn23oMtAaiW+SED4f5g=";
+    hash = "sha256-kXP959gNkBjgKmYuFo5aLQT4fEHqF0sTn772Qu2mLRA=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/tools/haskell/iserv-proxy/default.nix b/pkgs/development/tools/haskell/iserv-proxy/default.nix
index 63e312bfe3a5..a0261b8fb22a 100644
--- a/pkgs/development/tools/haskell/iserv-proxy/default.nix
+++ b/pkgs/development/tools/haskell/iserv-proxy/default.nix
@@ -15,14 +15,14 @@
 }:
 mkDerivation {
   pname = "iserv-proxy";
-  version = "9.3-unstable-2025-10-30";
+  version = "9.3-unstable-2026-04-08";
 
   # https://github.com/stable-haskell/iserv-proxy/pull/1
   src = fetchFromGitHub {
     owner = "stable-haskell";
     repo = "iserv-proxy";
-    rev = "bbee090fc67bb5cc6ad4508fa5def560b7672591";
-    hash = "sha256-2aCGboNCF602huvmbyTcfhe6s+D4/n/NlOefd0c0SC0=";
+    rev = "3f7b2815307c20a0dfd816bdf4a39ab86af3e0d4";
+    hash = "sha256-10x8/G0x3eR/++XRHPx4MBuqlnc6+N+ajIxXyLkG+nU=";
   };
 
   isLibrary = true;
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 75770fa1b6e2..6a7b9633aa0a 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sysprof";
-  version = "49.0";
+  version = "50.0";
 
   outputs = [
     "out"
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/sysprof/${lib.versions.major finalAttrs.version}/sysprof-${finalAttrs.version}.tar.xz";
-    hash = "sha256-/wQTljd4XIQZSIYgh6QyO5gWgNlCKWQJMhtXT8soKHg=";
+    hash = "sha256-qs5E6Q6Q9sNLsvvsjMtHuPgRAwgJeNZXWSh4Q8Mp1To=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/web/nodejs/fix-temporal-integration-with-shared-icu.patch b/pkgs/development/web/nodejs/fix-temporal-integration-with-shared-icu.patch
new file mode 100644
index 000000000000..5a4ed7301f8f
--- /dev/null
+++ b/pkgs/development/web/nodejs/fix-temporal-integration-with-shared-icu.patch
@@ -0,0 +1,102 @@
+From https://chromium-review.googlesource.com/c/v8/v8/+/7769990
+From: Tmalone1250 <malonetrevor12@gmail.com>
+Date: Wed, 15 Apr 2026 21:07:53 -0500
+Subject: [PATCH] build, v8: fix Temporal compilation with system or no ICU
+
+---
+ deps/v8/src/objects/js-temporal-zoneinfo64.cc | 11 ++++--
+ tools/v8_gypfiles/v8.gyp                      | 37 +++++++++++++++++++
+ 2 files changed, 44 insertions(+), 4 deletions(-)
+
+diff --git a/deps/v8/src/objects/js-temporal-zoneinfo64.cc b/deps/v8/src/objects/js-temporal-zoneinfo64.cc
+index 99dd3a84c1e54f..149138671e0770 100644
+--- a/deps/v8/src/objects/js-temporal-zoneinfo64.cc
++++ b/deps/v8/src/objects/js-temporal-zoneinfo64.cc
+@@ -10,9 +10,12 @@
+ #include "temporal_rs/Provider.hpp"
+ #include "temporal_rs/TimeZone.hpp"
+ 
+-#ifdef V8_INTL_SUPPORT
++#if defined(V8_INTL_SUPPORT) && defined(__has_include) && __has_include("udatamem.h")
+ #include "udatamem.h"
+-#else
++#define V8_TEMPORAL_USE_ICU_RAW_MEMORY
++#endif
++
++#ifndef V8_TEMPORAL_USE_ICU_RAW_MEMORY
+ // Defined in builtins-temporal-zoneinfo64-data.cc, generated by
+ // include-file-as-bytes.py
+ extern "C" uint32_t zoneinfo64_static_data[];
+@@ -22,7 +25,7 @@ extern "C" size_t zoneinfo64_static_data_len;
+ namespace v8::internal {
+ 
+ ZoneInfo64Provider::ZoneInfo64Provider() {
+-#ifdef V8_INTL_SUPPORT
++#ifdef V8_TEMPORAL_USE_ICU_RAW_MEMORY
+   UErrorCode status = U_ZERO_ERROR;
+   memory = udata_open(0, "res", "zoneinfo64", &status);
+   if (U_FAILURE(status)) {
+@@ -74,7 +77,7 @@ ZoneInfo64Provider::~ZoneInfo64Provider() {
+ 
+   // Then clean up memory
+   // This ideally is a no-op when using static data
+-#ifdef V8_INTL_SUPPORT
++#ifdef V8_TEMPORAL_USE_ICU_RAW_MEMORY
+   if (memory) {
+     udata_close(memory);
+   }
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index e09fcc1ce8c59f..2f0fd30771881b 100644
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -1379,6 +1379,9 @@
+              '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_base_without_compiler.*?v8_enable_i18n_support.*?sources -= ")',
+            ],
+          }],
++        ['v8_enable_temporal_support==1', {
++          'dependencies': ['make_temporal_zoneinfo_cpp'],
++        }],
+         ['v8_postmortem_support', {
+           'dependencies': ['postmortem-metadata#target'],
+         }],
+@@ -1955,6 +1958,40 @@
+         "<(V8_ROOT)/src/regexp/special-case.h",
+       ],
+     },  # gen-regexp-special-case
++    {
++      'target_name': 'make_temporal_zoneinfo_cpp',
++      'type': 'none',
++      'toolsets': ['host', 'target'],
++      'conditions': [
++        ['v8_enable_temporal_support==1', {
++          'actions': [
++            {
++              'action_name': 'make_temporal_zoneinfo_cpp_action',
++              'inputs': [
++                '<(V8_ROOT)/tools/include-file-as-bytes.py',
++                '<(V8_ROOT)/../crates/vendor/zoneinfo64/src/data/zoneinfo64.res',
++              ],
++              'outputs': [
++                '<(SHARED_INTERMEDIATE_DIR)/src/builtins/builtins-temporal-zoneinfo64-data.cc',
++              ],
++              'action': [
++                '<(python)',
++                '<(V8_ROOT)/tools/include-file-as-bytes.py',
++                '<(V8_ROOT)/../crates/vendor/zoneinfo64/src/data/zoneinfo64.res',
++                '<@(_outputs)',
++                'zoneinfo64_static_data',
++              ],
++              'message': 'Generating temporal zoneinfo static data',
++            },
++          ],
++        }],
++      ],
++      'direct_dependent_settings': {
++        'sources': [
++          '<(SHARED_INTERMEDIATE_DIR)/src/builtins/builtins-temporal-zoneinfo64-data.cc',
++        ],
++      },
++    },
+     {
+       'target_name': 'run_gen-regexp-special-case',
+       'type': 'none',
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 070a37f8f0ad..b89c24b6cc87 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -34,6 +34,7 @@
     }
   ),
   sqlite,
+  temporal_capi,
   uvwasi,
   zlib,
   zstd,
@@ -135,12 +136,14 @@ let
   useSharedLief = lib.versionAtLeast version "25.6";
   useSharedMerve = lib.versionAtLeast version (if majorVersion == 24 then "24.14.0" else "25.6.1");
   useSharedSQLite = lib.versionAtLeast version "22.5";
+  useSharedTemporal = majorVersion == "26";
   useSharedZstd = lib.versionAtLeast version "22.15";
 
   sharedLibDeps = {
     inherit
       brotli
       libuv
+      nghttp2
       nghttp3
       ngtcp2
       openssl
@@ -149,16 +152,6 @@ let
       ;
     cares = c-ares;
     http-parser = llhttp;
-    nghttp2 = nghttp2.overrideAttrs {
-      patches = [
-        (fetchpatch2 {
-          url = "https://github.com/nghttp2/nghttp2/commit/7784fa979d0bcf801a35f1afbb25fb048d815cd7.patch?full_index=1";
-          hash = "sha256-RG87Qifjpl7HTP9ac2JwHj2XAbDlFgOpAnpZX3ET6gU=";
-          excludes = [ "lib/includes/nghttp2/nghttp2.h" ];
-          revert = true;
-        })
-      ];
-    };
   }
   // (lib.optionalAttrs useSharedAdaAndSimd {
     inherit
@@ -170,6 +163,9 @@ let
   // (lib.optionalAttrs useSharedSQLite {
     inherit sqlite;
   })
+  // (lib.optionalAttrs useSharedTemporal {
+    inherit temporal_capi;
+  })
   // (lib.optionalAttrs useSharedGtestAndHistogram {
     inherit gtest;
     hdr-histogram = hdrhistogram_c;
@@ -319,6 +315,7 @@ let
         # perspective).
         "--emulator=${emulator}"
       ]
+      ++ lib.optional useSharedTemporal "--v8-enable-temporal-support"
       ++ lib.optionals (lib.versionOlder version "19") [ "--without-dtrace" ]
       ++ lib.concatMap (name: [
         "--shared-${name}"
@@ -512,6 +509,12 @@ let
             ++ lib.optional (
               majorVersion == "22" && stdenv.buildPlatform.isDarwin
             ) "test/sequential/test-http-server-request-timeouts-mixed.js"
+            # https://github.com/NixOS/nixpkgs/pull/507974#issuecomment-4249433124
+            # OpenSSL reports different errors
+            # https://github.com/nodejs/node/pull/62629
+            # patch does not apply
+            ++ lib.optional (!lib.versionAtLeast version "24") "test-tls-junk-server"
+            ++ lib.optional (majorVersion == "22") "test-tls-alert-handling"
           )
         }"
       ];
@@ -678,7 +681,7 @@ let
         broken =
           !canExecute && !canEmulate && (stdenv.buildPlatform.parsed.cpu != stdenv.hostPlatform.parsed.cpu);
         mainProgram = "node";
-        knownVulnerabilities = lib.optional (lib.versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/.";
+        knownVulnerabilities = lib.optional (lib.versionOlder version "22") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/.";
       };
 
       passthru.python = python; # to ensure nodeEnv uses the same version
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index c30df6a7f038..dbde28aa29ca 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -67,6 +67,20 @@ buildNodejs {
       hash = "sha256-lfq8PMNvrfJjlp0oE3rJkIsihln/Gcs1T/qgI3wW2kQ=";
       includes = [ "test/*" ];
     })
+    # Patch for nghttp2 1.69 support
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/ecbc22dc3709290dcaadf634a28d8307a75952ee.diff?full_index=1";
+      hash = "sha256-LwniqgKlG1IiqSzdP7UgBw3/9cn1jyz/jtx45yb6RWM=";
+      includes = [
+        "test/parallel/test-http2-misbehaving-flow-control-paused.js"
+        "test/parallel/test-http2-misbehaving-flow-control.js"
+      ];
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/4a32c00fb8dbe55c3bcf9ef43343968c9fe449e6.diff?full_index=1";
+      hash = "sha256-pex8ruwa4b/vWvfGA+nyN3JJP8NOturmwAQe4Rkd6nU=";
+      excludes = [ "tools/nix/*" ];
+    })
   ]
   ++ gypPatches;
 }
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index b2c6f961b601..3c73fdd91bbf 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -78,5 +78,19 @@ buildNodejs {
         hash = "sha256-lfq8PMNvrfJjlp0oE3rJkIsihln/Gcs1T/qgI3wW2kQ=";
         includes = [ "test/*" ];
       })
+      # Patch for nghttp2 1.69 support
+      (fetchpatch2 {
+        url = "https://github.com/nodejs/node/commit/ecbc22dc3709290dcaadf634a28d8307a75952ee.diff?full_index=1";
+        hash = "sha256-LwniqgKlG1IiqSzdP7UgBw3/9cn1jyz/jtx45yb6RWM=";
+        includes = [
+          "test/parallel/test-http2-misbehaving-flow-control-paused.js"
+          "test/parallel/test-http2-misbehaving-flow-control.js"
+        ];
+      })
+      (fetchpatch2 {
+        url = "https://github.com/nodejs/node/commit/4a32c00fb8dbe55c3bcf9ef43343968c9fe449e6.diff?full_index=1";
+        hash = "sha256-pex8ruwa4b/vWvfGA+nyN3JJP8NOturmwAQe4Rkd6nU=";
+        excludes = [ "tools/nix/*" ];
+      })
     ];
 }
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 49028c848e91..0856821b5b69 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -23,8 +23,8 @@ let
       [ ];
 in
 buildNodejs {
-  version = "24.14.1";
-  sha256 = "7822507713f202cf2a551899d250259643f477b671706db421a6fb55c4aa0991";
+  version = "24.15.0";
+  sha256 = "a4f653d79ed140aaad921e8c22a3b585ca85cfdab80d4030f6309e4663a8a1c8";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -56,17 +56,19 @@ buildNodejs {
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
       ./use-nix-codesign.patch
-
-      # TODO: remove this when included in a next release
+      # https://github.com/NixOS/nixpkgs/pull/507974#issuecomment-4249433124
+      # OpenSSL reports different errors
+      # https://github.com/nodejs/node/pull/62629
       (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/a5e534c21af49ae1b34854846b6913daa7df0808.patch?full_index=1";
-        hash = "sha256-4cr94fsJrq5iCAHOf60wJQQkP/K2YWYY5W7GHs8Sbxg=";
-        includes = [ "test/*" ];
+        url = "https://github.com/nodejs/node/commit/dd25d8f29d3ddadcf5a5ebfdf98ece55f9df96c6.patch?full_index=1";
+        hash = "sha256-6cxRN7TyWmJgUZt3jp2YXbVIjrDb2BNep5LxBOtT3Q0=";
       })
+
+      # Patch for nghttp2 1.69 support
       (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/59a522af24173b244cb86829de145d46b143a45c.patch?full_index=1";
-        hash = "sha256-mjxl4rIio8lgjvxqfKrVwdhOUHUUDH2PMh0n8BowXIQ=";
-        includes = [ "src/*" ];
+        url = "https://github.com/nodejs/node/commit/4a32c00fb8dbe55c3bcf9ef43343968c9fe449e6.diff?full_index=1";
+        hash = "sha256-pex8ruwa4b/vWvfGA+nyN3JJP8NOturmwAQe4Rkd6nU=";
+        excludes = [ "tools/nix/*" ];
       })
     ]
     ++ gypPatches
@@ -81,10 +83,5 @@ buildNodejs {
     ++ lib.optionals stdenv.is32bit [
       # see: https://github.com/nodejs/node/issues/58458
       ./v24-32bit.patch
-      # TODO: remove once included in an future upstream release
-      (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/f13d7bf69a7f1642fb5b1b624eff1a50ceb71849.patch?full_index=1";
-        hash = "sha256-4PZq1gG/K+FwAM06VIXYoSNJeOYe37kfKW0jqczeXbc=";
-      })
     ];
 }
diff --git a/pkgs/development/web/nodejs/v25.nix b/pkgs/development/web/nodejs/v26.nix
similarity index 60%
rename from pkgs/development/web/nodejs/v25.nix
rename to pkgs/development/web/nodejs/v26.nix
index f16fd951dce2..ca0eae41d73f 100644
--- a/pkgs/development/web/nodejs/v25.nix
+++ b/pkgs/development/web/nodejs/v26.nix
@@ -23,8 +23,8 @@ let
       [ ];
 in
 buildNodejs {
-  version = "25.9.0";
-  sha256 = "8f78af3ee55fb278668b5f801db58bd1a38ea161318eb5ce2128ddbc9cd813aa";
+  version = "26.0.0";
+  sha256 = "fcb5e5c06a5c2ec9e669801248657aafaa2291f8760dac7bfb639f878318c592";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -56,6 +56,29 @@ buildNodejs {
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
       ./use-nix-codesign.patch
+
+      ./fix-temporal-integration-with-shared-icu.patch
+      # TODO: remove when included in a next release
+      (fetchpatch2 {
+        url = "https://github.com/nodejs/node/commit/730fa6a16fa47406905b47540f3ab46ee10420c2.patch?full_index=1";
+        hash = "sha256-Ks9mT/7fcJ9nl8FWHq7HrVP+ZHF9AEOYV7xsN/NOWII=";
+      })
+
+      # Patch for nghttp2 1.69 support
+      # TODO: remove when included in a next release
+      (fetchpatch2 {
+        url = "https://github.com/nodejs/node/commit/4a32c00fb8dbe55c3bcf9ef43343968c9fe449e6.diff?full_index=1";
+        hash = "sha256-pex8ruwa4b/vWvfGA+nyN3JJP8NOturmwAQe4Rkd6nU=";
+        excludes = [ "tools/nix/*" ];
+      })
+
+      # https://github.com/NixOS/nixpkgs/pull/507974#issuecomment-4249433124
+      # OpenSSL reports different errors
+      # https://github.com/nodejs/node/pull/62629
+      (fetchpatch2 {
+        url = "https://github.com/nodejs/node/commit/dd25d8f29d3ddadcf5a5ebfdf98ece55f9df96c6.patch?full_index=1";
+        hash = "sha256-6cxRN7TyWmJgUZt3jp2YXbVIjrDb2BNep5LxBOtT3Q0=";
+      })
     ]
     ++ gypPatches;
 }
diff --git a/pkgs/os-specific/darwin/by-name/ad/adv_cmds/package.nix b/pkgs/os-specific/darwin/by-name/ad/adv_cmds/package.nix
index 5783a47e0433..3ded625c156b 100644
--- a/pkgs/os-specific/darwin/by-name/ad/adv_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/ad/adv_cmds/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   bison,
+  fetchpatch2,
   flex,
   libxo,
   mkAppleDerivation,
@@ -38,7 +39,20 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-QhkylTnnCy4qG8fpUMlKqDGKz58jysL0YF4lFGJzPzE=";
+  patches = [
+    # We need `colldef` and `mklocale` due to building old locale data. Revert their removal.
+    (fetchpatch2 {
+      url = "https://github.com/apple-oss-distributions/adv_cmds/commit/6bed8737a34dbb54782a18f47dccf933a9967a12.patch?full_index=1";
+      includes = [
+        "colldef/*"
+        "mklocale/*"
+      ];
+      revert = true;
+      hash = "sha256-zDXYuYRak9t9ZnAacl3h5i36g7Law/fLdTKf+YDeRUk=";
+    })
+  ];
+
+  xcodeHash = "sha256-L27TYv2zdKx0WKTBgHSv9Q0FCwrW4o83EmtDyqFM1fs=";
 
   postPatch = ''
     # Meson generators require using @BASENAME@ in the output.
diff --git a/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix b/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix
index dc23cff7e934..aa2b46e3ecd1 100644
--- a/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix
+++ b/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix
@@ -3,25 +3,13 @@
   bashNonInteractive,
   buildPackages,
   mkAppleDerivation,
-  pkgs,
+  sourceRelease,
   unifdef,
 }:
 
 let
   inherit (buildPackages) gnused python3;
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  xnu = bootstrapSourceRelease "xnu";
+  xnu = sourceRelease "xnu";
 in
 mkAppleDerivation (finalAttrs: {
   releaseName = "AvailabilityVersions";
@@ -35,18 +23,6 @@ mkAppleDerivation (finalAttrs: {
   buildInputs = [ bashNonInteractive ];
   nativeBuildInputs = [ unifdef ];
 
-  buildPhase = ''
-    runHook preBuild
-
-    declare -a unifdef_sources=(
-      os_availability.modulemap
-      os_availability_private.modulemap
-    )
-    unifdef -x2 -UBUILD_FOR_DRIVERKIT -m $(for x in "''${unifdef_sources[@]}"; do echo templates/$x; done)
-
-    runHook postBuild
-  '';
-
   installPhase = ''
     runHook preInstall
 
@@ -113,7 +89,6 @@ mkAppleDerivation (finalAttrs: {
       done
     fi
 
-    cp "$out/share/availability/templates/os_availability.modulemap" "\$dest/include/"
     SCRIPT
     chmod a+x "$out/bin/gen-headers"
 
diff --git a/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch b/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch
index d1d4673e2d72..30250b39e136 100644
--- a/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch
+++ b/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch
@@ -1,19 +1,19 @@
-From dd3a2378cca465ec783fd792158b2fc11f83722c Mon Sep 17 00:00:00 2001
+From 27627399e0792608bf5249d79c6490e8c77864e1 Mon Sep 17 00:00:00 2001
 From: Randy Eckenrode <randy@largeandhighquality.com>
-Date: Tue, 2 Jul 2024 20:04:56 -0400
-Subject: [PATCH] Support setting an upper bound on versions
+Date: Thu, 9 Apr 2026 21:12:36 -0400
+Subject: [PATCH] Support-setting-an-upper-bound-on-versions
 
 ---
- availability | 94 ++++++++++++++++++++++++++++++++++------------------
- 1 file changed, 61 insertions(+), 33 deletions(-)
+ availability | 103 ++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 65 insertions(+), 38 deletions(-)
 
 diff --git a/availability b/availability
-index 8ebd250..5bb9edb 100755
+index 1abd711..bbe9a77 100755
 --- a/availability
 +++ b/availability
-@@ -17,12 +17,34 @@ MIN_PYTHON = (3, 7) #Required for ordered dictionaries as default
- if sys.version_info < MIN_PYTHON:
-     sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON)
+@@ -20,12 +20,34 @@ if sys.version_info < MIN_PYTHON:
+ 
+ avVersion = "Local"
  
 +
 +def parse_version(ver):
@@ -47,12 +47,16 @@ index 8ebd250..5bb9edb 100755
      def sets(self):             return self.parsedDSL.version_sets
      def platforms(self):        return self.parsedDSL.platforms
  
-@@ -104,12 +126,15 @@ class VersionSetDSL:
+@@ -111,16 +133,18 @@ class VersionSetDSL:
                  self.availability_deprecation_define_name = optionals["availability_deprecation_define_name"]
              if "version_define_name" in optionals:
                  self.availability_define_prefix = f"__{optionals['version_define_name']}_"
--        def add_version(self, version): return self.versions.append(version);
+-        def add_version(self, version):
 +        def add_version(self, version, threshold):
+             if (len(self.versions) > 0) and (self.versions[-1] > version):
+                 print(f"Out of order version {version} for platform {self.name}")
+                 exit(-1)
+-            self.versions.append(version)
 +            if version_older_or_equal(version, threshold):
 +                self.versions.append(version)
          def add_variant(self, variant): return self.variants.append(variant);
@@ -65,25 +69,35 @@ index 8ebd250..5bb9edb 100755
              for line in data.splitlines():
                  line = line.strip().split('#',1)[0]
                  if not line:
-@@ -129,7 +154,7 @@ class VersionSetDSL:
+@@ -140,7 +164,7 @@ class VersionSetDSL:
          def set(self, name, version, uversion):
              platforms = {}
              for (platformName, platform) in self.platforms.items():
 -                if platform.versioned:
 +                if platform.versioned and platform.versions:
-                     platforms[platformName] = platform.versions[-1]
-             version_set                 = {}
-             version_set["name"]         = name
-@@ -138,7 +163,7 @@ class VersionSetDSL:
-             self.version_sets.append(version_set)
-             # TODO add error checking for version decrease
-         def version(self, platform, version):
--            if platform in self.platforms: self.platforms[platform].add_version(VersionSetDSL.Version(version))
-+            if platform in self.platforms: self.platforms[platform].add_version(VersionSetDSL.Version(version), self.threshold)
+                     if platform.midVersionAlias:
+                         platforms[platformName] = platform.versions[-2]
+                     else:
+@@ -159,13 +183,13 @@ class VersionSetDSL:
+                     self.platforms[platform].midVersionAlias = True
+                     aliasVersion = VersionSetDSL.Version(optionals["alias_version"])
+                     if aliasVersion > version:
+-                        self.platforms[platform].add_version(version)
+-                        self.platforms[platform].add_version(aliasVersion)
++                        self.platforms[platform].add_version(version, self.threshold)
++                        self.platforms[platform].add_version(aliasVersion, self.threshold)
+                     else:
+-                        self.platforms[platform].add_version(aliasVersion)
+-                        self.platforms[platform].add_version(version)
++                        self.platforms[platform].add_version(aliasVersion, self.threshold)
++                        self.platforms[platform].add_version(version, self.threshold)
+                 else:
+-                    self.platforms[platform].add_version(version)
++                    self.platforms[platform].add_version(version, self.threshold)
              else:
                  print(f"Unknown platform \"{platform}\"")
                  exit(-1)
-@@ -165,9 +190,8 @@ if not dslContent:
+@@ -192,9 +216,8 @@ if not dslContent:
              parts = line.split()
              if uversion and parts and parts[0] == "set" and parts[3] == uversion:
                  break
@@ -94,7 +108,7 @@ index 8ebd250..5bb9edb 100755
      print("---")
      for set in versions.sets():
          print(f'{set["name"]}:')
-@@ -178,7 +202,8 @@ def print_versions(platform):
+@@ -205,7 +228,8 @@ def print_versions(platform):
      print(" ".join([version.string() for version in versions.platforms()[platform].versions]))
  
  class Preprocessor:
@@ -104,7 +118,7 @@ index 8ebd250..5bb9edb 100755
          bufferedOutput = ""
          with tempfile.NamedTemporaryFile('w') as tmp:
              with open(inputFile, 'r') as input:
-@@ -207,10 +232,10 @@ class Preprocessor:
+@@ -234,10 +258,10 @@ class Preprocessor:
          output.write("\"\"\"\n")
      def VERSION_MAP(self, output):
          sets = []
@@ -117,7 +131,7 @@ index 8ebd250..5bb9edb 100755
          output.write("""
  #include <set>
  #include <array>
-@@ -229,16 +254,16 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+@@ -256,16 +280,16 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
  }};
  """.format(platform_string, len(sets), ",\n".join(sets)))
      def DYLD_HEADER_VERSIONS(self, output):
@@ -137,7 +151,7 @@ index 8ebd250..5bb9edb 100755
              for version in platform.versions:
                  output.write("#define dyld_platform_version_{}_{}".format(platform.stylized_name, version.symbol()).ljust(56, ' '))
                  output.write("({{ (dyld_build_version_t){{{}, {}{}}}; }})\n".format(platform.platform_define, platform.dyld_version_define_name, version.symbol()))
-@@ -247,14 +272,14 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+@@ -274,14 +298,14 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
      def ALIAS_VERSION_MACROS(self, output, platformString, newName, oldName, **optionals):
          minVersion =  literal_eval(optionals.get("minVersion", "0x00000000"))
          maxVersion =  literal_eval(optionals.get("maxVersion", "0xFFFFFFFF"))
@@ -155,7 +169,7 @@ index 8ebd250..5bb9edb 100755
              if platform.bleached:
                  output.write(f"#ifndef __APPLE_BLEACH_SDK__\n")
              output.write(f"#ifndef __API_TO_BE_DEPRECATED_{platform.availability_deprecation_define_name}\n")
-@@ -268,16 +293,16 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+@@ -295,16 +319,16 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
                  output.write(f"#endif /* __APPLE_BLEACH_SDK__ */\n")
              output.write(f"\n");
      def AVAILABILITY_VERSION_DEFINES(self, output):
@@ -178,7 +192,7 @@ index 8ebd250..5bb9edb 100755
                  continue
              if platform.bleached:
                  output.write(f"#ifndef __APPLE_BLEACH_SDK__\n")
-@@ -310,8 +335,8 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+@@ -340,8 +364,8 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
              output.write(f"   #define __API_UNAVAILABLE_PLATFORM_{displayName} {realName},unavailable\n")
          output.write(f"#if defined(__has_feature) && defined(__has_attribute)\n")
          output.write(f" #if __has_attribute(availability)\n")
@@ -189,7 +203,7 @@ index 8ebd250..5bb9edb 100755
              if platform.bleached:
                  output.write(f"#ifndef __APPLE_BLEACH_SDK__\n")
              writeDefines(platformString, platformString, platform.versioned)
-@@ -327,9 +352,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+@@ -357,9 +381,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
          output.write(f"#endif /* defined(__has_feature) && defined(__has_attribute) */\n")
      def AVAILABILITY_MACRO_IMPL(self, output, prefix, dispatcher, **optionals):
          av_version_hash = zlib.adler32(avVersion.encode()) # This does not need to cryptographically secure as it is meant to detect accidental failures
@@ -202,7 +216,7 @@ index 8ebd250..5bb9edb 100755
              count = count + len(platform.variants)
          platformList    = []
          argList         = []
-@@ -344,9 +369,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+@@ -376,9 +400,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
          scoped_availablity = False
          if "scoped_availablity" in optionals and optionals["scoped_availablity"] == "TRUE":
              scoped_availablity=True
@@ -215,8 +229,8 @@ index 8ebd250..5bb9edb 100755
              count = count + len(platform.variants)
          argList = ','.join([f'{macroName}{x}' for x in reversed(range(0, count))])
          if "argCount" in optionals:
-@@ -358,8 +383,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
-             output.write(f"    #define {name}(...) {macroName}_GET_MACRO(__VA_ARGS__,{argList},0)(__VA_ARGS__)\n")
+@@ -400,8 +424,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+         output.write(f"#endif /* __AVAILABILITY_VERSIONS_VERSION_HASH */\n")
  
  parser = argparse.ArgumentParser()
 +parser.add_argument("--threshold",                          default=False,                      help='Specifies the maximum version (inclusive) included in pre-processed headers')
@@ -226,9 +240,9 @@ index 8ebd250..5bb9edb 100755
      group.add_argument("--{}".format(name), default=False, action='store_true', help="Prints all SDK versions defined for {}".format(name))
      for alias in platform.cmd_aliases:
          group.add_argument("--{}".format(alias), dest=name, default=False, action='store_true', help="Alias for --{}".format(name))
-@@ -367,8 +393,10 @@ group.add_argument("--sets",                                default=False, actio
- group.add_argument("--preprocess",                          nargs=2,                            help=argparse.SUPPRESS)
- args = parser.parse_args()
+@@ -414,8 +439,10 @@ if args.av_version:
+     avVersion = args.av_version
+ 
  
 -if args.sets:                                   print_sets();
 -elif args.preprocess:                           Preprocessor(args.preprocess[0], args.preprocess[1]);
@@ -240,4 +254,5 @@ index 8ebd250..5bb9edb 100755
      for platform in versions.platforms().keys():
          if getattr(args, platform, None):
 -- 
-2.45.2
+2.51.2
+
diff --git a/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix b/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix
index 17b4b9f62118..ea9c4ec12273 100644
--- a/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix
@@ -5,27 +5,15 @@
   flex,
   meson,
   mkAppleDerivation,
-  pkgs,
+  sourceRelease,
   replaceVars,
   stdenv,
   stdenvNoCC,
 }:
 
 let
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  Libc = bootstrapSourceRelease "Libc";
-  xnu = bootstrapSourceRelease "xnu";
+  Libc = sourceRelease "Libc";
+  xnu = sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "adv_cmds-deps-private-headers";
diff --git a/pkgs/os-specific/darwin/by-name/de/developer_cmds/package.nix b/pkgs/os-specific/darwin/by-name/de/developer_cmds/package.nix
index 4de6fb9938e6..fd30aa3436b4 100644
--- a/pkgs/os-specific/darwin/by-name/de/developer_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/de/developer_cmds/package.nix
@@ -14,7 +14,7 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-NurkF9AnPuaQ7Ev36PCknuTNV6z622yFi2bXZsow+xA=";
+  xcodeHash = "sha256-25SDn9+SzEZJPQQJaDxsxWKeUetNHhzliLfzD9BtyyI=";
 
   postPatch = ''
     substituteInPlace rpcgen/rpc_main.c \
diff --git a/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix b/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix
index 462bfcce9706..a9e5571a8954 100644
--- a/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix
@@ -3,30 +3,20 @@
   libutil,
   mkAppleDerivation,
   removefile,
-  pkgs,
+  sourceRelease,
   stdenvNoCC,
 }:
 
 let
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  Libc = bootstrapSourceRelease "Libc";
-  xnu = bootstrapSourceRelease "xnu";
+  Libc = sourceRelease "Libc";
+  xnu = sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "diskdev_cmds-deps-private-headers";
 
     buildCommand = ''
+      install -D -t "$out/include" \
+        '${Libc}/include/_bounds.h'
       for dir in arm i386 machine sys; do
         install -D -t "$out/include/$dir" '${xnu}'"/bsd/$dir/disklabel.h"
       done
@@ -58,7 +48,7 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-P2dg3B5pU2ayasMHIM5nI0iG+YDdYQNcEpnJzZxm1kw=";
+  xcodeHash = "sha256-qyQM+48PKKWUmdoBprpDf4DXIVAtd3EKCU+ZD/EhNXQ=";
 
   postPatch =
     # Fix incompatible pointer to integer conversion. The last parameter is size_t not a pointer.
diff --git a/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix b/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix
index 614f670b10f9..48cc8aca13cf 100644
--- a/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix
@@ -3,25 +3,13 @@
   mkAppleDerivation,
   pkg-config,
   shell_cmds,
-  pkgs,
+  sourceRelease,
   stdenvNoCC,
   zlib,
 }:
 
 let
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  bootstrapSourceRelease = f pkgs pkgs;
-  xnu = bootstrapSourceRelease "xnu";
+  xnu = sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "doc_cmds-deps-private-headers";
diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/meson.build.in b/pkgs/os-specific/darwin/by-name/dy/dyld/meson.build.in
index b3c095cc5499..5bbef54de647 100644
--- a/pkgs/os-specific/darwin/by-name/dy/dyld/meson.build.in
+++ b/pkgs/os-specific/darwin/by-name/dy/dyld/meson.build.in
@@ -71,7 +71,6 @@ lsl = static_library(
     ],
     include_directories : [
         common_inc,
-        'cache-builder',
         'cache_builder',
         'libdyld',
         'lsl',
@@ -174,7 +173,6 @@ libminidyld = static_library(
     dependencies : [ corecrypto_dep, lsl_dep ],
     include_directories : [
         common_inc,
-        'cache-builder',
         'cache_builder',
         'libdyld',
         'libdyld_introspection',
@@ -197,8 +195,8 @@ libdsc_extractor = shared_library(
     ],
     include_directories : [
         common_inc,
-        'cache-builder',
         'cache_builder',
+        'other-tools',
     ],
     install : true,
     link_args : [ '-Wl,-exported_symbol,_dyld_shared_cache_extract_dylibs_progress' ],
@@ -239,14 +237,13 @@ executable(
     ],
     include_directories : [
         common_inc,
-        'cache-builder',
         'cache_builder',
+        'other-tools',
     ],
     install : true,
     link_args : [ '-Wl,-weak-lLTO' ],
     link_with : [ libminidyld ],
     sources : [
-        'cache-builder/FileUtils.cpp',
         'common/Diagnostics.cpp',
         'common/DyldSharedCache.cpp',
         'common/MachOAnalyzer.cpp',
@@ -255,6 +252,7 @@ executable(
         'common/SwiftVisitor.cpp',
         'common/TargetPolicy.cpp',
         'other-tools/dyld_info.cpp',
+        'other-tools/FileUtils.cpp',
         'other-tools/MiscFileUtils.cpp',
         'other-tools/SymbolicatedImage.cpp',
     ],
diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix b/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix
index eda8c5d8df5a..a92bdb13e3ad 100644
--- a/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix
+++ b/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix
@@ -8,7 +8,7 @@
   openssl,
   pkg-config,
   pkgsBuildHost,
-  pkgs,
+  sourceRelease,
   stdenvNoCC,
 }:
 
@@ -20,28 +20,19 @@ let
     hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk=";
   };
 
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  launchd = bootstrapSourceRelease "launchd";
-  Libc = bootstrapSourceRelease "Libc";
-  libplatform = bootstrapSourceRelease "libplatform";
-  libpthread = bootstrapSourceRelease "libpthread";
-  xnu = bootstrapSourceRelease "xnu";
+  launchd = sourceRelease "launchd";
+  Libc = sourceRelease "Libc";
+  libplatform = sourceRelease "libplatform";
+  libpthread = sourceRelease "libpthread";
+  xnu = sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "dyld-deps-private-headers";
 
     buildCommand = ''
+      install -D -t "$out/include" \
+        '${Libc}/include/_bounds.h'
+
       mkdir -p "$out/include/System"
       for dir in arm i386 machine; do
         mkdir -p "$out/include/$dir"
@@ -57,11 +48,11 @@ let
         '${Libc}/stdlib/FreeBSD/atexit.h'
 
       install -D -m644 -t "$out/include/System/sys" \
-        '${xnu}/bsd/sys/csr.h'
-      substitute '${xnu}/bsd/sys/fsgetpath.h' "$out/include/System/sys/fsgetpath.h" \
-        --replace-fail '#ifdef __APPLE_API_PRIVATE' '#if 1'
+        '${xnu}/bsd/sys/csr.h' \
+        '${xnu}/bsd/sys/fsgetpath.h'
 
       install -D -m644 -t "$out/include" \
+        '${Libc}/include/_bounds.h' \
         '${libplatform}/private/_simple.h' \
         '${Libc}/darwin/libc_private.h' \
         '${Libc}/darwin/subsystem.h' \
@@ -88,6 +79,10 @@ let
       substituteInPlace "$out/include/os/lock_private.h" \
         --replace-fail ', bridgeos(4.0)' ""
 
+      install -D -m644 -t "$out/include/sys" \
+        '${xnu}/bsd/sys/kern_memorystatus.h' \
+        '${xnu}/bsd/sys/reason.h'
+
       # This file is part of ld-prime, which is unhelpfully not included in the dyld source release.
       # Fortunately, nothing in it is actually needed to build `dyld_info` and `dsc_extractor`.
       touch "$out/include/File.h"
@@ -105,24 +100,24 @@ mkAppleDerivation {
 
   propagatedBuildOutputs = [ ];
 
-  xcodeHash = "sha256-4yOJouk9AjEt7W3+0cQRMUDDqBhU+J9c16ZQSzUF5go=";
+  xcodeHash = "sha256-F/V1XzBP1qEDpUDTz+jyp5dbcfqdQp8s9NW2OBoU5x0=";
 
   patches = [
     # Disable use of private kdebug API
     ./patches/0001-Disable-kdebug-trace.patch
     # dyld_info tries to weakly link against libLTO using this macro.
-    ./patches/0003-Add-weaklinking_h.patch
+    ./patches/0002-Add-weaklinking_h.patch
     # The LLVMOpInfoCallback args comment out one of the args. Fix that for compatibility with nixpkgs LLVM.
-    ./patches/0004-Fix-llvm-op-info-callback-args.patch
+    ./patches/0003-Fix-llvm-op-info-callback-args.patch
     # Some private headers depend on corecrypto, which we can’t use.
     # Use the headers from the ld64 port, which delegates to OpenSSL.
-    ./patches/0005-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
+    ./patches/0004-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
     # `dsc_extractor` builds a dylib, but it includes a program that can perform cache extraction.
     # This extracts just the driver into a file to make building the actual program easier.
-    ./patches/0006-Add-dsc_extractor_bin_cpp.patch
+    ./patches/0005-Add-dsc_extractor_bin_cpp.patch
     # Fix missing symbol for `mach_o::ChainedFixups::PointerFormat::writeChainEntry`,
     # which isn’t actually needed by `dyld_info` or `dsc_extractor`.
-    ./patches/0007-Fix-missing-writeChainEntry.patch
+    ./patches/0006-Fix-missing-writeChainEntry.patch
   ];
 
   postPatch = ''
@@ -185,5 +180,10 @@ mkAppleDerivation {
 
   dontUseCmakeConfigure = true;
 
+  postInstall = ''
+    install_name_tool "''${!outputBin}/bin/dsc_extractor" \
+      -change @rpath/dsc_extractor.bundle "''${!outputLib}/lib/dsc_extractor.bundle"
+  '';
+
   meta.description = "Dyld-related commands for Darwin";
 }
diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0001-Disable-kdebug-trace.patch b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0001-Disable-kdebug-trace.patch
index ea142ef7f619..8894d221c328 100644
--- a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0001-Disable-kdebug-trace.patch
+++ b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0001-Disable-kdebug-trace.patch
@@ -1,5 +1,14 @@
+From b37141e26eb2f3c5c383d7c29e8a7a7362f822ae Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 10 Apr 2026 19:45:22 -0400
+Subject: [PATCH] Disable-kdebug-trace
+
+---
+ dyld/Tracing.h | 79 ++++++++++++--------------------------------------
+ 1 file changed, 19 insertions(+), 60 deletions(-)
+
 diff --git a/dyld/Tracing.h b/dyld/Tracing.h
-index 1e6e3027d9..bac62cf72d 100644
+index 9536f0b..aa8d373 100644
 --- a/dyld/Tracing.h
 +++ b/dyld/Tracing.h
 @@ -31,29 +31,25 @@
@@ -51,7 +60,7 @@ index 1e6e3027d9..bac62cf72d 100644
  
  #include "Defines.h"
  
-@@ -111,24 +107,10 @@
+@@ -118,24 +114,10 @@ struct VIS_HIDDEN kt_arg {
      uint64_t value() const { return _value; }
  private:
      void prepare(uint32_t code) {
@@ -76,7 +85,7 @@ index 1e6e3027d9..bac62cf72d 100644
      uint64_t _value;
      const char* _str;
  };
-@@ -168,29 +150,6 @@
+@@ -175,29 +157,6 @@ private:
      uint64_t current_trace_id = 0;
  };
  
@@ -106,3 +115,6 @@ index 1e6e3027d9..bac62cf72d 100644
  VIS_HIDDEN
  void syntheticBacktrace(const char *reason, bool enableExternally=false);
  
+-- 
+2.51.2
+
diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0003-Add-weaklinking_h.patch b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0002-Add-weaklinking_h.patch
similarity index 79%
rename from pkgs/os-specific/darwin/by-name/dy/dyld/patches/0003-Add-weaklinking_h.patch
rename to pkgs/os-specific/darwin/by-name/dy/dyld/patches/0002-Add-weaklinking_h.patch
index c2f2f1431180..6eac5953e62b 100644
--- a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0003-Add-weaklinking_h.patch
+++ b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0002-Add-weaklinking_h.patch
@@ -1,9 +1,19 @@
+From aa4ca805f1f13619056c4caf14eb863e0a37a51f Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 10 Apr 2026 19:45:22 -0400
+Subject: [PATCH] Add-weaklinking_h
+
+---
+ include/SoftLinking/WeakLinking.h | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+ create mode 100644 include/SoftLinking/WeakLinking.h
+
 diff --git a/include/SoftLinking/WeakLinking.h b/include/SoftLinking/WeakLinking.h
 new file mode 100644
-index 0000000000..82755e2a43
+index 0000000..99ef8c8
 --- /dev/null
 +++ b/include/SoftLinking/WeakLinking.h
-@@ -1,0 +1,28 @@
+@@ -0,0 +1,28 @@
 +/*
 + * Copyright (C) 2017 Apple Inc. All rights reserved.
 + *
@@ -32,3 +42,6 @@ index 0000000000..82755e2a43
 +#pragma once
 +
 +#define WEAK_LINK_FORCE_IMPORT(sym) extern __attribute__((weak_import)) __typeof__(sym) sym
+-- 
+2.51.2
+
diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0003-Fix-llvm-op-info-callback-args.patch
similarity index 52%
rename from pkgs/os-specific/darwin/by-name/dy/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch
rename to pkgs/os-specific/darwin/by-name/dy/dyld/patches/0003-Fix-llvm-op-info-callback-args.patch
index ea18669b09f1..fa61eabf8df2 100644
--- a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch
+++ b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0003-Fix-llvm-op-info-callback-args.patch
@@ -1,8 +1,17 @@
-diff --git a/other-tools/dyld_info.cpp b/other-tools/dyld_info.cpp
-index 2de4978ba5..2ce27257d9 100644
+From 9a7a6f039550539033e0f32929f4fb76f11f5afe Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 10 Apr 2026 19:45:22 -0400
+Subject: [PATCH] Fix-llvm-op-info-callback-args
+
+---
+ other-tools/SymbolicatedImage.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/other-tools/SymbolicatedImage.cpp b/other-tools/SymbolicatedImage.cpp
+index 47f1bdb..efacc94 100644
 --- a/other-tools/SymbolicatedImage.cpp
 +++ b/other-tools/SymbolicatedImage.cpp
-@@ -991,7 +991,7 @@
+@@ -968,7 +968,7 @@ static const char* printDumpSymbolCallback(void* di, uint64_t referenceValue, ui
      return ((SymbolicatedImage*)di)->lookupSymbol(referencePC, referenceValue, *referenceType, *referenceName);
  }
  
@@ -11,3 +20,6 @@ index 2de4978ba5..2ce27257d9 100644
                                     int tagType, void* tagBuf)
  {
      return ((SymbolicatedImage*)di)->opInfo(pc, offset, opSize, tagType, tagBuf);
+-- 
+2.51.2
+
diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0005-Add-OpenSSL-based-CoreCrypto-digest-functions.patch b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0004-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
similarity index 77%
rename from pkgs/os-specific/darwin/by-name/dy/dyld/patches/0005-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
rename to pkgs/os-specific/darwin/by-name/dy/dyld/patches/0004-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
index ad22de58b425..54a706a34257 100644
--- a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0005-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
+++ b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0004-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
@@ -1,21 +1,21 @@
-From 36767c7345161baf0ab125f95c8557f8e24f25db Mon Sep 17 00:00:00 2001
+From ee93858987e98c984e293cc2455adc698aeb600f Mon Sep 17 00:00:00 2001
 From: Randy Eckenrode <randy@largeandhighquality.com>
-Date: Tue, 9 Apr 2024 19:28:17 -0400
-Subject: [PATCH 7/8] Add OpenSSL-based CoreCrypto digest functions
+Date: Fri, 10 Apr 2026 19:45:22 -0400
+Subject: [PATCH] Add-OpenSSL-based-CoreCrypto-digest-functions
 
 ---
- compat/CommonCrypto/CommonDigest.h    |  6 +++
- compat/CommonCrypto/CommonDigestSPI.c | 21 +++++++++++
- compat/CommonCrypto/CommonDigestSPI.h | 14 +++++++
+ compat/CommonCrypto/CommonDigest.h    |  5 +++
+ compat/CommonCrypto/CommonDigestSPI.c | 21 ++++++++++
+ compat/CommonCrypto/CommonDigestSPI.h | 16 ++++++++
  compat/corecrypto/api_defines.h       | 10 +++++
- compat/corecrypto/ccdigest.c          | 53 +++++++++++++++++++++++++++
- compat/corecrypto/ccdigest.h          | 27 ++++++++++++++
- compat/corecrypto/ccdigest_private.h  | 19 ++++++++++
- compat/corecrypto/ccsha1.c            | 22 +++++++++++
- compat/corecrypto/ccsha1.h            |  9 +++++
- compat/corecrypto/ccsha2.c            | 22 +++++++++++
- compat/corecrypto/ccsha2.h            |  9 +++++
- 11 files changed, 212 insertions(+)
+ compat/corecrypto/ccdigest.c          | 59 +++++++++++++++++++++++++++
+ compat/corecrypto/ccdigest.h          | 28 +++++++++++++
+ compat/corecrypto/ccdigest_private.h  | 19 +++++++++
+ compat/corecrypto/ccsha1.c            | 22 ++++++++++
+ compat/corecrypto/ccsha1.h            |  9 ++++
+ compat/corecrypto/ccsha2.c            | 31 ++++++++++++++
+ compat/corecrypto/ccsha2.h            | 13 ++++++
+ 11 files changed, 233 insertions(+)
  create mode 100644 compat/CommonCrypto/CommonDigest.h
  create mode 100644 compat/CommonCrypto/CommonDigestSPI.c
  create mode 100644 compat/CommonCrypto/CommonDigestSPI.h
@@ -30,7 +30,7 @@ Subject: [PATCH 7/8] Add OpenSSL-based CoreCrypto digest functions
 
 diff --git a/compat/CommonCrypto/CommonDigest.h b/compat/CommonCrypto/CommonDigest.h
 new file mode 100644
-index 0000000..a60eba7
+index 0000000..531bb05
 --- /dev/null
 +++ b/compat/CommonCrypto/CommonDigest.h
 @@ -0,0 +1,5 @@
@@ -68,7 +68,7 @@ index 0000000..41269fc
 +}
 diff --git a/compat/CommonCrypto/CommonDigestSPI.h b/compat/CommonCrypto/CommonDigestSPI.h
 new file mode 100644
-index 0000000..172742a
+index 0000000..d6cca93
 --- /dev/null
 +++ b/compat/CommonCrypto/CommonDigestSPI.h
 @@ -0,0 +1,16 @@
@@ -106,10 +106,10 @@ index 0000000..13d1e7a
 +#endif
 diff --git a/compat/corecrypto/ccdigest.c b/compat/corecrypto/ccdigest.c
 new file mode 100644
-index 0000000..e29dcb8
+index 0000000..81fb8a5
 --- /dev/null
 +++ b/compat/corecrypto/ccdigest.c
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,59 @@
 +// SPDX-License-Identifier: APSL-2.0
 +// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
 +
@@ -135,6 +135,12 @@ index 0000000..e29dcb8
 +    return di;
 +}
 +
++void ccdigest_di_clear(const struct ccdigest_info* di, struct ccdigest_context* ctx)
++{
++    EVP_MD_CTX_free(ctx->context);
++    ctx->context = EVP_MD_CTX_new();
++}
++
 +void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx)
 +{
 +    if (!EVP_DigestInit_ex2(ctx->context, di->provider, NULL)) {
@@ -165,10 +171,10 @@ index 0000000..e29dcb8
 +}
 diff --git a/compat/corecrypto/ccdigest.h b/compat/corecrypto/ccdigest.h
 new file mode 100644
-index 0000000..9af2394
+index 0000000..b204cd0
 --- /dev/null
 +++ b/compat/corecrypto/ccdigest.h
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,28 @@
 +// SPDX-License-Identifier: APSL-2.0
 +// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
 +
@@ -188,6 +194,7 @@ index 0000000..9af2394
 +#define ccdigest_di_decl(_di, ctxvar) \
 +    struct ccdigest_context* (ctxvar) = _ccdigest_context_new()
 +
++EXTERN_C void ccdigest_di_clear(const struct ccdigest_info* _di, struct ccdigest_context* ctx);
 +EXTERN_C void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx);
 +EXTERN_C void ccdigest_update(
 +    const struct ccdigest_info* _di,
@@ -266,10 +273,10 @@ index 0000000..8e3f85f
 +EXTERN_C const struct ccdigest_info* ccsha1_di(void);
 diff --git a/compat/corecrypto/ccsha2.c b/compat/corecrypto/ccsha2.c
 new file mode 100644
-index 0000000..6504503
+index 0000000..ed4de54
 --- /dev/null
 +++ b/compat/corecrypto/ccsha2.c
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,31 @@
 +// SPDX-License-Identifier: APSL-2.0
 +// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
 +
@@ -292,59 +299,6 @@ index 0000000..6504503
 +    }
 +    return di;
 +}
-diff --git a/compat/corecrypto/ccsha2.h b/compat/corecrypto/ccsha2.h
-new file mode 100644
-index 0000000..9f30e03
---- /dev/null
-+++ b/compat/corecrypto/ccsha2.h
-@@ -0,0 +1,10 @@
-+// SPDX-License-Identifier: APSL-2.0
-+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
-+
-+#pragma once
-+
-+#include <corecrypto/ccdigest.h>
-+
-+#define CCSHA256_OUTPUT_SIZE 32
-+
-+EXTERN_C const struct ccdigest_info* ccsha256_di(void);
--diff --git a/compat/corecrypto/ccdigest.c b/compat/corecrypto/ccdigest.c
-index e29dcb8..3949861 100644
---- a/compat/corecrypto/ccdigest.c
-+++ b/compat/corecrypto/ccdigest.c
-@@ -23,6 +23,12 @@ struct ccdigest_info* _ccdigest_newprovider(const char* name)
-     return di;
- }
- 
-+void ccdigest_di_clear(const struct ccdigest_info* di, struct ccdigest_context* ctx)
-+{
-+    EVP_MD_CTX_free(ctx->context);
-+    ctx->context = EVP_MD_CTX_new();
-+}
-+
- void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx)
- {
-     if (!EVP_DigestInit_ex2(ctx->context, di->provider, NULL)) {
-diff --git a/compat/corecrypto/ccdigest.h b/compat/corecrypto/ccdigest.h
-index 9af2394..d693fb7 100644
---- a/compat/corecrypto/ccdigest.h
-+++ b/compat/corecrypto/ccdigest.h
-@@ -17,6 +17,7 @@ EXTERN_C struct ccdigest_context* _ccdigest_context_new(void);
- #define ccdigest_di_decl(_di, ctxvar) \
-     struct ccdigest_context* (ctxvar) = _ccdigest_context_new()
- 
-+EXTERN_C void ccdigest_di_clear(const struct ccdigest_info* _di, struct ccdigest_context* ctx);
- EXTERN_C void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx);
- EXTERN_C void ccdigest_update(
-     const struct ccdigest_info* _di,
-diff --git a/compat/corecrypto/ccsha2.c b/compat/corecrypto/ccsha2.c
-index 6504503..ed4de54 100644
---- a/compat/corecrypto/ccsha2.c
-+++ b/compat/corecrypto/ccsha2.c
-@@ -20,3 +20,12 @@ const struct ccdigest_info* ccsha256_di(void)
-     }
-     return di;
- }
 +
 +const struct ccdigest_info* ccsha384_di(void)
 +{
@@ -355,16 +309,24 @@ index 6504503..ed4de54 100644
 +    return di;
 +}
 diff --git a/compat/corecrypto/ccsha2.h b/compat/corecrypto/ccsha2.h
-index 9f30e03..bee18e8 100644
---- a/compat/corecrypto/ccsha2.h
+new file mode 100644
+index 0000000..7c0c8de
+--- /dev/null
 +++ b/compat/corecrypto/ccsha2.h
-@@ -5,6 +5,9 @@
- 
- #include <corecrypto/ccdigest.h>
- 
- #define CCSHA256_OUTPUT_SIZE 32
+@@ -0,0 +1,13 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include <corecrypto/ccdigest.h>
++
++#define CCSHA256_OUTPUT_SIZE 32
 +#define CCSHA384_OUTPUT_SIZE 48
 +#define CS_SHA384_LEN CCSHA384_OUTPUT_SIZE
- 
- EXTERN_C const struct ccdigest_info* ccsha256_di(void);
++
++EXTERN_C const struct ccdigest_info* ccsha256_di(void);
 +EXTERN_C const struct ccdigest_info* ccsha384_di(void);
+-- 
+2.51.2
+
diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0006-Add-dsc_extractor_bin_cpp.patch b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0005-Add-dsc_extractor_bin_cpp.patch
similarity index 76%
rename from pkgs/os-specific/darwin/by-name/dy/dyld/patches/0006-Add-dsc_extractor_bin_cpp.patch
rename to pkgs/os-specific/darwin/by-name/dy/dyld/patches/0005-Add-dsc_extractor_bin_cpp.patch
index 2d234e65a37a..7787b126b727 100644
--- a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0006-Add-dsc_extractor_bin_cpp.patch
+++ b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0005-Add-dsc_extractor_bin_cpp.patch
@@ -1,6 +1,16 @@
+From 720926afdec1b026d22b7525ea5a40b35a2c6475 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 10 Apr 2026 19:45:23 -0400
+Subject: [PATCH] Add-dsc_extractor_bin_cpp
+
+---
+ other-tools/dsc_extractor_bin.cpp | 33 +++++++++++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+ create mode 100644 other-tools/dsc_extractor_bin.cpp
+
 diff --git a/other-tools/dsc_extractor_bin.cpp b/other-tools/dsc_extractor_bin.cpp
 new file mode 100644
-index 0000000000..2f26fbe4db
+index 0000000..5a8f3f8
 --- /dev/null
 +++ b/other-tools/dsc_extractor_bin.cpp
 @@ -0,0 +1,33 @@
@@ -37,3 +47,6 @@ index 0000000000..2f26fbe4db
 +    fprintf(stderr, "dyld_shared_cache_extract_dylibs_progress() => %d\n", result);
 +    return 0;
 +}
+-- 
+2.51.2
+
diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0007-Fix-missing-writeChainEntry.patch b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0006-Fix-missing-writeChainEntry.patch
similarity index 62%
rename from pkgs/os-specific/darwin/by-name/dy/dyld/patches/0007-Fix-missing-writeChainEntry.patch
rename to pkgs/os-specific/darwin/by-name/dy/dyld/patches/0006-Fix-missing-writeChainEntry.patch
index 5590f8f5861a..8b8caaad7c5e 100644
--- a/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0007-Fix-missing-writeChainEntry.patch
+++ b/pkgs/os-specific/darwin/by-name/dy/dyld/patches/0006-Fix-missing-writeChainEntry.patch
@@ -1,13 +1,25 @@
+From e56398bce025241fc8512ea594665a94dc81d539 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 10 Apr 2026 19:55:35 -0400
+Subject: [PATCH] Fix-missing-writeChainEntry
+
+---
+ mach_o/ChainedFixups.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/mach_o/ChainedFixups.h b/mach_o/ChainedFixups.h
-index 10ff8847e0..336f80dd81 100644
+index 2400420..1316d90 100644
 --- a/mach_o/ChainedFixups.h
 +++ b/mach_o/ChainedFixups.h
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,7 @@ public:
                                                               std::span<const uint64_t> segOffsetTable, uint32_t pageIndex, uint32_t pageSize,
                                                               void (^callback)(const Fixup& f, bool& stop)) const;
          virtual Fixup            parseChainEntry(const void* loc, const MappedSegment* seg, uint64_t preferedLoadAddress=0, std::span<const uint64_t> segOffsetTable={}) const = 0;
--        virtual void             writeChainEntry(const Fixup& fixup, const void* nextLoc, uint64_t preferedLoadAddress, std::span<const MappedSegment*>) const;
-+        virtual void             writeChainEntry(const Fixup& fixup, const void* nextLoc, uint64_t preferedLoadAddress, std::span<const MappedSegment*>) const = 0;
+-        virtual Error            writeChainEntry(const Fixup& fixup, const void* nextLoc, uint64_t preferedLoadAddress, std::span<const MappedSegment*>) const;
++        virtual Error            writeChainEntry(const Fixup& fixup, const void* nextLoc, uint64_t preferedLoadAddress, std::span<const MappedSegment*>) const = 0;
  
      protected:
          constexpr                PointerFormat() { }
+-- 
+2.51.2
+
diff --git a/pkgs/os-specific/darwin/by-name/fi/file_cmds/meson.build.in b/pkgs/os-specific/darwin/by-name/fi/file_cmds/meson.build.in
index 9919a3d90b3a..a990f4ca903f 100644
--- a/pkgs/os-specific/darwin/by-name/fi/file_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/by-name/fi/file_cmds/meson.build.in
@@ -20,6 +20,7 @@ bzip2 = dependency('bzip2')
 xz = dependency('liblzma')
 libmd = dependency('libmd')
 libxo = dependency('libxo')
+ncurses = dependency('ncurses')
 zlib = dependency('zlib')
 
 copyfile = cc.find_library('copyfile')
@@ -218,10 +219,11 @@ install_man(f'ln/symlink.7')
 executable(
     'ls',
     c_args : [
+        '-DCOLORLS',
         # https://github.com/apple-oss-distributions/xnu/blob/94d3b452840153a99b38a3a9659680b2a006908e/bsd/sys/stat.h#L520
         '-DSF_DATALESS=0x40000000',
     ],
-    dependencies : [ libutil ],
+    dependencies : [ libutil, ncurses ],
     install : true,
     sources: [
         'ls/cmp.c',
diff --git a/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix b/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix
index 08498f2786a0..ba754ddee3ee 100644
--- a/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  apple-sdk_26,
   bzip2,
   copyfile,
   less,
@@ -7,33 +8,22 @@
   libutil,
   libxo,
   mkAppleDerivation,
+  ncurses,
   pkg-config,
   removefile,
   shell_cmds,
-  pkgs,
+  sourceRelease,
   stdenvNoCC,
   xz,
   zlib,
 }:
 
 let
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  Libc = bootstrapSourceRelease "Libc";
-  Libinfo = bootstrapSourceRelease "Libinfo";
-  CommonCrypto = bootstrapSourceRelease "CommonCrypto";
-  libplatform = bootstrapSourceRelease "libplatform";
-  xnu = bootstrapSourceRelease "xnu";
+  Libc = sourceRelease "Libc";
+  Libinfo = sourceRelease "Libinfo";
+  CommonCrypto = sourceRelease "CommonCrypto";
+  libplatform = sourceRelease "libplatform";
+  xnu = sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "file_cmds-deps-private-headers";
@@ -103,13 +93,12 @@ mkAppleDerivation {
     "xattr"
   ];
 
-  xcodeHash = "sha256-KEZYuaDxLdprF+wGiszUdTXPQBfLNj0xP9Y0uarNjSs=";
+  xcodeHash = "sha256-O1eJGFrSVIZbZvBSonKkG4MeYZQ8W6izpYEcHIE+/DM=";
 
   patches = [
-    # Fixes build of ls
-    ./patches/0001-Add-missing-extern-unix2003_compat-to-ls.patch
-    # Add missing conditional to avoid using private APFS APIs that we lack headers for using.
-    ./patches/0002-Add-missing-ifdef-for-private-APFS-APIs.patch
+    # `O_RESOLVE_BENEATH` was added in macOS 26, but our default deployment target is older than that.
+    # Make its usage conditional.
+    ./patches/0001-Conditionalize-O_RESOLVE_BENEATH-usage.patch
   ];
 
   nativeBuildInputs = [ pkg-config ];
@@ -117,11 +106,13 @@ mkAppleDerivation {
   env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
 
   buildInputs = [
+    apple-sdk_26 # For `O_RESOLVE_BENEATH` and `AT_RESOLVE_BENEATH`
     bzip2
     copyfile
     libmd
     libutil
     libxo
+    ncurses
     removefile
     xz
     zlib
diff --git a/pkgs/os-specific/darwin/by-name/fi/file_cmds/patches/0001-Add-missing-extern-unix2003_compat-to-ls.patch b/pkgs/os-specific/darwin/by-name/fi/file_cmds/patches/0001-Add-missing-extern-unix2003_compat-to-ls.patch
deleted file mode 100644
index 45da78e34f9e..000000000000
--- a/pkgs/os-specific/darwin/by-name/fi/file_cmds/patches/0001-Add-missing-extern-unix2003_compat-to-ls.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9e2185bde1320273b6465d272e1a36bff29fb9d6 Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode <randy@largeandhighquality.com>
-Date: Sat, 7 Sep 2024 09:37:31 -0400
-Subject: [PATCH 1/3] Add missing extern unix2003_compat to ls
-
----
- ls/ls.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/ls/ls.h b/ls/ls.h
-index 2a41c8b..ff9c3a9 100644
---- a/ls/ls.h
-+++ b/ls/ls.h
-@@ -114,4 +114,9 @@ typedef struct {
- 	char data[1];
- } NAMES;
- 
-+#ifdef __APPLE__
-+#include <stdbool.h>
-+extern bool unix2003_compat;
-+#endif
-+
- #endif /* _LS_H_ */
--- 
-2.46.0
-
diff --git a/pkgs/os-specific/darwin/by-name/fi/file_cmds/patches/0001-Conditionalize-O_RESOLVE_BENEATH-usage.patch b/pkgs/os-specific/darwin/by-name/fi/file_cmds/patches/0001-Conditionalize-O_RESOLVE_BENEATH-usage.patch
new file mode 100644
index 000000000000..4121e10a19ee
--- /dev/null
+++ b/pkgs/os-specific/darwin/by-name/fi/file_cmds/patches/0001-Conditionalize-O_RESOLVE_BENEATH-usage.patch
@@ -0,0 +1,28 @@
+From dc8df286a20aedd8295b69798346b0d893e30773 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 10 Apr 2026 20:08:11 -0400
+Subject: [PATCH] Conditionalize-O_RESOLVE_BENEATH-usage
+
+---
+ cp/cp.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/cp/cp.c b/cp/cp.c
+index b1cac37..8ed535a 100644
+--- a/cp/cp.c
++++ b/cp/cp.c
+@@ -331,6 +331,11 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat)
+ 	mode_t mask, mode;
+ 	bool beneath = Rflag && type != FILE_TO_FILE;
+ 
++	/* `O_RESOLVE_BENEATH` is only supported on macOS 26 or newer */
++	if (!__builtin_available(macOS 26.0, *)) {
++		beneath = false;
++	}
++
+ 	/*
+ 	 * Keep an inverted copy of the umask, for use in correcting
+ 	 * permissions on created directories when not using -p.
+-- 
+2.51.2
+
diff --git a/pkgs/os-specific/darwin/by-name/fi/file_cmds/patches/0002-Add-missing-ifdef-for-private-APFS-APIs.patch b/pkgs/os-specific/darwin/by-name/fi/file_cmds/patches/0002-Add-missing-ifdef-for-private-APFS-APIs.patch
deleted file mode 100644
index d353afbe5636..000000000000
--- a/pkgs/os-specific/darwin/by-name/fi/file_cmds/patches/0002-Add-missing-ifdef-for-private-APFS-APIs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c40768a7a0cd4bcc75a408880e79135ad33292b5 Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode <randy@largeandhighquality.com>
-Date: Sat, 7 Sep 2024 09:44:20 -0400
-Subject: [PATCH 2/3] Add missing #ifdef for private APFS APIs
-
----
- mtree/commoncrypto.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/mtree/commoncrypto.c b/mtree/commoncrypto.c
-index 75790dd..e04d1c6 100644
---- a/mtree/commoncrypto.c
-+++ b/mtree/commoncrypto.c
-@@ -254,6 +254,7 @@ get_xdstream_privateid(char *path, char *buf) {
- 			nextName += strlen(name) + 1;
- 		}
- 
-+#ifdef APFSIOC_XDSTREAM_OBJ_ID
- 		for (int i = 0; i < xattrIndex; i++) {
- 			char *name = xattrs[i];
- 			// System volume has stream based xattrs only in form of resource forks
-@@ -275,7 +276,7 @@ get_xdstream_privateid(char *path, char *buf) {
- 				}
- 			}
- 		}
--
-+#endif
- 		ai->xdstream_priv_id = xd_obj_id;
- 		// insert a dummy value as digest is not used in presence of mflag
- 		ai->digest = "authapfs";
--- 
-2.46.0
-
diff --git a/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix b/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix
index e13835513ed4..20e43ae39d22 100644
--- a/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix
+++ b/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix
@@ -3,25 +3,13 @@
   mkAppleDerivation,
   ncurses,
   pkg-config,
-  pkgs,
+  sourceRelease,
   stdenvNoCC,
 }:
 
 let
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  iokitUser = bootstrapSourceRelease "IOKitUser";
-  xnu = bootstrapSourceRelease "xnu";
+  iokitUser = sourceRelease "IOKitUser";
+  xnu = sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "IOKitTools-deps-private-headers";
diff --git a/pkgs/os-specific/darwin/by-name/li/libcxx/package.nix b/pkgs/os-specific/darwin/by-name/li/libcxx/package.nix
index dd5b8694518a..fce5590a1821 100644
--- a/pkgs/os-specific/darwin/by-name/li/libcxx/package.nix
+++ b/pkgs/os-specific/darwin/by-name/li/libcxx/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "libcxx";
   # Keep this in sync with the corresponding LLVM libc++ version
   # defined as `_LIBCPP_VERSION` in `usr/include/c++/v1/__config`.
-  version = "20.1.0+apple-sdk-${apple-sdk_26.version}";
+  version = "21.1.6+apple-sdk-${apple-sdk_26.version}";
   inherit (apple-sdk_26) src;
 
   dontConfigure = true;
diff --git a/pkgs/os-specific/darwin/by-name/li/libiconv/package.nix b/pkgs/os-specific/darwin/by-name/li/libiconv/package.nix
index be9b1e32d6d3..2a7a43b65662 100644
--- a/pkgs/os-specific/darwin/by-name/li/libiconv/package.nix
+++ b/pkgs/os-specific/darwin/by-name/li/libiconv/package.nix
@@ -18,7 +18,7 @@ mkAppleDerivation (finalAttrs: {
     "dev"
   ];
 
-  xcodeHash = "sha256-IiTqhEJIZ8JYjlpBS7ITwYlp8ndU6cehus9TIr+5LYM=";
+  xcodeHash = "sha256-fg5N+TcpyRnAf2ZKFEL0iJRy+QGs++Jmt6M3SV3oyfU=";
 
   patches = [
     # Use gperf to implement module loading statically by looking up the module functions in the static binary.
diff --git a/pkgs/os-specific/darwin/by-name/li/libpcap/package.nix b/pkgs/os-specific/darwin/by-name/li/libpcap/package.nix
index 54e10ca22739..a3709b0809ac 100644
--- a/pkgs/os-specific/darwin/by-name/li/libpcap/package.nix
+++ b/pkgs/os-specific/darwin/by-name/li/libpcap/package.nix
@@ -2,9 +2,9 @@
   lib,
   bison,
   bluez,
-  fetchFromGitHub,
   flex,
   mkAppleDerivation,
+  sourceRelease,
   stdenv,
   stdenvNoCC,
   unifdef,
@@ -14,13 +14,7 @@
 }:
 
 let
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  xnu = fetchFromGitHub {
-    owner = "apple-oss-distributions";
-    repo = "xnu";
-    rev = "xnu-11417.121.6";
-    hash = "sha256-o4tCuCAIgAYg/Li3wTs12mVWr5C/4vbwu1zi+kJ9d6w=";
-  };
+  xnu = sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "libpcap-deps-private-headers";
@@ -32,7 +26,9 @@ let
       unifdef -x 1 -DPRIVATE -o "$out/include/net/droptap.h" '${xnu}/bsd/net/droptap.h'
       unifdef -x 1 -DPRIVATE -o "$out/include/net/iptap.h" '${xnu}/bsd/net/iptap.h'
       unifdef -x 1 -DPRIVATE -o "$out/include/net/pktap.h" '${xnu}/bsd/net/pktap.h'
-      unifdef -x 1 -DPRIVATE -o "$out/include/net/bpf.h" '${xnu}/bsd/net/bpf.h'
+      unifdef -x 1 -DPRIVATE -UMODULES_SUPPORTED -o "$out/include/net/bpf.h" '${xnu}/bsd/net/bpf.h'
+      install -D -t "$out/include/net" \
+        '${xnu}/bsd/net/bpf_private.h'
 
       cat <<EOF > "$out/include/net/if.h"
       #pragma once
diff --git a/pkgs/os-specific/darwin/by-name/li/libresolv/meson.build.in b/pkgs/os-specific/darwin/by-name/li/libresolv/meson.build.in
index 0c1adce503a5..6eaf1b7b976b 100644
--- a/pkgs/os-specific/darwin/by-name/li/libresolv/meson.build.in
+++ b/pkgs/os-specific/darwin/by-name/li/libresolv/meson.build.in
@@ -7,18 +7,21 @@ add_project_arguments(
     '-DCOMMON_DIGEST_FOR_RFC_1321', # To enable legacy `MD5` APIs in CommonCrypto.
     # This is not defined automatically by Clang. Not having them defined causes compilation failures.
     '-DTARGET_OS_BRIDGE=0',
+    '-DTARGET_OS_EXCLAVEKIT=0',
     language : 'c',
 )
 
 
 # Dependencies
 cc = meson.get_compiler('c')
+thread_dep = dependency('threads')
 
 
 # Libraries
 libresolv = library(
     'resolv',
     darwin_versions : '1',
+    dependencies : [ thread_dep ],
     install : true,
     sources : [
         'base64.c',
diff --git a/pkgs/os-specific/darwin/by-name/li/libresolv/package.nix b/pkgs/os-specific/darwin/by-name/li/libresolv/package.nix
index 1ff3f3b70474..6e8cf1f8e394 100644
--- a/pkgs/os-specific/darwin/by-name/li/libresolv/package.nix
+++ b/pkgs/os-specific/darwin/by-name/li/libresolv/package.nix
@@ -8,13 +8,7 @@
 
 let
   configd = sourceRelease "configd";
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  dyld = fetchFromGitHub {
-    owner = "apple-oss-distributions";
-    repo = "dyld";
-    rev = "dyld-1160.6";
-    hash = "sha256-6P/Da6xP19vmaCROoYv9pl7DaW3/U+qZBJT8PD33bn0=";
-  };
+  dyld = sourceRelease "dyld";
   Libinfo = sourceRelease "Libinfo";
   Libnotify = sourceRelease "Libnotify";
 
@@ -51,7 +45,7 @@ mkAppleDerivation {
       --replace-fail '<md5.h>' '<CommonCrypto/CommonDigest.h>'
   '';
 
-  xcodeHash = "sha256-Q5jHee9rxge6HJtf9/sFK15FsS02GQmx7L0BBDiyGIs=";
+  xcodeHash = "sha256-pQ1eFMPnSy8M3pfvv+sPyale9xDlVCMif0EWO8PO7zg=";
 
   env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include -I${configd}/dnsinfo -I${Libinfo}/lookup.subproj -I${Libnotify}";
 
diff --git a/pkgs/os-specific/darwin/by-name/ne/network_cmds/meson.build.in b/pkgs/os-specific/darwin/by-name/ne/network_cmds/meson.build.in
index 926175715775..07420798eb3f 100644
--- a/pkgs/os-specific/darwin/by-name/ne/network_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/by-name/ne/network_cmds/meson.build.in
@@ -74,17 +74,6 @@ install_man(
     'arp.tproj/arp4.4',
 )
 
-executable(
-    'cfilutil',
-    dependencies : [ corecrypto ],
-    install : true,
-    sources : [
-        'cfilutil/cfilstat.c',
-        'cfilutil/cfilutil.c',
-    ],
-)
-install_man('cfilutil/cfilutil.1')
-
 executable(
     'dnctl',
     install : true,
@@ -92,30 +81,6 @@ executable(
 )
 install_man('dnctl/dnctl.8')
 
-executable(
-    'ecnprobe',
-    dependencies : [ libnetwork_cmds, libpcap ],
-    install : true,
-    sources : [
-        'ecnprobe/capture.c',
-        'ecnprobe/ecn.c',
-        'ecnprobe/ecn_probe.c',
-        'ecnprobe/gmt2local.c',
-        'ecnprobe/history.c',
-        'ecnprobe/inet.c',
-        'ecnprobe/session.c',
-        'ecnprobe/support.c',
-    ],
-)
-install_man('ecnprobe/ecnprobe.1')
-
-executable(
-    'frame_delay',
-    install : true,
-    sources : [ 'frame_delay/frame_delay.c' ],
-)
-install_man('frame_delay/frame_delay.8')
-
 executable(
     'ifconfig',
     c_args : [
@@ -139,13 +104,6 @@ executable(
 )
 install_man('ifconfig.tproj/ifconfig.8')
 
-executable(
-    'ip6addrctl',
-    install : true,
-    sources : [ 'ip6addrctl.tproj/ip6addrctl.c' ],
-)
-install_man('ip6addrctl.tproj/ip6addrctl.8')
-
 executable(
     'kdumpd',
     dependencies : [ libnetwork_cmds ],
@@ -157,34 +115,6 @@ executable(
 )
 install_man('kdumpd.tproj/kdumpd.8')
 
-executable(
-    'mnc',
-    install : true,
-    sources : [
-        'mnc.tproj/mnc_main.c',
-        'mnc.tproj/mnc_multicast.c',
-        'mnc.tproj/mnc_opts.c',
-    ],
-)
-install_man('mnc.tproj/mnc.1')
-
-executable(
-    'mptcp_client',
-    install : true,
-    sources : [
-        'mptcp_client/conn_lib.c',
-        'mptcp_client/mptcp_client.c',
-    ],
-)
-install_man('mptcp_client/mptcp_client.1')
-
-executable(
-    'mtest',
-    install : true,
-    sources : [ 'mtest.tproj/mtest.c' ],
-)
-install_man('mtest.tproj/mtest.8')
-
 executable(
     'ndp',
     c_args : [
@@ -231,7 +161,7 @@ executable(
     dependencies : [ libnetwork_cmds ],
     install : true,
     sources : [
-        'ecnprobe/gmt2local.c',
+        'network_cmds_lib/gmt2local.c',
         'ping.tproj/ping.c'
     ],
 )
@@ -242,26 +172,13 @@ executable(
     dependencies : [ libnetwork_cmds, libresolv ],
     install : true,
     sources : [
-        'ecnprobe/gmt2local.c',
+        'network_cmds_lib/gmt2local.c',
         'ping6.tproj/md5.c',
         'ping6.tproj/ping6.c',
     ],
 )
 install_man('ping6.tproj/ping6.8')
 
-executable(
-    'pktapctl',
-    install : true,
-    sources : [ 'pktapctl/pktapctl.c' ],
-)
-install_man('pktapctl/pktapctl.8')
-
-executable(
-    'pktmnglr',
-    install : true,
-    sources : [ 'pktmnglr/packet_mangler.c' ],
-)
-
 executable(
     'rarpd',
     c_args : [ '-DTFTP_DIR="tftpboot"' ],
@@ -282,32 +199,6 @@ executable(
 )
 install_man('route.tproj/route.8')
 
-executable(
-    'rtadvd',
-    c_args : [
-       '-DINET6',
-       '-DHAVE_GETIFADDRS',
-        # Required for `_COMM_PAGE_CPU_CAPABILITIES` in <machine/cpu_capabilities.h>
-       '-DPRIVATE',
-    ],
-    dependencies : libutil,
-    install : true,
-    sources : [
-        'rtadvd.tproj/advcap.c',
-        'rtadvd.tproj/config.c',
-        'rtadvd.tproj/dump.c',
-        'rtadvd.tproj/if.c',
-        'rtadvd.tproj/rrenum.c',
-        'rtadvd.tproj/rtadvd.c',
-        'rtadvd.tproj/rtadvd_logging.c',
-        'rtadvd.tproj/timer.c',
-    ],
-)
-install_man(
-  'rtadvd.tproj/rtadvd.8',
-  'rtadvd.tproj/rtadvd.conf.5',
-)
-
 executable(
     'rtsol',
     c_args : [
diff --git a/pkgs/os-specific/darwin/by-name/ne/network_cmds/package.nix b/pkgs/os-specific/darwin/by-name/ne/network_cmds/package.nix
index fcc585842573..1504ebf59590 100644
--- a/pkgs/os-specific/darwin/by-name/ne/network_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/ne/network_cmds/package.nix
@@ -1,23 +1,19 @@
 {
-  fetchFromGitHub,
   libpcap,
   libresolv,
   libutil,
   mkAppleDerivation,
   openssl,
   pkg-config,
+  file_cmds,
+  sourceRelease,
   stdenvNoCC,
   unifdef,
+  xnuHeaders,
 }:
 
 let
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  xnu = fetchFromGitHub {
-    owner = "apple-oss-distributions";
-    repo = "xnu";
-    rev = "xnu-11417.121.6";
-    hash = "sha256-o4tCuCAIgAYg/Li3wTs12mVWr5C/4vbwu1zi+kJ9d6w=";
-  };
+  xnu = sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "network_cmds-deps-private-headers";
@@ -26,362 +22,131 @@ let
 
     buildCommand = ''
       # Different strategies are needed to make private headers available to network_cmds:
-      # - If the headers can be used as-is, copy them;
-      # - If the required symbols are hidden behind a 'PRIVATE' define, `unifdef` is used to expose only those symbols
-      #   for that header. Processing the header avoids exposing unwanted private symbols and requiring more headers;
-      # - If the symbol is hidden behind a kernel-related define, grep them out of the header. Otherwise,
-      #   the required headers can conflict with system-related headers and require many, many more headers be copied.
+      # - If the headers are available in xnuHeaders, copy them; or
+      # - If the headers are not included in the private headers build, copy them from the source.
 
       install -D -t "$out/include" \
-        '${xnu}/osfmk/kern/cs_blobs.h'
+        '${xnuHeaders}/include/kern/cs_blobs.h'
 
       install -D -t "$out/include/firehose" \
         '${xnu}/libkern/firehose/firehose_types_private.h' \
         '${xnu}/libkern/firehose/tracepoint_private.h'
 
-      for dir in arm i386 machine; do
+      for dir in arm i386 kern machine; do
         mkdir -p "$out/include/$dir"
-        for file in '${xnu}/osfmk/'$dir/*; do
+        for file in '${xnuHeaders}/include/'$dir/*; do
           name=$(basename "$file")
           # Skip copying `endian.h` because it conflicts with the SDK, breaking the build on x86_64-darwin.
           test "$name" != endian.h && cp -r "$file" "$out/include/$dir/$name"
         done
       done
 
+      unifdef -x 1 -DKERNEL_PRIVATE -o "$out/include/arm/locks.h" '${xnu}/osfmk/arm/locks.h'
+      unifdef -x 1 -DKERNEL_PRIVATE -o "$out/include/i386/locks.h" '${xnu}/osfmk/i386/locks.h'
+
       install -D -t "$out/include/net" \
-        '${xnu}/bsd/net/droptap.h' \
-        '${xnu}/bsd/net/if_bond_internal.h' \
-        '${xnu}/bsd/net/if_bond_var.h' \
-        '${xnu}/bsd/net/if_fake_var.h' \
-        '${xnu}/bsd/net/if_mib_private.h' \
-        '${xnu}/bsd/net/if_var_private.h' \
-        '${xnu}/bsd/net/if_vlan_var.h' \
-        '${xnu}/bsd/net/lacp.h' \
-        '${xnu}/bsd/net/net_perf.h'
-      mkdir -p "$out/include/net/classq" "$out/include/net/pktsched"
+        '${xnuHeaders}/include/net/bpf.h' \
+        '${xnuHeaders}/include/net/bpf_private.h' \
+        '${xnuHeaders}/include/net/content_filter.h' \
+        '${xnuHeaders}/include/net/droptap.h' \
+        '${xnuHeaders}/include/net/if.h' \
+        '${xnuHeaders}/include/net/if_bond_internal.h' \
+        '${xnuHeaders}/include/net/if_bond_var.h' \
+        '${xnuHeaders}/include/net/if_bridgevar.h' \
+        '${xnuHeaders}/include/net/if_fake_var.h' \
+        '${xnuHeaders}/include/net/if_llreach.h' \
+        '${xnuHeaders}/include/net/if_mib.h' \
+        '${xnuHeaders}/include/net/if_mib_private.h' \
+        '${xnuHeaders}/include/net/if_ports_used.h' \
+        '${xnuHeaders}/include/net/if_private.h' \
+        '${xnuHeaders}/include/net/if_var_private.h' \
+        '${xnuHeaders}/include/net/if_vlan_var.h' \
+        '${xnuHeaders}/include/net/lacp.h' \
+        '${xnuHeaders}/include/net/net_api_stats.h' \
+        '${xnuHeaders}/include/net/net_perf.h' \
+        '${xnuHeaders}/include/net/network_agent.h' \
+        '${xnuHeaders}/include/net/ntstat.h' \
+        '${xnuHeaders}/include/net/packet_mangler.h' \
+        '${xnuHeaders}/include/net/pktap.h' \
+        '${xnuHeaders}/include/net/radix.h' \
+        '${xnuHeaders}/include/net/route.h' \
+        '${xnuHeaders}/include/net/route_private.h'
 
-      cat <<EOF > "$out/include/net/bpf.h"
-      #pragma once
-      #include_next <net/bpf.h>
-      #include <net/if.h>
-      $(sed -n \
-        -e '/^#define BPF_D_/p' \
-        -e '/^struct xbpf_d\s*{/,/^};/p' \
-        '${xnu}/bsd/net/bpf.h')
-      EOF
+      install -D -t "$out/include/net/classq" \
+        '${xnuHeaders}/include/net/classq/classq.h' \
+        '${xnuHeaders}/include/net/classq/if_classq.h'
 
-      # IFNET constants are defined as enums, so they have to be pre-processed and grepped from the file.
-      cat <<EOF > "$out/include/net/if.h"
-      #pragma once
-      #include <uuid/uuid.h>
-      $(sed \
-        -e 's/^\s*\(IFNET_[^=]*\)=\s*\([^,]*\),*/#define \1\2/' \
-        '${xnu}/bsd/net/if_private.h' | grep '^#define IFNET_')
-      #include_next <net/if.h>
-      #include <netinet/in.h>
-      typedef void* ifnet_t;
-      #define ifreq ifreq_private
-      $(sed -n \
-        -e '/^#define IFEF_TXSTART/p' \
-        -e '/^#define IFLPRF/p' \
-        -e '/^#define IFNAMSIZ\s/p' \
-        -e '/^#define IFRLOGF/p' \
-        -e '/^#define IFRTYPE/p' \
-        -e '/^#define IF_DESCSIZE\s/p' \
-        -e '/^#define IF_NAMESIZE\s/p' \
-        -e '/^#define NAT64_MAX_NUM_PREFIXES\s/p' \
-        -e '/^#define ifr_fastlane_capable\s/p' \
-        -e '/^#define ifr_fastlane_enabled\s/p' \
-        -e '/^#define ifr_qosmarking_enabled\s/p' \
-        -e '/^#define ifr_qosmarking_mode\s/p' \
-        -e '/^struct if_agentidsreq\s*{/,/^};/p' \
-        -e '/^struct if_clat46req\s*{/,/^};/p' \
-        -e '/^struct if_descreq\s*{/,/^};/p' \
-        -e '/^struct if_ipv6_address\s*{/,/^};/p' \
-        -e '/^struct if_linkparamsreq\s*{/,/^};/p' \
-        -e '/^struct if_qstatsreq\s*{/,/^};/p' \
-        -e '/^struct if_nat64req\s*{/,/^};/p' \
-        -e '/^struct if_nexusreq\s*{/,/^};/p' \
-        -e '/^struct if_throttlereq\s*{/,/^};/p' \
-        -e '/^struct ipv6_prefix\s*{/,/^};/p' \
-        -e '/^struct  ifreq\s*{/,/^};/p' \
-        '${xnu}/bsd/net/if_private.h')
-      #undef ifreq
-      EOF
-
-      cat <<EOF > "$out/include/net/content_filter.h"
-      #pragma once
-      #include <uuid/uuid.h>
-      #include <net/content_filter_impl.h>
-      EOF
+      install -D -t "$out/include/net/pktsched" \
+        '${xnuHeaders}/include/net/pktsched/pktsched.h' \
+        '${xnuHeaders}/include/net/pktsched/pktsched_fq_codel.h'
 
       cat <<EOF > "$out/include/net/if_var.h"
       #pragma once
       #include <net/if_var_private.h>
+      /* These aren’t defined in the headers in the XNU source */
       #define IF_NETEM_MODEL_IOD 2
       #define IF_NETEM_MODEL_FPD 3
-      #include_next <net/if_var.h>
+      #include <${xnuHeaders}/include/net/if_var.h>
       EOF
 
-      cat <<EOF > "$out/include/net/route.h"
-      #pragma once
-      #include_next <net/route.h>
-      $(sed -n \
-        -e '/^#define RTM_/p' \
-        -e '/^struct rt_msghdr_ext\s*{/,/^};/p' \
-        -e '/^struct rt_reach_info\s*{/,/^};/p' \
-        -e '/^struct rtstat_64\s*{/,/^};/p' \
-        '${xnu}/bsd/net/route_private.h')
-      EOF
-      ln -s "$out/include/net/route.h" "$out/include/net/route_private.h"
-
       install -D -t "$out/include/netinet" \
-        '${xnu}/bsd/netinet/icmp6.h' \
-        '${xnu}/bsd/netinet/ip_flowid.h'
-
-      cat <<EOF > "$out/include/netinet/in.h"
-      #pragma once
-      #include_next <netinet/in.h>
-      $(sed -n \
-        -e '/^#define _DSCP/p' \
-        -e '/^#define IP_NO/p' \
-        -e '/^union sockaddr_in_4_6\s*{/,/^};/p' \
-        '${xnu}/bsd/netinet/in_private.h')
-      #include <uuid/uuid.h>
-      EOF
-
-      cat <<EOF > "$out/include/netinet/tcp.h"
-      #pragma once
-      $(sed -n \
-        -e '/^struct tcp_info\s*{/,/^};/p' \
-        -e '/^struct tcp_conn_status\s*{/,/^};/p' \
-        -e '/^typedef struct conninfo_tcp\s*{/,/} conninfo_tcp_t;/p' \
-        '${xnu}/bsd/netinet/tcp_private.h')
-      #include_next <netinet/tcp.h>
-      EOF
+        '${xnuHeaders}/include/netinet/icmp6.h' \
+        '${xnuHeaders}/include/netinet/igmp_var.h' \
+        '${xnuHeaders}/include/netinet/in.h' \
+        '${xnuHeaders}/include/netinet/in_pcb.h' \
+        '${xnuHeaders}/include/netinet/in_private.h' \
+        '${xnuHeaders}/include/netinet/in_stat.h' \
+        '${xnuHeaders}/include/netinet/ip_dummynet.h' \
+        '${xnuHeaders}/include/netinet/ip_flowid.h' \
+        '${xnuHeaders}/include/netinet/mptcp_var.h' \
+        '${xnuHeaders}/include/netinet/tcp.h' \
+        '${xnuHeaders}/include/netinet/tcp_private.h' \
+        '${xnuHeaders}/include/netinet/tcp_var.h' \
+        '${xnuHeaders}/include/netinet/udp_var.h'
 
       install -D -t "$out/include/netinet6" \
-        '${xnu}/bsd/netinet6/in6_pcb.h' \
-        '${xnu}/bsd/netinet6/ip6_var.h'
-
-      cat <<EOF > "$out/include/netinet6/in6.h"
-      #pragma once
-      $(sed -n \
-        -e '/^#define IPV6_/p' \
-        '${xnu}/bsd/netinet6/in6_private.h')
-      #include_next <netinet6/in6.h>
-      EOF
-
-      cat <<EOF > "$out/include/netinet6/in6_var.h"
-      #pragma once
-      $(sed -n \
-        -e '/^#define IN6_CGA/p' \
-        -e '/^#define SIOCSETROUTERMODE_IN6\s/p' \
-        -e '/^struct in6_cga_modifier\s*{/,/^};/p' \
-        -e '/^struct in6_cga_nodecfg\s*{/,/^};/p' \
-        -e '/^struct in6_cga_prepare\s*{/,/^};/p' \
-        '${xnu}/bsd/netinet6/in6_var.h')
-      #include_next <netinet6/in6_var.h>
-      EOF
+        '${xnuHeaders}/include/netinet6/in6.h' \
+        '${xnuHeaders}/include/netinet6/in6_private.h' \
+        '${xnuHeaders}/include/netinet6/in6_var.h' \
+        '${xnuHeaders}/include/netinet6/in6_pcb.h' \
+        '${xnuHeaders}/include/netinet6/ip6_var.h' \
+        '${xnuHeaders}/include/netinet6/mld6_var.h'
 
       mkdir -p "$out/include/netinet6"
       cat <<EOF > "$out/include/netinet6/nd6.h"
       #pragma once
-      $(sed -n \
-        -e '/^#define ND6_IFF/p' \
-        '${xnu}/bsd/netinet6/nd6.h')
-      #include_next <netinet6/nd6.h>
+      #include <net/if_dl.h> /* The private nd6.h depends on sockaddr_dl but fails to include if_dl.h. */
+      #include <${xnuHeaders}/include/netinet6/nd6.h>
       EOF
 
       install -D -t "$out/include/os" \
-        '${xnu}/libkern/os/atomic_private.h' \
-        '${xnu}/libkern/os/atomic_private_arch.h' \
-        '${xnu}/libkern/os/atomic_private_impl.h' \
+        '${xnuHeaders}/Library/Frameworks/Kernel.framework/PrivateHeaders/os/atomic_private.h' \
+        '${xnuHeaders}/Library/Frameworks/Kernel.framework/PrivateHeaders/os/atomic_private_arch.h' \
+        '${xnuHeaders}/Library/Frameworks/Kernel.framework/PrivateHeaders/os/atomic_private_impl.h' \
         '${xnu}/libkern/os/log_private.h'
 
-      declare -a privateHeaders=(
-        net/classq/classq.h
-        net/classq/if_classq.h
-        net/if_bridgevar.h
-        net/if_llreach.h
-        net/if_mib.h
-        net/if_ports_used.h
-        net/net_api_stats.h
-        net/network_agent.h
-        net/ntstat.h
-        net/packet_mangler.h
-        net/pktap.h
-        net/pktsched/pktsched.h
-        net/pktsched/pktsched_fq_codel.h
-        net/radix.h
-        netinet/igmp_var.h
-        netinet/in_pcb.h
-        netinet/in_stat.h
-        netinet/ip_dummynet.h
-        netinet/mptcp_var.h
-        netinet/tcp_var.h
-        netinet6/mld6_var.h
-        sys/mbuf.h
-      )
+      install -D -t "$out/include/skywalk" \
+        '${xnuHeaders}/include/skywalk/os_channel.h' \
+        '${xnuHeaders}/include/skywalk/os_channel_event.h' \
+        '${xnuHeaders}/include/skywalk/os_nexus.h' \
+        '${xnuHeaders}/include/skywalk/os_packet.h'
 
-      mkdir -p "$out/include/sys"
-
-      for header in "''${privateHeaders[@]}"; do
-        unifdef -x 1 -DPRIVATE -o "$out/include/$header" '${xnu}/bsd/'$header
-      done
-      unifdef -x 1 -DPRIVATE -o "$out/include/net/content_filter_impl.h" '${xnu}/bsd/net/content_filter.h'
-
-      cat <<EOF > "$out/include/sys/kern_control.h"
-      #pragma once
-      $(sed -n \
-        -e '/^#define MAX_KCTL_NAME\s/p' \
-        -e '/^struct kctlstat\s*{/,/^};/p' \
-        -e '/^struct xkctl_reg\s*{/,/^};/p' \
-        -e '/^struct xkctlpcb\s*{/,/^};/p' \
-        '${xnu}/bsd/sys/kern_control.h')
-      #include_next <sys/kern_control.h>
-      EOF
-
-      cat <<EOF > "$out/include/sys/kern_event.h"
-      #pragma once
-      $(sed -n \
-        -e '/^struct kevtstat\s*{/,/^};/p' \
-        -e '/^struct xkevtpcb\s*{/,/^};/p' \
-        '${xnu}/bsd/sys/kern_event.h')
-      #include_next <sys/kern_event.h>
-      EOF
-
-      cat <<EOF > "$out/include/sys/socket.h"
-      #pragma once
-      #include <sys/param.h>
-      #include <sys/_types/_socklen_t.h>
-      $(sed -n \
-        -e '/^typedef.*sae_associd_t/p' \
-        -e '/^typedef.*sae_connid_t/p' \
-        '${xnu}/bsd/sys/socket.h')
-      $(sed -n \
-        -e '/^#define AF_MULTIPATH\s/p' \
-        -e '/^#define CIAUX_TCP\s/p' \
-        -e '/^#define NET_RT_/p' \
-        -e '/^#define SO_RECV/p' \
-        -e '/^#define SO_TRAFFIC_CLASS\s/,/^#define SO_TC_MAX/p' \
-        -e '/^struct so_aidreq\s*{/,/^};/p' \
-        -e '/^struct so_cidreq\s*{/,/^};/p' \
-        -e '/^struct so_cinforeq\s*{/,/^};/p' \
-        -e '/^struct so_cordreq\s*{/,/^};/p' \
-        '${xnu}/bsd/sys/socket_private.h')
-      #include_next <sys/socket.h>
-      EOF
-
-      cat <<EOF > "$out/include/sys/socketvar.h"
-      #pragma once
-      $(sed -n \
-        -e '/^#define SO_STATS_/p' \
-        -e '/^#define SO_TC_STATS_MAX\s/p' \
-        -e '/^#define XSO_/p' \
-        -e '/^struct data_stats\s*{/,/^};/p' \
-        -e '/^struct soextbkidlestat\s*{/,/^};/p' \
-        -e '/^struct  xsocket_n\s*{/,/^};/p' \
-        -e '/^struct xsockbuf_n\s*{/,/^};/p' \
-        -e '/^struct xsockstat_n\s*{/,/^};/p' \
-        -e '/^typedef.*so_gen_t;/p' \
-        '${xnu}/bsd/sys/socketvar.h')
-      #include_next <sys/socketvar.h>
-      EOF
-
-      cat <<EOF > "$out/include/sys/sockio.h"
-      #pragma once
-      #define ifreq ifreq_private
-      $(sed -n \
-        -e '/^#define SIOCGASSOCIDS\s/p' \
-        -e '/^#define SIOCGCONNIDS\s/p' \
-        -e '/^#define SIOCGCONNINFO\s/p' \
-        -e '/^#define SIOCGIFAGENTDATA\s/p' \
-        -e '/^#define SIOCGIFAGENTIDS\s/p' \
-        -e '/^#define SIOCGIFCLAT46ADDR\s/p' \
-        -e '/^#define SIOCGIFCONSTRAINED\s/p' \
-        -e '/^#define SIOCGIFDELEGATE\s/p' \
-        -e '/^#define SIOCGIFDESC\s/p' \
-        -e '/^#define SIOCGIFEFLAGS\s/p' \
-        -e '/^#define SIOCGIFGENERATIONID\s/p' \
-        -e '/^#define SIOCGIFGETRTREFCNT\s/p' \
-        -e '/^#define SIOCGIFINTERFACESTATE\s/p' \
-        -e '/^#define SIOCGIFLINKPARAMS\s/p' \
-        -e '/^#define SIOCGIFLINKQUALITYMETRIC\s/p' \
-        -e '/^#define SIOCGIFLOG\s/p' \
-        -e '/^#define SIOCGIFLOWPOWER\s/p' \
-        -e '/^#define SIOCGIFMPKLOG\s/p' \
-        -e '/^#define SIOCGIFNAT64PREFIX\s/p' \
-        -e '/^#define SIOCGIFNEXUS\s/p' \
-        -e '/^#define SIOCGIFQUEUESTATS\s/p' \
-        -e '/^#define SIOCGIFTHROTTLE\s/p' \
-        -e '/^#define SIOCGIFTIMESTAMPENABLED\s/p' \
-        -e '/^#define SIOCGIFTYPE\s/p' \
-        -e '/^#define SIOCGIFXFLAGS\s/p' \
-        -e '/^#define SIOCGQOSMARKINGENABLED\s/p' \
-        -e '/^#define SIOCGQOSMARKINGMODE\s/p' \
-        -e '/^#define SIOCGSTARTDELAY\s/p' \
-        -e '/^#define SIOCSECNMODE\s/p' \
-        -e '/^#define SIOCSETROUTERMODE\s/p' \
-        -e '/^#define SIOCSFASTLANECAPABLE\s/p' \
-        -e '/^#define SIOCSFASTLEENABLED\s/p' \
-        -e '/^#define SIOCSIF2KCL\s/p' \
-        -e '/^#define SIOCSIFCONSTRAINED\s/p' \
-        -e '/^#define SIOCSIFDESC\s/p' \
-        -e '/^#define SIOCSIFDISABLEINPUT\s/p' \
-        -e '/^#define SIOCSIFDISABLEOUTPUT\s/p' \
-        -e '/^#define SIOCSIFEXPENSIVE\s/p' \
-        -e '/^#define SIOCSIFINTERFACESTATE\s/p' \
-        -e '/^#define SIOCSIFLINKPARAMS\s/p' \
-        -e '/^#define SIOCSIFLOG\s/p' \
-        -e '/^#define SIOCSIFLOWPOWER\s/p' \
-        -e '/^#define SIOCSIFMARKWAKEPKT\s/p' \
-        -e '/^#define SIOCSIFMPKLOG\s/p' \
-        -e '/^#define SIOCSIFNOACKPRIO\s/p' \
-        -e '/^#define SIOCSIFNOTRAFFICSHAPING\s/p' \
-        -e '/^#define SIOCSIFPROBECONNECTIVITY\s/p' \
-        -e '/^#define SIOCSIFSUBFAMILY\s/p' \
-        -e '/^#define SIOCSIFTHROTTLE\s/p' \
-        -e '/^#define SIOCSIFTIMESTAMPDISABLE\s/p' \
-        -e '/^#define SIOCSIFTIMESTAMPENABLE\s/p' \
-        -e '/^#define SIOCSQOSMARKINGENABLED\s/p' \
-        -e '/^#define SIOCSQOSMARKINGMODE\s/p' \
-        '${xnu}/bsd/sys/sockio_private.h')
-      #undef ifreq
-      #include_next <sys/sockio.h>
-      EOF
-      ln -s "$out/include/sys/sockio.h" "$out/include/sys/sockio_private.h"
-
-      cat <<EOF > "$out/include/sys/sys_domain.h"
-      #pragma once
-      $(sed -n \
-        -e '/^#define AF_SYS/p' \
-        -e '/^#define SYSPROTO/p' \
-        -e '/^struct  xsystmgen\s*{/,/^};/p' \
-        '${xnu}/bsd/sys/sys_domain.h')
-      #include_next <sys/sys_domain.h>
-      EOF
-
-      cat <<EOF > "$out/include/sys/syslimits.h"
-      #pragma once
-      $(grep '^#define LINE_MAX\s' '${xnu}/bsd/sys/syslimits.h')
-      #include_next <sys/syslimits.h>
-      EOF
-
-      cat <<EOF > "$out/include/sys/unpcb.h"
-      #pragma once
-      #include_next <sys/unpcb.h>
-      #define KERNEL
-      #ifdef KERNEL
-      $(sed -n \
-        -e '/^struct  unpcb_compat\s*{/,/^};/p' \
-        '${xnu}/bsd/sys/unpcb.h')
-      #undef KERNEL
-      $(sed -n \
-        -e '/^#define xu_addr/p' \
-        -e '/^struct  *xunpcb\(64\|_n\)_list_entry\s*{/,/^};/p' \
-        -e '/^struct  *xunpcb\(64\|_n\)\s*{/,/^};/p' \
-        '${xnu}/bsd/sys/unpcb.h')
+      install -D -t "$out/include/sys" \
+        '${xnuHeaders}/include/sys/kern_control.h' \
+        '${xnuHeaders}/include/sys/kern_control_private.h' \
+        '${xnuHeaders}/include/sys/kern_event.h' \
+        '${xnuHeaders}/include/sys/kern_event_private.h' \
+        '${xnuHeaders}/include/sys/mbuf.h' \
+        '${xnuHeaders}/include/sys/socket.h' \
+        '${xnuHeaders}/include/sys/socket_private.h' \
+        '${xnuHeaders}/include/sys/socketvar.h' \
+        '${xnuHeaders}/include/sys/sockio.h' \
+        '${xnuHeaders}/include/sys/sockio_private.h' \
+        '${xnuHeaders}/include/sys/sys_domain.h' \
+        '${xnuHeaders}/include/sys/sys_domain_private.h' \
+        '${xnuHeaders}/include/sys/syslimits.h' \
+        '${xnuHeaders}/include/sys/unpcb.h' \
+        '${xnuHeaders}/include/sys/vsock_private.h'
     '';
   };
 in
@@ -393,31 +158,24 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-1RJ/s9vnfCGY2Vc2XH8dg8rB+0lwK2IBC7zIx4PuXWQ=";
+  xcodeHash = "sha256-OIYpa71CvCOL8Ln7s8wUqWj9yD9lEeRifkj5gPvD78Y=";
 
   patches = [
     # Some private headers depend on corecrypto, which we can’t use.
     # Use the headers from the ld64 port, which delegates to OpenSSL.
-    ./patches/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
+    ./patches/0001-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
+    # Fix unknown type name 'pid_t' error
+    ./patches/0002-Add-missing-sys-types_h.patch
   ];
 
   postPatch = ''
     # Fix invalid pointer conversion error from trying to pass `NULL` to a `size_t`.
-    substituteInPlace ndp.tproj/ndp.c --replace-fail 'NULL, NULL);' 'NULL, 0);'
+    substituteInPlace ndp.tproj/ndp.c \
+      --replace-fail 'NULL, NULL);' 'NULL, 0);'
 
-    # Use private struct ifreq instead of the one defined in the system header.
-    substituteInPlace ifconfig.tproj/ifconfig.c \
-      --replace-fail $'struct\tifreq' 'struct ifreq' \
-      --replace-fail 'struct ifreq' 'struct ifreq_private'
-
-    substituteInPlace ifconfig.tproj/ifvlan.c \
-      --replace-fail 'struct ifreq' 'struct ifreq_private'
-
-    substituteInPlace ifconfig.tproj/ifconfig.h \
-      --replace-fail 'struct ifreq' 'struct ifreq_private'
-
-    substituteInPlace netstat.tproj/if.c \
-      --replace-fail 'struct ifreq' 'struct ifreq_private'
+    # Fix invalid pointer conversion error. These parameters seem to be in the wrong order …
+    substituteInPlace netstat.tproj/main.c \
+      --replace-fail 'tp->pr_name, tp->pr_protocol' 'tp->pr_protocol, tp->pr_name'
   '';
 
   env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
diff --git a/pkgs/os-specific/darwin/by-name/ne/network_cmds/patches/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch b/pkgs/os-specific/darwin/by-name/ne/network_cmds/patches/0001-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
similarity index 96%
rename from pkgs/os-specific/darwin/by-name/ne/network_cmds/patches/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
rename to pkgs/os-specific/darwin/by-name/ne/network_cmds/patches/0001-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
index 011d0f816ff0..baae5d4e72aa 100644
--- a/pkgs/os-specific/darwin/by-name/ne/network_cmds/patches/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
+++ b/pkgs/os-specific/darwin/by-name/ne/network_cmds/patches/0001-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
@@ -1,10 +1,10 @@
-From 36767c7345161baf0ab125f95c8557f8e24f25db Mon Sep 17 00:00:00 2001
+From dc917b5729184398268cdfdc4ac180fb0306c1cc Mon Sep 17 00:00:00 2001
 From: Randy Eckenrode <randy@largeandhighquality.com>
-Date: Tue, 9 Apr 2024 19:28:17 -0400
-Subject: [PATCH 7/8] Add OpenSSL-based CoreCrypto digest functions
+Date: Fri, 10 Apr 2026 23:08:32 -0400
+Subject: [PATCH] Add-OpenSSL-based-CoreCrypto-digest-functions
 
 ---
- compat/CommonCrypto/CommonDigest.h    |  6 +++
+ compat/CommonCrypto/CommonDigest.h    |  5 +++
  compat/CommonCrypto/CommonDigestSPI.c | 21 +++++++++++
  compat/CommonCrypto/CommonDigestSPI.h | 14 +++++++
  compat/corecrypto/api_defines.h       | 10 +++++
@@ -14,7 +14,7 @@ Subject: [PATCH 7/8] Add OpenSSL-based CoreCrypto digest functions
  compat/corecrypto/ccsha1.c            | 22 +++++++++++
  compat/corecrypto/ccsha1.h            |  9 +++++
  compat/corecrypto/ccsha2.c            | 22 +++++++++++
- compat/corecrypto/ccsha2.h            |  9 +++++
+ compat/corecrypto/ccsha2.h            | 10 +++++
  11 files changed, 212 insertions(+)
  create mode 100644 compat/CommonCrypto/CommonDigest.h
  create mode 100644 compat/CommonCrypto/CommonDigestSPI.c
@@ -30,7 +30,7 @@ Subject: [PATCH 7/8] Add OpenSSL-based CoreCrypto digest functions
 
 diff --git a/compat/CommonCrypto/CommonDigest.h b/compat/CommonCrypto/CommonDigest.h
 new file mode 100644
-index 0000000..a60eba7
+index 0000000..531bb05
 --- /dev/null
 +++ b/compat/CommonCrypto/CommonDigest.h
 @@ -0,0 +1,5 @@
@@ -292,7 +292,7 @@ index 0000000..6504503
 +}
 diff --git a/compat/corecrypto/ccsha2.h b/compat/corecrypto/ccsha2.h
 new file mode 100644
-index 0000000..9f30e03
+index 0000000..7e889b7
 --- /dev/null
 +++ b/compat/corecrypto/ccsha2.h
 @@ -0,0 +1,10 @@
@@ -307,5 +307,5 @@ index 0000000..9f30e03
 +
 +EXTERN_C const struct ccdigest_info* ccsha256_di(void);
 -- 
-2.44.1
+2.51.2
 
diff --git a/pkgs/os-specific/darwin/by-name/ne/network_cmds/patches/0002-Add-missing-sys-types_h.patch b/pkgs/os-specific/darwin/by-name/ne/network_cmds/patches/0002-Add-missing-sys-types_h.patch
new file mode 100644
index 000000000000..dd72df4ddbea
--- /dev/null
+++ b/pkgs/os-specific/darwin/by-name/ne/network_cmds/patches/0002-Add-missing-sys-types_h.patch
@@ -0,0 +1,25 @@
+From 0135015e24a2f52e225be84f47c2c910b51774b7 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 10 Apr 2026 23:07:35 -0400
+Subject: [PATCH] Add-missing-sys-types_h
+
+---
+ network_cmds_lib/network_cmds_lib.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/network_cmds_lib/network_cmds_lib.h b/network_cmds_lib/network_cmds_lib.h
+index d04e8fd..aee4c64 100644
+--- a/network_cmds_lib/network_cmds_lib.h
++++ b/network_cmds_lib/network_cmds_lib.h
+@@ -29,6 +29,8 @@
+ #ifndef network_cmds_lib_h
+ #define network_cmds_lib_h
+ 
++#include <sys/types.h>
++
+ /*
+  * @function   clean_non_printable
+  * @discussion Modifies a string to replace the non-printable ASCII characters
+-- 
+2.51.2
+
diff --git a/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix b/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix
index 9c285b013760..16e9c572e629 100644
--- a/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix
+++ b/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix
@@ -1,23 +1,11 @@
 {
   mkAppleDerivation,
-  pkgs,
+  sourceRelease,
   stdenvNoCC,
 }:
 
 let
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  iokitUser = bootstrapSourceRelease "IOKitUser";
+  iokitUser = sourceRelease "IOKitUser";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "file_cmds-deps-private-headers";
diff --git a/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix b/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix
index 4fc44ef8dcfc..88f7885ce814 100644
--- a/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix
@@ -9,24 +9,12 @@
   libxo,
   mkAppleDerivation,
   pkg-config,
-  pkgs,
+  sourceRelease,
 }:
 
 let
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
   # nohup requires vproc_priv.h from launchd
-  launchd = bootstrapSourceRelease "launchd";
+  launchd = sourceRelease "launchd";
 in
 mkAppleDerivation {
   releaseName = "shell_cmds";
diff --git a/pkgs/os-specific/darwin/by-name/sy/system_cmds/meson.build.in b/pkgs/os-specific/darwin/by-name/sy/system_cmds/meson.build.in
index 3263cdb2837c..c36450b916df 100644
--- a/pkgs/os-specific/darwin/by-name/sy/system_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/by-name/sy/system_cmds/meson.build.in
@@ -186,10 +186,7 @@ executable(
     build_by_default : false,
     install : false,
     sources : [
-        'gcore/convert.c',
         'gcore/corefile.c',
-        'gcore/dyld.c',
-        'gcore/dyld_shared_cache.c',
         'gcore/gcore_framework.m',
         'gcore/main.c',
         'gcore/notes.c',
diff --git a/pkgs/os-specific/darwin/by-name/sy/system_cmds/package.nix b/pkgs/os-specific/darwin/by-name/sy/system_cmds/package.nix
index 28ca1c48c8c3..1fdb00d9a735 100644
--- a/pkgs/os-specific/darwin/by-name/sy/system_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/sy/system_cmds/package.nix
@@ -2,36 +2,23 @@
   lib,
   AvailabilityVersions,
   apple-sdk,
-  fetchFromGitHub,
   libutil,
   mkAppleDerivation,
   ncurses,
   openpam,
   pkg-config,
   sourceRelease,
-  stdenv,
   stdenvNoCC,
 }:
 
 let
-  # TODO(reckenrode): Remove on after the `sourceRelease` migration has been merged.
-  # system_cmds does not actually require private libdispatch APIs.
-  libdispatch = sourceRelease "libdispatch"; # Has to match the version of the SDK
-
   Libc = sourceRelease "Libc";
   libmalloc = sourceRelease "libmalloc";
   OpenDirectory = sourceRelease "OpenDirectory";
 
   libplatform = sourceRelease "libplatform";
 
-  # Needed for `posix_spawn_secflag_options`
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  xnu = fetchFromGitHub {
-    owner = "apple-oss-distributions";
-    repo = "xnu";
-    rev = "xnu-11417.121.6";
-    hash = "sha256-o4tCuCAIgAYg/Li3wTs12mVWr5C/4vbwu1zi+kJ9d6w=";
-  };
+  xnu = sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "system_cmds-deps-private-headers";
@@ -63,11 +50,6 @@ let
         '${xnu}/libsyscall/wrappers/spawn/spawn_private.h'
       touch "$out/include/btm.h"
 
-      cp -r '${libdispatch}/private' "$out/include/dispatch"
-      # Work around availability headers compatibility issue when building with an unprocessed SDK.
-      chmod -R u+w "$out/include/dispatch"
-      find "$out/include/dispatch" -name '*.h' -exec sed -i {} -e 's/, bridgeos([^)]*)//g' \;
-
       install -D -t "$out/include/System/i386" \
         '${xnu}/osfmk/i386/cpu_capabilities.h'
 
@@ -119,7 +101,7 @@ in
 mkAppleDerivation {
   releaseName = "system_cmds";
 
-  xcodeHash = "sha256-gdtn3zNIneZKy6+X0mQ51CFVLNM6JQYLbd/lotG5/Tw=";
+  xcodeHash = "sha256-/JFbwYJA2sx3F+ihyxemZX/LK3y5HLZSbQFDdvctzmQ=";
 
   patches = [
     # `posix_spawnattr_set_use_sec_transition_shims_np` is only available on macOS 15.2 or newer.
@@ -139,6 +121,10 @@ mkAppleDerivation {
       substituteInPlace $src \
         --replace-fail 'printw(tbuf)' 'printw("%s", tbuf);'
     done
+
+    # The libdispatch APIs it uses aren’t actually private. They’re available in the public headers.
+    substituteInPlace memory_pressure/memory_pressure.c \
+      --replace-fail '<dispatch/private.h>' '<dispatch/dispatch.h>'
   '';
 
   preConfigure = ''
diff --git a/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix b/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix
index 7a911463152d..8a757030dd9b 100644
--- a/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix
@@ -9,30 +9,18 @@
   ncurses,
   pkg-config,
   shell_cmds,
-  pkgs,
+  sourceRelease,
   stdenvNoCC,
   xz,
   zlib,
 }:
 
 let
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  Libc = bootstrapSourceRelease "Libc";
+  Libc = sourceRelease "Libc";
 
-  CommonCrypto = bootstrapSourceRelease "CommonCrypto";
-  libplatform = bootstrapSourceRelease "libplatform";
-  xnu = bootstrapSourceRelease "xnu";
+  CommonCrypto = sourceRelease "CommonCrypto";
+  libplatform = sourceRelease "libplatform";
+  xnu = sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "text_cmds-deps-private-headers";
diff --git a/pkgs/os-specific/darwin/by-name/to/top/package.nix b/pkgs/os-specific/darwin/by-name/to/top/package.nix
index 69418a6d9b6c..5133692d1e8b 100644
--- a/pkgs/os-specific/darwin/by-name/to/top/package.nix
+++ b/pkgs/os-specific/darwin/by-name/to/top/package.nix
@@ -3,23 +3,11 @@
   mkAppleDerivation,
   ncurses,
   pkg-config,
-  pkgs,
+  sourceRelease,
 }:
 
 let
-  f =
-    pkgs: prev:
-    if
-      !pkgs.stdenv.hostPlatform.isDarwin
-      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
-      || !(pkgs.stdenv ? __bootPackages)
-    then
-      prev.darwin.sourceRelease
-    else
-      f pkgs.stdenv.__bootPackages pkgs;
-  bootstrapSourceRelease = f pkgs pkgs;
-  # TODO(reckenrode): Use `sourceRelease` after migration has been merged and all releases updated to the same version.
-  xnu = bootstrapSourceRelease "xnu";
+  xnu = sourceRelease "xnu";
 in
 mkAppleDerivation {
   releaseName = "top";
diff --git a/pkgs/os-specific/darwin/by-name/xn/xnuHeaders/package.nix b/pkgs/os-specific/darwin/by-name/xn/xnuHeaders/package.nix
new file mode 100644
index 000000000000..c0f0a5394831
--- /dev/null
+++ b/pkgs/os-specific/darwin/by-name/xn/xnuHeaders/package.nix
@@ -0,0 +1,132 @@
+{
+  lib,
+  AvailabilityVersions,
+  apple-sdk,
+  bison,
+  bootstrap_cmds,
+  buildPackages,
+  flex,
+  gnum4,
+  mkAppleDerivation,
+  perl,
+  python3,
+  stdenv,
+  unifdef,
+}:
+
+mkAppleDerivation {
+  pname = "xnuHeaders";
+  releaseName = "xnu";
+
+  postPatch = ''
+    rm bsd/sys/make_symbol_aliasing.sh
+    substitute ${buildPackages.darwin.AvailabilityVersions}/libexec/make_symbol_aliasing.sh bsd/sys/make_symbol_aliasing.sh \
+      --replace-fail '--threshold $SDKROOT' ""
+    chmod a+x bsd/sys/make_symbol_aliasing.sh
+
+    substituteInPlace Makefile \
+      --replace-fail "/bin/" "" \
+      --replace-fail "MAKEJOBS := " '# MAKEJOBS := '
+
+    substituteInPlace makedefs/MakeInc.cmd \
+      --replace-fail "/usr/bin/" "" \
+      --replace-fail "/bin/" ""
+
+    substituteInPlace makedefs/MakeInc.def \
+      --replace-fail "-c -S -m" "-c -m" \
+      --replace-fail '-mno-implicit-sme' ""
+
+    substituteInPlace makedefs/MakeInc.top \
+      --replace-fail "MEMORY_SIZE := " 'MEMORY_SIZE := 1073741824 # '
+
+    # iig is closed-sourced, we don't have it
+    # create an empty file to the header instead
+    # this line becomes: echo "" > $@; echo --header ...
+    substituteInPlace iokit/DriverKit/Makefile \
+      --replace-fail '--def $<' '> $@; echo'
+
+    patchShebangs .
+  '';
+
+  nativeBuildInputs = [
+    AvailabilityVersions
+    bootstrap_cmds
+    bison
+    flex
+    gnum4
+    unifdef
+    perl
+    python3
+  ];
+
+  env = {
+    ARCHS = stdenv.hostPlatform.darwinArch;
+    ARCH_CONFIGS = stdenv.hostPlatform.darwinArch;
+    PLATFORM = "MacOSX";
+    RC_DARWIN_KERNEL_VERSION = "25.3.0";
+
+    DSTROOT = placeholder "out";
+
+    SDKROOT_RESOLVED = apple-sdk.sdkroot;
+    SDKVERSION = stdenv.hostPlatform.darwinMinVersion;
+
+    CTFCONVERT = "echo";
+    CTFINSERT = "echo";
+    CTFMERGE = "echo";
+    DSYMUTIL = "dsymutil";
+    IIG = "echo";
+    LIBTOOL = "echo";
+    LIPO = "echo";
+    MIG = "mig";
+    MIGCOM = "${lib.getBin buildPackages.darwin.bootstrap_cmds}/libexec/migcom";
+    NMEDIT = "echo";
+    UNIFDEF = "unifdef";
+
+    HOST_SDKROOT_RESOLVED = buildPackages.apple-sdk.sdkroot;
+    HOST_OS_VERSION = buildPackages.stdenv.hostPlatform.darwinMinVersion;
+
+    HOST_BISON = "bison";
+    HOST_CC = lib.getExe' buildPackages.clangStdenv.cc "${buildPackages.clangStdenv.cc.targetPrefix}clang";
+    HOST_CODESIGN = "echo";
+    HOST_CODESIGN_ALLOCATE = "echo";
+    HOST_FLEX = "flex";
+    HOST_GM4 = "m4";
+  };
+
+  buildFlags = [ "exporthdrs" ];
+  installTargets = [ "installhdrs" ];
+
+  # Remove public headers. `xnuHeaders` is meant to provide private headers needed to build packages.
+  # If you need public headers, use the correct SDK for the version you need.
+  postInstall = ''
+    mv "$out/System/Library" "$out"
+    rm -rf "$out/System" "$out/usr"
+
+    for framework in "$out/Library/Frameworks"/*; do
+      rm -rf "$framework/Versions/$ver/Headers" "$framework/Headers"
+
+      if [ ! -L "$framework/Versions/Current" ]; then
+        ver=$(ls -r "$framework/Versions" | head -n 1)
+        ln -s "$framework/Versions/$ver" "$framework/Versions/Current"
+      fi
+
+      ln -s "$framework/Versions/Current/PrivateHeaders" "$framework/PrivateHeaders"
+    done
+
+    # Set up the default `include` folder to include the private system headers plus availability headers.
+    mkdir -p "$out/include/sys"
+    gen-headers ${lib.getVersion apple-sdk} "$out"
+
+    for x in "$out/Library/Frameworks/System.framework/PrivateHeaders"/*; do
+      name=$(basename "$x")
+      if [ "$name" = "os" ] || [ "$name" = "sys" ]; then
+        for y in "$x"/*; do
+          dest="$out/include/$name/$(basename "$y")"
+          if [ ! -e "$dest" ]; then ln -s "$y" "$out/include/$name/$(basename "$y")"; fi
+        done
+      else
+        ln -s "$x" "$out/include/$(basename "$x")"
+      fi
+    done
+  '';
+}
diff --git a/pkgs/os-specific/darwin/sourceRelease/versions.json b/pkgs/os-specific/darwin/sourceRelease/versions.json
index cc0231d6ccbc..352df185452c 100644
--- a/pkgs/os-specific/darwin/sourceRelease/versions.json
+++ b/pkgs/os-specific/darwin/sourceRelease/versions.json
@@ -1,131 +1,131 @@
 {
   "AvailabilityVersions": {
-    "hash": "sha256-eQ46qHk4AuHA+hRZq1IG2UtvZr/X2vtlOvi6hnG+FyA=",
-    "version": "151"
+    "hash": "sha256-WcRJx/dt4DdEZ+lQBGgLwRYv1zlSwyNeKUTtuKH1fzE=",
+    "version": "155"
   },
   "CarbonHeaders": {
     "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
     "version": "18.1"
   },
   "CommonCrypto": {
-    "hash": "sha256-/VoOR9wJuKnmGE1CWGGXxX8SpmALHnEooNTa3QM+ITc=",
-    "version": "600028.100.1"
+    "hash": "sha256-+qAwL6+s7di9cX/qXtapLkjCFoDuZaSYltRJEG4qekM=",
+    "version": "600035"
   },
   "Csu": {
     "hash": "sha256-l8RI8aiin7ovZuoDh54thDmd/b502w+dtjN5ZoISZBg=",
     "version": "88"
   },
   "ICU": {
-    "hash": "sha256-dIgrTjHcQm8dy2Ku5wNIHuPjHfoV+48TM0PNDDn6ZPk=",
-    "version": "76104.4"
+    "hash": "sha256-qtv+IUEjdY5I87wDEIO9cWFAh1WmnIDVIzIyyL9NTd8=",
+    "version": "76142.3.1.1"
   },
   "IOAudioFamily": {
-    "hash": "sha256-VSk3jvsITJugtL67Qt0m4qJ879i7Fj6B/NGBFVCwpiU=",
-    "version": "540.3"
+    "hash": "sha256-A3iiAjjP29VdjMj40tLS5Q/ni4qeh9bBpnmNzeG2pIY=",
+    "version": "700.2"
   },
   "IOBDStorageFamily": {
-    "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=",
-    "version": "22"
+    "hash": "sha256-OcQUJ3nEfrpvWX/npnedJ4PECIGWFSLiM0PKoiH911w=",
+    "version": "26"
   },
   "IOCDStorageFamily": {
     "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=",
-    "version": "61"
+    "version": "62"
   },
   "IODVDStorageFamily": {
     "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=",
-    "version": "45"
+    "version": "46"
   },
   "IOFWDVComponents": {
     "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
     "version": "208"
   },
   "IOFireWireAVC": {
-    "hash": "sha256-IUytBKhhCgg0vtI+7q8d5kxpOUgO3tQD7TMy++jrorc=",
-    "version": "431"
+    "hash": "sha256-qR9lSTa7PN5Z9Nis4tfuXlcZGMIU48dete/NPD0UBbE=",
+    "version": "436"
   },
   "IOFireWireFamily": {
-    "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=",
-    "version": "487"
+    "hash": "sha256-hmErAXjLWIelqJaCrB8J4IiIxyB7S6EHFY+AY9YhmKQ=",
+    "version": "492"
   },
   "IOFireWireSBP2": {
-    "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=",
-    "version": "445"
+    "hash": "sha256-Xk+PDnUaO9q46nQwHwTKf/QXtGclfs0wTWiUbcV7e4s=",
+    "version": "454"
   },
   "IOFireWireSerialBusProtocolTransport": {
-    "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=",
-    "version": "260"
+    "hash": "sha256-cM/VFhVWNVwdJYk+mme0UYttQd7eJwd7Hlo7KNRyHY0=",
+    "version": "262"
   },
   "IOGraphics": {
-    "hash": "sha256-Ag37fd3tZJLXLVq1yzHOCWGOYYfwwTkC8hnvNaTEaWg=",
-    "version": "598"
+    "hash": "sha256-iysZE42mOKZbFxSZBNspaBTCRKEKK38DFGBxZWQxZxI=",
+    "version": "599"
   },
   "IOHIDFamily": {
-    "hash": "sha256-fmYTJsquAOBwzsgRmqPyjSJJi1hGcfnMmqLIcTe8W1s=",
-    "version": "2031.100.16"
+    "hash": "sha256-EJg5lL5uuFCzeOjKDeNZCRYlinwt4WDci0Lr8rJ4Q9k=",
+    "version": "2222.80.22"
   },
   "IOKitTools": {
     "hash": "sha256-Oknsvzn4nv77WU7f0WPS446iwR2BM2q4iw46r/qctAE=",
     "version": "125"
   },
   "IOKitUser": {
-    "hash": "sha256-1bqRiLvyr2GQfbWwhXHXXIOtIka9YDw5GbKV6bd2k4k=",
-    "version": "100076.101.1"
+    "hash": "sha256-bT6CIKd4/Ea17jWd74FWvz5dsmdyDRGU+D5/VydAjrA=",
+    "version": "100222.80.4"
   },
   "IONetworkingFamily": {
-    "hash": "sha256-J3cLeWKrQ8ypIaqgwRH9eU5JbjEDBVoezj3a2Lvwu5k=",
-    "version": "177"
+    "hash": "sha256-ZF5ML41Y1l1liQn32qTkcl4mMvx9Xdizb9VgvTzVTL4=",
+    "version": "186"
   },
   "IOSerialFamily": {
     "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
     "version": "93"
   },
   "IOStorageFamily": {
-    "hash": "sha256-cllpJX11c3CX8zEYdOT2TC63sx7NUAHh33yRHhrG2Ro=",
-    "version": "315"
+    "hash": "sha256-5oUSyzMxniNHG7rPkuxb31v4QcOmXNCriI3Jku2VOTY=",
+    "version": "333.40.1"
   },
   "IOUSBFamily": {
     "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
     "version": "630.4.5"
   },
   "Libc": {
-    "hash": "sha256-fxBM4KbPwQNVEJl7PCKP+1nUk9Oce/O2+0lVBxyngew=",
-    "version": "1592.100.35"
+    "hash": "sha256-3r3IFwONIg+4Oe99IRJ4jvyevZRmIuFmjVL+JMrfw/M=",
+    "version": "1725.40.4"
   },
   "Libinfo": {
-    "hash": "sha256-zZr6Mmou8Q+G6/wS+k0k7R+XirB94TNCUGS5dhi96ZE=",
-    "version": "583.0.1"
+    "hash": "sha256-4InBEPi0n2EMo/8mIBib1Im4iTKRcRJ4IlAcLCigVGk=",
+    "version": "600"
   },
   "Libm": {
     "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
     "version": "2026"
   },
   "Libnotify": {
-    "hash": "sha256-7X+6S3C7ZOTXJUeDXOOg5EmoZyLZvtE06x3Is0TGgSU=",
-    "version": "317.100.2"
+    "hash": "sha256-p8cJZlBYOFmI1NDHXGYjgcv8z9Ldc1amZuYlxxJfeVY=",
+    "version": "344.0.1"
   },
   "Librpcsvc": {
     "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=",
     "version": "31"
   },
   "Libsystem": {
-    "hash": "sha256-HsItciWrwyXujQ2hwqzv0JKOkkuynXYIqejLAEPJbMc=",
-    "version": "1345.100.2"
+    "hash": "sha256-/NlSwPaoTVx+bl9hYsfz3C5MuLdqGv4vdAh0KDbDKmY=",
+    "version": "1356"
   },
   "OpenDirectory": {
     "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
     "version": "146"
   },
   "PowerManagement": {
-    "hash": "sha256-ssg655SPT7gWnJWDaxambMKCopr+vLPYERW0IMKT0T8=",
-    "version": "1754.140.4"
+    "hash": "sha256-KqpAUjwqENbx3qPxhkK6OFARjBGSMEpaGz5ozo9vtSY=",
+    "version": "1846.81.1"
   },
   "Security": {
-    "hash": "sha256-NgTGbaw5JkpboDQpt1fSgUr9NYGS+bIOrEMQX7mLAME=",
-    "version": "61123.100.169"
+    "hash": "sha256-+Rt3+bwj7++u8Pm5V6QgIQUpugwcY2gjqkCWZ2xqGqw=",
+    "version": "61901.80.25"
   },
   "adv_cmds": {
-    "hash": "sha256-O+SB8sj3yqPv7GEBQQgvq+Y7kQRZI/i/UVa17J/OhZM=",
-    "version": "235"
+    "hash": "sha256-QSqEchXCBSUo6kpGb1FyCcrZx1RFfUP/9hoNbQK2lF8=",
+    "version": "237"
   },
   "architecture": {
     "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=",
@@ -140,116 +140,116 @@
     "version": "138"
   },
   "configd": {
-    "hash": "sha256-+3xesYxqfsNjWCW3T87OA7+Z1hBqmGEh/I8kP8Ajbso=",
-    "version": "1300.100.9"
+    "hash": "sha256-OJhJocVQvIaulSK65z2URATB+NTnFdOXyunjcBGr08k=",
+    "version": "1385.80.4"
   },
   "copyfile": {
-    "hash": "sha256-hIHlY0prIFY0j8z0Hvlv2psrwLj41jYfKBM0KutLxew=",
-    "version": "224"
+    "hash": "sha256-I9uDi5BDQKa7mO3XpHxv0d6PiROW2ueZ3vGfrsG0OJo=",
+    "version": "230.0.1.0.1"
   },
   "developer_cmds": {
-    "hash": "sha256-jgQUjN9zmqi0/7XpqzbRsJjZIYeMrxXT1Zf3qi7+o+8=",
-    "version": "83"
+    "hash": "sha256-4DDyWuRbxpwDLkbfJIwYp6DKcEDByDiGUmsdOmwq5fI=",
+    "version": "87"
   },
   "diskdev_cmds": {
-    "hash": "sha256-TD/sJkzIquTgq1zP/B7eBArxeTcp1Lqa8e8cJ1jnkHU=",
-    "version": "737.140.4"
+    "hash": "sha256-WDedl0pv/AReA96Gh+v2MwoX+QGrekK7YXEGw3aWB5Q=",
+    "version": "751.80.2"
   },
   "doc_cmds": {
     "hash": "sha256-nnwKXKKjgJXcLCArD38Dme2L1WyR1U0rwn7zI+NCftw=",
     "version": "69"
   },
   "dtrace": {
-    "hash": "sha256-04Q35rCKnM5Csv5poFJKpK0VplWq4hvy251/Cb2Kl80=",
-    "version": "401.100.3"
+    "hash": "sha256-5HpH6Cg8vWWzOX5ADD//izKDvqGnzV05Giju8lmGeyA=",
+    "version": "413"
   },
   "dyld": {
-    "hash": "sha256-pbpSD5OeSMOcMJFAd7kyLINPROjqsafsCSphVGyIPyg=",
-    "version": "1286.10"
+    "hash": "sha256-rvWFiQVLJKqL0hOL2nRqwRkyPc/OvGnL0GEBymq7Fio=",
+    "version": "1340"
   },
   "eap8021x": {
-    "hash": "sha256-Ky6KSlJhyX1NRufGhVBcp+ZFmqYrAxwC/5QvJhC2PhU=",
-    "version": "354.100.3"
+    "hash": "sha256-To9CIsN0oXRmtUjPojXYfUmaoOOdrNbq3AYwghxzoQs=",
+    "version": "368.60.2"
   },
   "file_cmds": {
-    "hash": "sha256-Rf/XA6uEaj7Wps2s8Oc/OhQVBjz8XiqJlj+cxjiQfQU=",
-    "version": "457.140.3"
+    "hash": "sha256-1hdTjg1Nf31gAhwjQEhRZQhaqayC8x7PGHAwZ1aEIm8=",
+    "version": "475"
   },
   "hfs": {
-    "hash": "sha256-+YUVOttZU7C8I14CC6t3ZH2KxAjjTA2nB0y5bPgLxZM=",
-    "version": "650.0.2"
+    "hash": "sha256-WqXzEVvveaOvTbVN/HzKdDxeHYmxEfLhV3WjO/S+u1E=",
+    "version": "704.60.4"
   },
   "launchd": {
     "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
     "version": "842.1.4"
   },
   "libclosure": {
-    "hash": "sha256-M/jnIHzKYvdFCO0tJ1JXiD/UcZtJhLIoulaCQQUbn30=",
-    "version": "90"
+    "hash": "sha256-pvwfcbeEJmTEPdt6/lgVswiabLRG+sMN6VT5FwG7C4Q=",
+    "version": "96"
   },
   "libdispatch": {
-    "hash": "sha256-igqIA5DMVHjG30WMHZZpYY7LRM9hZyMWItD+UxeTehY=",
-    "version": "1477.100.9"
+    "hash": "sha256-L0+Ho9dAlMXVpqFEGIcIMsJc0gULckRulUImNEZe5MU=",
+    "version": "1542.0.4"
   },
   "libffi": {
     "hash": "sha256-xHefZVsZg9kUXV0t/HLdjPkkD/hn/4bvdRVJ4PsQLeM=",
     "version": "40"
   },
   "libiconv": {
-    "hash": "sha256-50DC6LePtvdAh9FLa/esiwCUmYDxKofN6hCiv9+dmgQ=",
-    "version": "109.100.2"
+    "hash": "sha256-MboAwJvpO0ix7XsAuKUUxipv8ecxD2OjDgD5bQbygr8=",
+    "version": "113"
   },
   "libmalloc": {
-    "hash": "sha256-Sh4/z7lGWRMldOPURkP5vLOAb5Ou6AUsVJEWz9wk9hI=",
-    "version": "521.100.59"
+    "hash": "sha256-FYWPf6UwDfmWtde2xW1EuBfygv43bvzGncKEMUHY3Qc=",
+    "version": "792.80.2"
   },
   "libpcap": {
-    "hash": "sha256-DqINoombdui5N6lNHcZ07c7LrVum4f8fFK89ymdCd0c=",
-    "version": "140"
+    "hash": "sha256-G7CL3pCCmxOoZ+ouA+xfOeDgvLcT9AN9zyrx+cL2Ge4=",
+    "version": "144"
   },
   "libplatform": {
-    "hash": "sha256-gojt3sWOr7XO2yYI/B1CmNLTPFieSfoNtlOgQahOCok=",
-    "version": "316.100.10"
+    "hash": "sha256-m1g1suIbEA4g7vWEKYR9x+g0aaXSjvR0IRy4jCU+y0w=",
+    "version": "359.80.2"
   },
   "libpthread": {
-    "hash": "sha256-phjfN8+IU8ibPsflR6LktnSi3giy89ghI+cFyrhiQNo=",
-    "version": "519.101.1"
+    "hash": "sha256-3Xoe0gYZ6RbMZqzsAG8ynnFb3cqypFYImPNYA5H6P9s=",
+    "version": "539.80.3"
   },
   "libresolv": {
-    "hash": "sha256-GtPVlL1mD58um5hOFd3HQKQ7pqutBe9jZKgQw8pOkPE=",
-    "version": "91"
+    "hash": "sha256-SDdF7foz8DFUXmXEznwusNMkXFHrPkdLWQM8xfxb0gc=",
+    "version": "93"
   },
   "libutil": {
-    "hash": "sha256-tUsl22Z0HUVSkSoohFXkhicNFCW+RARvpTS0q6yaQFk=",
-    "version": "72"
+    "hash": "sha256-64+1CIRpYBon7skJRKdaXcxucPh9GrhAbUERhL2PLXA=",
+    "version": "73"
   },
   "mDNSResponder": {
-    "hash": "sha256-0ECbWeMnIRTsi03BeBEe5boyR/84JJPbxzPQze8hHSA=",
-    "version": "2200.100.94.0.2"
+    "hash": "sha256-Wa6IM6qz/gjO1GwER7KkPEiknEJbkntA2Q92Bc/YMoY=",
+    "version": "2881.80.4.0.1"
   },
   "mail_cmds": {
-    "hash": "sha256-ET1nga9nwgBtN7fuvsPs1yqe5OhQ62PVl7LxqbsAPqU=",
-    "version": "38.0.1"
+    "hash": "sha256-peoaHopJaYDqyE4TGfLx7W1K2KsFZmHLWr8Er/HpA90=",
+    "version": "41"
   },
   "misc_cmds": {
     "hash": "sha256-04uBS16nNrg73Fqh4Obev7nQDjTTlY4f5+pEv3i0FIU=",
     "version": "45"
   },
   "network_cmds": {
-    "hash": "sha256-sfZX6aA8mspfRKARIYFXX+bmlLHDoi485HQOvbRNP1Y=",
-    "version": "705.100.5"
+    "hash": "sha256-WlO668xfWOJk9QkTDJBqBVfXK52yg2Ofdjcdk6pQvIo=",
+    "version": "730.80.3"
   },
   "objc4": {
-    "hash": "sha256-eUVSpbyTEOMEdHoxSv6lZIZwB+cW/YWIaTZTcHgGOjo=",
-    "version": "912.3"
+    "hash": "sha256-imgOe9mr5HnvTAupIEj1UwS7tbmk3coqNf5BQgI32lE=",
+    "version": "951.1"
   },
   "patch_cmds": {
     "hash": "sha256-fDY2NOT3DnU5pm06cHSs+JJcA/EFP8Lxjg7sErUerJ0=",
     "version": "72"
   },
   "ppp": {
-    "hash": "sha256-8+QUA79sHf85yvGSPE9qCmGsrZDT3NZnbgZVroJw/Hg=",
-    "version": "1016"
+    "hash": "sha256-N8e3BvyxTvb+mAhNHuCWVGqEyEE89G2zNQDL/mro+X0=",
+    "version": "1023"
   },
   "remote_cmds": {
     "hash": "sha256-8c/NgQZ+K6jJ3aoYK78/BsEkM1gmRS+9z0437+SvcCw=",
@@ -257,26 +257,26 @@
   },
   "removefile": {
     "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=",
-    "version": "81"
+    "version": "84"
   },
   "shell_cmds": {
     "hash": "sha256-hoMssbZCrmzyJTgEAzOS4L7DhY9z/yXIcvHRhL6W5qc=",
     "version": "326"
   },
   "system_cmds": {
-    "hash": "sha256-mEo+v0m+aP42XHHwibGKPkT55JFYLTOD5YT5IYQ8Hr0=",
-    "version": "1026.140.2"
+    "hash": "sha256-OYLCu2pPe10apZEK5kgINcEvxRFFPYquPzcRNkvtJKI=",
+    "version": "1039"
   },
   "text_cmds": {
-    "hash": "sha256-5BBH/v1mJpExz65VDX6oh3dFCz49E+JMqJxkO96Y/xo=",
-    "version": "195"
+    "hash": "sha256-SDH74Pwy/kPiApisuUFBrDVQ7swCsinMK7zkpm82rnw=",
+    "version": "197"
   },
   "top": {
-    "hash": "sha256-e+k/jE49BMZZ24ge9JCa2ct5f1og6ewWb6U5ZMWdIEc=",
-    "version": "139.40.2"
+    "hash": "sha256-F+P7yRQw4qa73JmQrMVgy3lVQRDBrFDy9kkOUJ135ys=",
+    "version": "144"
   },
   "xnu": {
-    "hash": "sha256-j5Ep1RX5DTJqTGszrF4d/JtzUqZ6nA6XoExqcIQ0RVQ=",
-    "version": "10063.101.15"
+    "hash": "sha256-ci4Rsa1nRpS9qYBUxnaQokrtBzApGF/kQXugGusb9ok=",
+    "version": "12377.81.4"
   }
 }
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 336c70e2e29e..f1e46a32b9c1 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -2,6 +2,7 @@
   buildPackages,
   pkgsBuildBuild,
   callPackage,
+  writeText,
   perl,
   bison ? null,
   flex ? null,
@@ -165,9 +166,6 @@ lib.makeOverridable (
 
       generateConfig = ./generate-config.pl;
 
-      kernelConfig = kernelConfigFun intermediateNixConfig;
-      passAsFile = [ "kernelConfig" ];
-
       depsBuildBuild = [ buildPackages.stdenv.cc ];
       nativeBuildInputs = [
         perl
@@ -183,11 +181,7 @@ lib.makeOverridable (
         rustc-unwrapped
       ];
 
-      RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
-
-      # e.g. "defconfig"
-      kernelBaseConfig =
-        if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig or "defconfig";
+      env.RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
 
       makeFlags = import ./common-flags.nix {
         inherit
@@ -208,41 +202,50 @@ lib.makeOverridable (
 
       inherit (kernel) src patches;
 
-      buildPhase = ''
-        export buildRoot="''${buildRoot:-build}"
+      buildPhase =
+        let
+          # e.g. "defconfig"
+          kernelBaseConfig =
+            if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig or "defconfig";
+          kernelIntermediateConfig = writeText "kernel-intermediate-config" (
+            kernelConfigFun intermediateNixConfig
+          );
+        in
+        ''
+          export buildRoot="''${buildRoot:-build}"
 
-        # Get a basic config file for later refinement with $generateConfig.
-        make $makeFlags \
-            -C . O="$buildRoot" $kernelBaseConfig \
-            ARCH=$kernelArch CROSS_COMPILE=${stdenv.cc.targetPrefix} \
-            $makeFlags
+          # Get a basic config file for later refinement with $generateConfig.
+          make $makeFlags \
+              -C . O="$buildRoot" ${kernelBaseConfig} \
+              ARCH=$kernelArch CROSS_COMPILE=${stdenv.cc.targetPrefix} \
+              $makeFlags
 
-        # Create the config file.
-        echo "generating kernel configuration..."
-        ln -s "$kernelConfigPath" "$buildRoot/kernel-config"
-        DEBUG=1 ARCH=$kernelArch CROSS_COMPILE=${stdenv.cc.targetPrefix} \
-          KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \
-          PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. MAKE_FLAGS="$makeFlags" \
-          perl -w $generateConfig
-      ''
-      + lib.optionalString stdenv.cc.isClang ''
-        if ! grep -Fq CONFIG_CC_IS_CLANG=y $buildRoot/.config; then
-          echo "Kernel config didn't recognize the clang compiler?"
-          exit 1
-        fi
-      ''
-      + lib.optionalString stdenv.cc.bintools.isLLVM ''
-        if ! grep -Fq CONFIG_LD_IS_LLD=y $buildRoot/.config; then
-          echo "Kernel config didn't recognize the LLVM linker?"
-          exit 1
-        fi
-      ''
-      + lib.optionalString withRust ''
-        if ! grep -Fq CONFIG_RUST_IS_AVAILABLE=y $buildRoot/.config; then
-          echo "Kernel config didn't find Rust toolchain?"
-          exit 1
-        fi
-      '';
+          # Create the config file.
+          echo "generating kernel configuration..."
+          ln -s "${kernelIntermediateConfig}" "$buildRoot/kernel-config"
+          DEBUG=1 ARCH=$kernelArch CROSS_COMPILE=${stdenv.cc.targetPrefix} \
+            KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \
+            PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. MAKE_FLAGS="$makeFlags" \
+            perl -w $generateConfig
+        ''
+        + lib.optionalString stdenv.cc.isClang ''
+          if ! grep -Fq CONFIG_CC_IS_CLANG=y $buildRoot/.config; then
+            echo "Kernel config didn't recognize the clang compiler?"
+            exit 1
+          fi
+        ''
+        + lib.optionalString stdenv.cc.bintools.isLLVM ''
+          if ! grep -Fq CONFIG_LD_IS_LLD=y $buildRoot/.config; then
+            echo "Kernel config didn't recognize the LLVM linker?"
+            exit 1
+          fi
+        ''
+        + lib.optionalString withRust ''
+          if ! grep -Fq CONFIG_RUST_IS_AVAILABLE=y $buildRoot/.config; then
+            echo "Kernel config didn't find Rust toolchain?"
+            exit 1
+          fi
+        '';
 
       installPhase = "mv $buildRoot/.config $out";
 
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 956fe3e37b9d..39e145b1d5fe 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -13,23 +13,17 @@
   tracee,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libbpf";
-  version = "1.6.3";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "libbpf";
-    rev = "v${version}";
-    hash = "sha256-poLBZDogSL2ip90Es0xJ7X/xJ8+g9FJHnXSX0+N15es=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-F92msxkYp4yZA3qUoSwS5GKUhcEO6DrYNln7w6U+jt0=";
   };
 
-  patches = [
-    # Fix redefinition when using linux/netlink.h from libbpf with musl
-    # https://github.com/libbpf/libbpf/pull/919
-    ./sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch
-  ];
-
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     elfutils
@@ -75,6 +69,6 @@ stdenv.mkDerivation rec {
       martinetd
     ];
     platforms = lib.platforms.linux;
-    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libbpf_project" version;
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libbpf_project" finalAttrs.version;
   };
-}
+})
diff --git a/pkgs/os-specific/linux/libbpf/sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch b/pkgs/os-specific/linux/libbpf/sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch
deleted file mode 100644
index 70b17dd218ff..000000000000
--- a/pkgs/os-specific/linux/libbpf/sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 448f3f2e2065a5ef20010133dae58c5311ecc538 Mon Sep 17 00:00:00 2001
-From: Yureka <yuka@yuka.dev>
-Date: Sat, 23 Aug 2025 18:24:07 +0200
-Subject: [PATCH] sync: uapi: move constants from <linux/kernel.h> to
- <linux/const.h>
-
-This change was applied to the kernel tree in 2020 afaict, to fix redefinition issues with musl-libc.
-
-I ran into this issue while building with the headers included with libbpf, since it seems they were not synced since then.
-
-Signed-off-by: Yureka Lilian <yuka@yuka.dev>
----
- include/uapi/linux/netlink.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
-index b857821e3..e900b1f88 100644
---- a/include/uapi/linux/netlink.h
-+++ b/include/uapi/linux/netlink.h
-@@ -2,7 +2,7 @@
- #ifndef __LINUX_NETLINK_H
- #define __LINUX_NETLINK_H
- 
--#include <linux/kernel.h>
-+#include <linux/const.h>
- #include <linux/socket.h> /* for __kernel_sa_family_t */
- #include <linux/types.h>
- 
diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix
index 8a840541a28b..c288d56dcc03 100644
--- a/pkgs/os-specific/linux/lvm2/2_03.nix
+++ b/pkgs/os-specific/linux/lvm2/2_03.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "2.03.38";
-  hash = "sha256-Mi1Ev0DeMY5ua1LFaZmq64axbIJnGHrC4BpE1NxSaWA=";
+  version = "2.03.39";
+  hash = "sha256-I7yQZ+KP4NN7PMRB8oZbngIs48Ykur4ikYuN2QwDHug=";
 }
diff --git a/pkgs/os-specific/linux/lvm2/fix-blkdeactivate.patch b/pkgs/os-specific/linux/lvm2/fix-blkdeactivate.patch
index db8cfaeae9e3..3dd68b79000a 100644
--- a/pkgs/os-specific/linux/lvm2/fix-blkdeactivate.patch
+++ b/pkgs/os-specific/linux/lvm2/fix-blkdeactivate.patch
@@ -1,5 +1,3 @@
-diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
-index 7c517b87b..e51a33778 100644
 --- a/scripts/blkdeactivate.sh.in
 +++ b/scripts/blkdeactivate.sh.in
 @@ -34,11 +34,11 @@ TOOL=blkdeactivate
@@ -7,7 +5,7 @@ index 7c517b87b..e51a33778 100644
  SYS_BLK_DIR="/sys/block"
  
 -MDADM="/sbin/mdadm"
--MOUNTPOINT="/bin/mountpoint"
+-MOUNTPOINT="/usr/bin/mountpoint"
 -MPATHD="/sbin/multipathd"
 -UMOUNT="/bin/umount"
 -VDO="/bin/vdo"
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix
index dd69efc0c641..4ba20f13192e 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix
@@ -40,6 +40,7 @@ let
     "--host=${hostPlatform.config}"
     "--with-sysroot=/"
     "--disable-dependency-tracking"
+    "--disable-nls"
     "--enable-deterministic-archives"
     # depends on bison
     "--disable-gprofng"
@@ -112,4 +113,8 @@ bash.runCommand "${pname}-${version}"
 
     # Install
     make -j $NIX_BUILD_CORES install
+
+    # gprof/addr2line/elfedit + man pages are unused downstream.
+    rm -f $out/bin/gprof $out/bin/addr2line $out/bin/elfedit
+    rm -rf $out/share/info $out/share/man
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/binutils/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/binutils/static.nix
index 7f2405585a56..fd0681ca4d41 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/binutils/static.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/binutils/static.nix
@@ -40,6 +40,7 @@ let
     "--host=${hostPlatform.config}"
 
     "--disable-dependency-tracking"
+    "--disable-nls"
 
     "--with-sysroot=/"
     "--enable-deterministic-archives"
@@ -100,4 +101,8 @@ bash.runCommand "${pname}-${version}"
     # Install
     # strip to remove build dependency store path references
     make -j $NIX_BUILD_CORES install-strip
+
+    # gprof/addr2line/elfedit + man pages are unused downstream.
+    rm -f $out/bin/gprof $out/bin/addr2line $out/bin/elfedit
+    rm -rf $out/share/info $out/share/man
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix
index 80418bbb3ce0..1eb87b40cdae 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix
@@ -15,11 +15,11 @@
 let
   inherit (import ./common.nix { inherit lib; }) meta;
   pname = "bootstrap-coreutils-musl";
-  version = "9.9";
+  version = "9.10";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/coreutils-${version}.tar.gz";
-    hash = "sha256-kacZ/Pkj3mhgFvLI0ISovh95PzQXOGEnPEZo98Za+Uo=";
+    hash = "sha256-4L3h+2hQlEf8cjzyUX6KjH+kZ2mRm7dJDtNQoukjhWI=";
   };
 
   configureFlags = [
@@ -27,15 +27,13 @@ let
     "--build=${buildPlatform.config}"
     "--host=${hostPlatform.config}"
     "--disable-dependency-tracking"
+    "--disable-nls"
     # libstdbuf.so fails in static builds
     "--enable-no-install-program=stdbuf,arch,coreutils,hostname"
     # Disable PATH_MAX for better reproducibility
     "gl_cv_func_getcwd_path_max=\"no, but it is partly working\""
     "gl_cv_have_unlimited_file_name_length=no"
 
-    # test crashes bash-2.05b?
-    "gl_cv_func_pthread_rwlock_good_waitqueue=no"
-
     # depends on linux/version.h, which is not present at this stage
     "gl_cv_func_copy_file_range=no"
     "gl_cv_onwards_func_copy_file_range=no"
@@ -82,4 +80,7 @@ bash.runCommand "${pname}-${version}"
 
     # Install
     make -j $NIX_BUILD_CORES install MAKEINFO="true" SUBDIRS=.
+
+    # Remove documentation not needed in the bootstrap chain.
+    rm -rf $out/share/info $out/share/man
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/static.nix
index 680d954cc337..22eca3a3c873 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/coreutils/static.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/coreutils/static.nix
@@ -20,11 +20,11 @@
 let
   inherit (import ./common.nix { inherit lib; }) meta;
   pname = "coreutils-static";
-  version = "9.9";
+  version = "9.10";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/coreutils-${version}.tar.gz";
-    hash = "sha256-kacZ/Pkj3mhgFvLI0ISovh95PzQXOGEnPEZo98Za+Uo=";
+    hash = "sha256-4L3h+2hQlEf8cjzyUX6KjH+kZ2mRm7dJDtNQoukjhWI=";
   };
 
   configureFlags = [
@@ -32,6 +32,7 @@ let
     "--build=${buildPlatform.config}"
     "--host=${hostPlatform.config}"
     "--disable-dependency-tracking"
+    "--disable-nls"
     # libstdbuf.so fails in static builds
     "--enable-no-install-program=stdbuf"
     "--enable-single-binary=symlinks"
@@ -77,4 +78,7 @@ bash.runCommand "${pname}-${version}"
 
     # Install
     make -j $NIX_BUILD_CORES install-strip
+
+    # Remove documentation not needed in the bootstrap chain.
+    rm -rf $out/share/info $out/share/man
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gawk/mes.nix b/pkgs/os-specific/linux/minimal-bootstrap/gawk/mes.nix
index cbe4da046058..c38f3501462c 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gawk/mes.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gawk/mes.nix
@@ -67,6 +67,7 @@ bash.runCommand "${pname}-${version}"
       --prefix=$out
 
     # Build
+    # NOTE: parallel build (-j) breaks gawk autoconf'd Makefile under tcc-mes; keep serial.
     make gawk
 
     # Install
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/10.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/10.nix
index 2823fdc10050..090b939acd7f 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/10.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/10.nix
@@ -139,12 +139,21 @@ bash.runCommand "${pname}-${version}"
       --with-native-system-header-dir=/include \
       --with-sysroot=${musl} \
       --enable-languages=c,c++ \
+      --enable-checking=release \
       --disable-bootstrap \
       --disable-dependency-tracking \
       --disable-libmpx \
       --disable-libsanitizer \
+      --disable-libssp \
+      --disable-libgomp \
+      --disable-libquadmath \
+      --disable-libitm \
+      --disable-libvtv \
+      --disable-libatomic \
+      --disable-libstdcxx-pch \
       --disable-lto \
       --disable-multilib \
+      --disable-nls \
       --disable-plugin
 
     # Build
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix
index 7404bc4e9c24..0f442367f72f 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix
@@ -142,16 +142,21 @@ bash.runCommand "${pname}-${version}"
       --with-native-system-header-dir=${musl}/include \
       --with-build-sysroot=${musl} \
       --enable-languages=c,c++ \
+      --enable-checking=release \
       --disable-bootstrap \
       --disable-dependency-tracking \
+      --disable-libgomp \
       --disable-libmudflap \
+      --disable-libquadmath \
+      --disable-libssp \
       --disable-libstdcxx-pch \
       --disable-lto \
-      --disable-multilib
+      --disable-multilib \
+      --disable-nls
 
     # Build
     make -j $NIX_BUILD_CORES
 
     # Install
-    make -j $NIX_BUILD_CORES install
+    make -j $NIX_BUILD_CORES install-strip
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix
index 7814fc9b1bc1..d9c37f5a0562 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix
@@ -124,6 +124,7 @@ bash.runCommand "${pname}-${version}"
       --host=${fakeHostPlatform} \
       --with-native-system-header-dir=${tinycc.libs}/include \
       --with-build-sysroot=${tinycc.libs}/include \
+      --enable-checking=release \
       --disable-bootstrap \
       --disable-decimal-float \
       --disable-dependency-tracking \
@@ -139,6 +140,7 @@ bash.runCommand "${pname}-${version}"
       --disable-lto \
       --disable-lto-plugin \
       --disable-multilib \
+      --disable-nls \
       --disable-plugin \
       --disable-threads \
       --enable-languages=c \
@@ -152,5 +154,5 @@ bash.runCommand "${pname}-${version}"
     make -j $NIX_BUILD_CORES
 
     # Install
-    make -j $NIX_BUILD_CORES install
+    make -j $NIX_BUILD_CORES install-strip
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/glibc.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/glibc.nix
index b91f1af133d5..890098aa66b9 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/glibc.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/glibc.nix
@@ -133,11 +133,20 @@ bash.runCommand "${pname}-${version}"
       --host=${hostPlatform.config} \
       --with-native-system-header-dir=${glibc}/include \
       --enable-languages=c,c++ \
+      --enable-checking=release \
       --disable-bootstrap \
       --disable-dependency-tracking \
       --disable-libsanitizer \
+      --disable-libssp \
+      --disable-libgomp \
+      --disable-libquadmath \
+      --disable-libitm \
+      --disable-libvtv \
+      --disable-libatomic \
+      --disable-libstdcxx-pch \
       --disable-lto \
       --disable-multilib \
+      --disable-nls \
       --disable-plugin \
       --with-specs="%x{-dynamic-linker=${glibc}/lib/${linkerName}} %x{-L${glibc}/lib/} -B${glibc}/lib"
 
@@ -146,4 +155,7 @@ bash.runCommand "${pname}-${version}"
 
     # Install
     make -j $NIX_BUILD_CORES install-strip
+
+    # libstdc++ gdb pretty-printers + man pages are unused downstream.
+    rm -rf $out/share/gcc-*/python $out/share/man $out/share/info
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix
index 3eb77a635a20..e55acf5caecd 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix
@@ -134,11 +134,20 @@ bash.runCommand "${pname}-${version}"
       --with-native-system-header-dir=/include \
       --with-sysroot=${musl} \
       --enable-languages=c,c++ \
+      --enable-checking=release \
       --disable-bootstrap \
       --disable-dependency-tracking \
       --disable-libsanitizer \
+      --disable-libssp \
+      --disable-libgomp \
+      --disable-libquadmath \
+      --disable-libitm \
+      --disable-libvtv \
+      --disable-libatomic \
+      --disable-libstdcxx-pch \
       --disable-lto \
       --disable-multilib \
+      --disable-nls \
       --disable-plugin
 
     # Build
@@ -146,4 +155,7 @@ bash.runCommand "${pname}-${version}"
 
     # Install
     make -j $NIX_BUILD_CORES install-strip
+
+    # libstdc++ gdb pretty-printers + man pages are unused downstream.
+    rm -rf $out/share/gcc-*/python $out/share/man $out/share/info
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix
index 15680da46757..a9694d349f5e 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix
@@ -112,4 +112,8 @@ bash.runCommand "${pname}-${version}"
     make -j $NIX_BUILD_CORES INSTALL_UNCOMPRESSED=yes install
     ln -s $(ls -d ${linux-headers}/include/* | grep -v scsi\$) $out/include/
     find $out/{bin,sbin,lib,libexec} -type f -exec strip --strip-unneeded {} + || true
+
+    # localedef + iconv() are never invoked downstream of this glibc
+    rm -rf $out/share/i18n $out/lib/gconv $out/share/locale
+    rm -rf $out/bin $out/sbin
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnugrep/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnugrep/default.nix
index 944f11e4e639..5534fa043044 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnugrep/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnugrep/default.nix
@@ -50,6 +50,7 @@ bash.runCommand "${pname}-${version}"
     cp ${./main.mk} Makefile
 
     # Build
+    # NOTE: parallel build (-j) breaks custom Makefile here; keep serial.
     make CC="tcc -B ${tinycc.libs}/lib"
 
     # Install
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnum4/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnum4/default.nix
index 2445452ecf03..71ff15627feb 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnum4/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnum4/default.nix
@@ -14,15 +14,16 @@
   diffutils,
   findutils,
   gnutar,
+  linux-headers,
   xz,
 }:
 let
   pname = "gnum4";
-  version = "1.4.20";
+  version = "1.4.21";
 
   src = fetchurl {
     url = "mirror://gnu/m4/m4-${version}.tar.xz";
-    hash = "sha256-4jbqOhzPX2wnCxxLtgcm83H6SUWajqrryQshazKNrys=";
+    hash = "sha256-8lxqtRVIpzp1VYdC+wMeBiXWSF/l+RVZSdZIaiQIq2Y=";
   };
 in
 bash.runCommand "${pname}-${version}"
@@ -70,7 +71,8 @@ bash.runCommand "${pname}-${version}"
       --build=${buildPlatform.config} \
       --host=${hostPlatform.config} \
       --disable-dependency-tracking \
-      CC=musl-gcc
+      CC=musl-gcc \
+      CFLAGS=-I${linux-headers}/include
 
     # Build
     make -j $NIX_BUILD_CORES
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/musl.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/musl.nix
index 073e5a29f6f0..1913ce85927b 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/musl.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/musl.nix
@@ -72,6 +72,7 @@ bash.runCommand "${pname}-${version}"
       --disable-dependency-tracking
 
     # Build
+    # NOTE: parallel build (-j) under tcc-musl is unstable; keep serial.
     make AR="tcc -ar"
 
     # Install
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix
index c25aea845b58..267f1f12dd20 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnused/default.nix
@@ -65,6 +65,7 @@ bash.runCommand "${pname}-${version}"
       --prefix=$out
 
     # Build
+    # NOTE: parallel build (-j) under tcc-musl is unstable; keep serial.
     make AR="tcc -ar"
 
     # Install
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnutar/mes.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnutar/mes.nix
index 1200904a87ac..2580347d7102 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnutar/mes.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnutar/mes.nix
@@ -55,6 +55,7 @@ bash.runCommand "${pname}-${version}"
       --prefix=$out
 
     # Build
+    # NOTE: parallel build (-j) breaks gnutar build under tcc-mes; keep serial.
     make AR="tcc -ar"
 
     # Install
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnutar/musl.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnutar/musl.nix
index d450cf1ef92a..c3e967ebe53d 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnutar/musl.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnutar/musl.nix
@@ -60,6 +60,7 @@ bash.runCommand "${pname}-${version}"
       --disable-nls
 
     # Build
+    # NOTE: parallel build (-j) under tcc-musl is unstable; keep serial.
     make AR="tcc -ar"
 
     # Install
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gzip/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gzip/default.nix
index ccadfb2796c8..bfc36fb6714f 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gzip/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gzip/default.nix
@@ -55,6 +55,7 @@ bash.runCommand "${pname}-${version}"
       --disable-dependency-tracking
 
     # Build
+    # NOTE: parallel build (-j) under tinycc-bootstrappable is unstable; keep serial.
     make
 
     # Install
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/tcc.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/tcc.nix
index 0c379fee1509..a95d50c2b7f4 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/musl/tcc.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/tcc.nix
@@ -88,6 +88,7 @@ bash.runCommand "${pname}-${version}"
       CC=tcc
 
     # Build
+    # NOTE: parallel build (-j) under tcc here is unstable and broke a previous run.
     make AR="tcc -ar" RANLIB=true CFLAGS="-DSYSCALL_NO_TLS"
 
     # Install
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/python/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/python/default.nix
index 76e328889177..bc12245fd9db 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/python/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/python/default.nix
@@ -20,11 +20,11 @@
 }:
 let
   pname = "python";
-  version = "3.14.2";
+  version = "3.14.4";
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    hash = "sha256-zlQ6uFS8JWthtx6bJ/gx/9G/1gpHnWOfi+f5dXz1c+k=";
+    hash = "sha256-2SPFEwPjjiSRNvwb3zVo1W7LAyFO/e9IUWF209f6rvg=";
   };
 
   patches = [
@@ -88,11 +88,44 @@ bash.runCommand "${pname}-${version}"
     bash ./configure \
       --prefix=$out \
       --build=${buildPlatform.config} \
-      --host=${hostPlatform.config}
+      --host=${hostPlatform.config} \
+      --disable-test-modules \
+      --without-ensurepip \
+      --without-static-libpython
 
     # Build
     make -j $NIX_BUILD_CORES
 
     # Install
     make -j $NIX_BUILD_CORES install
+
+    # Remove lib-dynload extension modules not needed for glibc's build scripts.
+    # glibc uses Python only for scripts that import: os, re, subprocess, argparse,
+    # pathlib, collections, tempfile.  Following the import chain:
+    #   subprocess -> selectors -> math, select, fcntl, _posixsubprocess
+    #   pathlib -> grp
+    #   tempfile -> random -> _random, bisect -> _bisect
+    # Everything else in lib-dynload is dead weight in the bootstrap context.
+    find $out/lib/python*/lib-dynload -name '*.so' \
+      ! -name '_bisect*' \
+      ! -name '_posixsubprocess*' \
+      ! -name '_random*' \
+      ! -name 'fcntl*' \
+      ! -name 'grp*' \
+      ! -name 'math*' \
+      ! -name 'select*' \
+      -delete
+
+    rm -rf \
+      $out/lib/python*/ensurepip \
+      $out/lib/python*/idlelib \
+      $out/lib/python*/site-packages \
+      $out/lib/python*/test \
+      $out/lib/python*/tkinter \
+      $out/lib/python*/turtledemo \
+      $out/share/man
+
+    rm -f $out/bin/idle* $out/bin/pip*
+    find $out/lib/python* -type d -name __pycache__ -prune -exec rm -rf {} +
+    strip --strip-unneeded $out/bin/python${lib.versions.majorMinor version} $out/lib/python*/lib-dynload/*.so || true
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix
index f9ea575ebf0c..b82699af95db 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix
@@ -14,14 +14,11 @@
 }:
 let
   pname = "xz";
-
-  # At least versions 5.6.4 and 5.8.2 crash with spurious OoM when decompressing
-  # certain tarballs, when compiled with tcc.
-  version = "5.4.7";
+  version = "5.8.3";
 
   src = fetchurl {
     url = "https://tukaani.org/xz/xz-${version}.tar.gz";
-    hash = "sha256-jbZmTEjKB5CLkrrtz+fzuiP0nvJHaGRRirXbZyODbnE=";
+    hash = "sha256-PToblzryGBFPT4ibuqL0wDfequDI6BXuw4HD1Ua5dKA=";
   };
 in
 bash.runCommand "${pname}-${version}"
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix
index d1655151722e..d7eec96dff2a 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix
@@ -16,11 +16,11 @@
 }:
 let
   pname = "xz";
-  version = "5.8.2";
+  version = "5.8.3";
 
   src = fetchurl {
     url = "https://tukaani.org/xz/xz-${version}.tar.gz";
-    hash = "sha256-zgnFCllieGuD5do4nJDdLBXs0JgKJY3QH3D5585YqPE=";
+    hash = "sha256-PToblzryGBFPT4ibuqL0wDfequDI6BXuw4HD1Ua5dKA=";
   };
 in
 bash.runCommand "${pname}-${version}"
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/zlib/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/zlib/default.nix
index b91645e9c5d4..845f49a48157 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/zlib/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/zlib/default.nix
@@ -13,11 +13,11 @@
 }:
 let
   pname = "zlib";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "https://github.com/madler/zlib/releases/download/v${version}/zlib-${version}.tar.xz";
-    hash = "sha256-OO+WuN/lENQnB9nHgYd5FHklQRM+GHCEFGO/pz+IPjI=";
+    hash = "sha256-16BlR4Ok2lKdG7eTt62cMxgCCvd2Z7yuNfldDkKnkvM=";
   };
 in
 bash.runCommand "${pname}-${version}"
diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0001-Don-t-try-to-unmount-nix-or-nix-store.patch
similarity index 100%
rename from pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
rename to pkgs/os-specific/linux/systemd/0001-Don-t-try-to-unmount-nix-or-nix-store.patch
diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
deleted file mode 100644
index 02845eb126f6..000000000000
--- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Tue, 8 Jan 2013 15:46:30 +0100
-Subject: [PATCH] Start device units for uninitialised encrypted devices
-
-This is necessary because the NixOS service that initialises the
-filesystem depends on the appearance of the device unit.  Also, this
-makes more sense to me: the device is ready; it's the filesystem
-that's not, but taking care of that is the responsibility of the mount
-unit.  (However, this ignores the fsck unit, so it's not perfect...)
----
- rules.d/99-systemd.rules.in | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
-index bebc4d7d09..60278a0da7 100644
---- a/rules.d/99-systemd.rules.in
-+++ b/rules.d/99-systemd.rules.in
-@@ -30,10 +30,6 @@ SUBSYSTEM=="block", ACTION=="add", KERNEL=="dm-*", ENV{DM_NAME}!="?*", ENV{SYSTE
- # Import previous SYSTEMD_READY state.
- SUBSYSTEM=="block", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}=="", IMPORT{db}="SYSTEMD_READY"
- 
--# Ignore encrypted devices with no identified superblock on it, since
--# we are probably still calling mke2fs or mkswap on it.
--SUBSYSTEM=="block", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
--
- # Ignore raid devices that are not yet assembled and started
- SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
- SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
diff --git a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0002-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
similarity index 98%
rename from pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
rename to pkgs/os-specific/linux/systemd/0002-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index 71c25227d4dc..a9ec66f9dd3d 100644
--- a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -103,7 +103,7 @@ index ae1899593c..20d3071114 100644
                  return log_error_errno(r, "Failed to create /etc/localtime symlink: %m");
  
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index a0052c1c88..cd4a48c9ef 100644
+index 84e94e845a..8e1f1a6ea2 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
 @@ -1856,8 +1856,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
@@ -118,7 +118,7 @@ index a0052c1c88..cd4a48c9ef 100644
  
  static bool etc_writable(void) {
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 1455830cba..6849ada033 100644
+index 43cf3fddb9..dc23550500 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
 @@ -268,7 +268,7 @@ static int context_read_data(Context *c) {
diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
deleted file mode 100644
index fc80edc766cf..000000000000
--- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Wed, 16 Apr 2014 10:59:28 +0200
-Subject: [PATCH] Fix NixOS containers
-
-In NixOS containers, the init script is bind-mounted into the
-container, so checking early whether it exists will fail.
----
- src/nspawn/nspawn.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 84e94e845a..a0052c1c88 100644
---- a/src/nspawn/nspawn.c
-+++ b/src/nspawn/nspawn.c
-@@ -6368,6 +6368,7 @@ static int run(int argc, char *argv[]) {
-                                 goto finish;
-                         }
-                 } else {
-+#if 0
-                         _cleanup_free_ char *p = NULL;
- 
-                         if (arg_pivot_root_new)
-@@ -6387,6 +6388,7 @@ static int run(int argc, char *argv[]) {
-                                 log_error_errno(r, "Unable to determine if %s looks like it has an OS tree (i.e. whether /usr/ exists): %m", arg_directory);
-                                 goto finish;
-                         }
-+#endif
-                 }
- 
-                 if (userns_fd >= 0) {
diff --git a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0003-add-rootprefix-to-lookup-dir-paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
rename to pkgs/os-specific/linux/systemd/0003-add-rootprefix-to-lookup-dir-paths.patch
diff --git a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
deleted file mode 100644
index 6ba6bcffd76c..000000000000
--- a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Raito Bezarius <masterancpp@gmail.com>
-Date: Mon, 19 Jun 2023 02:13:42 +0200
-Subject: [PATCH] Add some NixOS-specific unit directories
-
-Look in `/nix/var/nix/profiles/default/lib/systemd/{system,user}` for
-units provided by packages installed into the default profile via
-`nix-env -iA nixos.$package`.
-
-Also, remove /usr and /lib as these don't exist on NixOS.
-
-Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
----
- src/core/systemd.pc.in               |  8 ++++----
- src/libsystemd/sd-path/path-lookup.c | 20 +++-----------------
- 2 files changed, 7 insertions(+), 21 deletions(-)
-
-diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index 862d57dcb6..8ba0ca4486 100644
---- a/src/core/systemd.pc.in
-+++ b/src/core/systemd.pc.in
-@@ -46,10 +46,10 @@ systemdsystemconfdir=${systemd_system_conf_dir}
- systemd_user_conf_dir=${sysconfdir}/systemd/user
- systemduserconfdir=${systemd_user_conf_dir}
- 
--systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system
-+systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemd_system_unit_dir}
- systemdsystemunitpath=${systemd_system_unit_path}
- 
--systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user
-+systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemd_user_unit_dir}
- systemduserunitpath=${systemd_user_unit_path}
- 
- systemd_system_generator_dir=${prefix}/lib/systemd/system-generators
-@@ -58,10 +58,10 @@ systemdsystemgeneratordir=${systemd_system_generator_dir}
- systemd_user_generator_dir=${prefix}/lib/systemd/user-generators
- systemdusergeneratordir=${systemd_user_generator_dir}
- 
--systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemd_system_generator_dir}
-+systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:${systemd_system_generator_dir}
- systemdsystemgeneratorpath=${systemd_system_generator_path}
- 
--systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:/usr/local/lib/systemd/user-generators:${systemd_user_generator_dir}
-+systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:${systemd_user_generator_dir}
- systemdusergeneratorpath=${systemd_user_generator_path}
- 
- systemd_sleep_dir=${prefix}/lib/systemd/system-sleep
-diff --git a/src/libsystemd/sd-path/path-lookup.c b/src/libsystemd/sd-path/path-lookup.c
-index 32c14fb14a..7f0bf62844 100644
---- a/src/libsystemd/sd-path/path-lookup.c
-+++ b/src/libsystemd/sd-path/path-lookup.c
-@@ -102,11 +102,7 @@ int runtime_directory(RuntimeScope scope, const char *fallback_suffix, char **re
- }
- 
- static const char* const user_data_unit_paths[] = {
--        "/usr/local/lib/systemd/user",
--        "/usr/local/share/systemd/user",
-         USER_DATA_UNIT_DIR,
--        "/usr/lib/systemd/user",
--        "/usr/share/systemd/user",
-         NULL
- };
- 
-@@ -519,16 +515,13 @@ int lookup_paths_init(
-                                        persistent_config,
-                                        SYSTEM_CONFIG_UNIT_DIR,
-                                        "/etc/systemd/system",
-+                                       "/nix/var/nix/profiles/default/lib/systemd/system",
-                                        ASSERT_PTR(persistent_attached),
-                                        ASSERT_PTR(runtime_config),
-                                        "/run/systemd/system",
-                                        ASSERT_PTR(runtime_attached),
-                                        STRV_IFNOTNULL(generator),
--                                       "/usr/local/lib/systemd/system",
-                                        SYSTEM_DATA_UNIT_DIR,
--                                       "/usr/lib/systemd/system",
--                                       /* To be used ONLY for images which might be legacy split-usr */
--                                       FLAGS_SET(flags, LOOKUP_PATHS_SPLIT_USR) ? "/lib/systemd/system" : STRV_IGNORE,
-                                        STRV_IFNOTNULL(generator_late));
-                         break;
- 
-@@ -546,13 +539,10 @@ int lookup_paths_init(
-                         add = strv_new(persistent_config,
-                                        USER_CONFIG_UNIT_DIR,
-                                        "/etc/systemd/user",
-+                                       "/nix/var/nix/profiles/default/lib/systemd/user",
-                                        ASSERT_PTR(runtime_config),
-                                        "/run/systemd/user",
--                                       "/usr/local/share/systemd/user",
--                                       "/usr/share/systemd/user",
--                                       "/usr/local/lib/systemd/user",
--                                       USER_DATA_UNIT_DIR,
--                                       "/usr/lib/systemd/user");
-+                                       USER_DATA_UNIT_DIR);
-                         break;
- 
-                 case RUNTIME_SCOPE_USER:
-@@ -692,7 +682,6 @@ void lookup_paths_log(LookupPaths *lp) {
- static const char* const system_generator_paths[] = {
-         "/run/systemd/system-generators",
-         "/etc/systemd/system-generators",
--        "/usr/local/lib/systemd/system-generators",
-         SYSTEM_GENERATOR_DIR,
-         NULL,
- };
-@@ -700,7 +689,6 @@ static const char* const system_generator_paths[] = {
- static const char* const user_generator_paths[] = {
-         "/run/systemd/user-generators",
-         "/etc/systemd/user-generators",
--        "/usr/local/lib/systemd/user-generators",
-         USER_GENERATOR_DIR,
-         NULL,
- };
-@@ -708,7 +696,6 @@ static const char* const user_generator_paths[] = {
- static const char* const system_env_generator_paths[] = {
-         "/run/systemd/system-environment-generators",
-         "/etc/systemd/system-environment-generators",
--        "/usr/local/lib/systemd/system-environment-generators",
-         SYSTEM_ENV_GENERATOR_DIR,
-         NULL,
- };
-@@ -716,7 +703,6 @@ static const char* const system_env_generator_paths[] = {
- static const char* const user_env_generator_paths[] = {
-         "/run/systemd/user-environment-generators",
-         "/etc/systemd/user-environment-generators",
--        "/usr/local/lib/systemd/user-environment-generators",
-         USER_ENV_GENERATOR_DIR,
-         NULL,
- };
diff --git a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0004-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
similarity index 100%
rename from pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
rename to pkgs/os-specific/linux/systemd/0004-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
diff --git a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
deleted file mode 100644
index 112f3f509f54..000000000000
--- a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Mon, 11 May 2015 15:39:38 +0200
-Subject: [PATCH] Get rid of a useless message in user sessions
-
-Namely lots of variants of
-
-  Unit nix-var-nix-db.mount is bound to inactive unit dev-disk-by\x2dlabel-nixos.device. Stopping, too.
-
-in containers.
----
- src/core/manager.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/manager.c b/src/core/manager.c
-index 79fa19d976..2115d74595 100644
---- a/src/core/manager.c
-+++ b/src/core/manager.c
-@@ -1579,7 +1579,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
-                 if (!unit_is_bound_by_inactive(u, &culprit))
-                         continue;
- 
--                log_unit_debug(u, "Unit is stopped because bound to inactive unit %s.", culprit->id);
-+                if (u->type != UNIT_MOUNT || detect_container() <= 0)
-+                        log_unit_debug(u, "Unit is stopped because bound to inactive unit %s.", culprit->id);
- 
-                 /* If stopping a unit fails continuously we might enter a stop loop here, hence stop acting on the
-                  * service being unnecessary after a while. */
diff --git a/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch b/pkgs/os-specific/linux/systemd/0005-core-don-t-taint-on-unmerged-usr.patch
similarity index 100%
rename from pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch
rename to pkgs/os-specific/linux/systemd/0005-core-don-t-taint-on-unmerged-usr.patch
diff --git a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
deleted file mode 100644
index 2abe659a42bf..000000000000
--- a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gabriel Ebner <gebner@gebner.org>
-Date: Sun, 6 Dec 2015 14:26:36 +0100
-Subject: [PATCH] hostnamed, localed, timedated: disable methods that change
- system settings.
-
----
- src/hostname/hostnamed.c |  6 ++++++
- src/locale/localed.c     |  9 +++++++++
- src/timedate/timedated.c | 10 ++++++++++
- 3 files changed, 25 insertions(+)
-
-diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index 04c72e8137..1f9f296d56 100644
---- a/src/hostname/hostnamed.c
-+++ b/src/hostname/hostnamed.c
-@@ -1421,6 +1421,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
-         if (r < 0)
-                 return r;
- 
-+        return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
-+            "Changing system settings via systemd is not supported on NixOS.");
-+
-         name = empty_to_null(name);
- 
-         context_read_etc_hostname(c);
-@@ -1487,6 +1490,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
-         if (r < 0)
-                 return r;
- 
-+        return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
-+            "Changing system settings via systemd is not supported on NixOS.");
-+
-         name = empty_to_null(name);
- 
-         context_read_machine_info(c);
-diff --git a/src/locale/localed.c b/src/locale/localed.c
-index 041ba29cd8..02fbe3e278 100644
---- a/src/locale/localed.c
-+++ b/src/locale/localed.c
-@@ -221,6 +221,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
- 
-         use_localegen = locale_gen_check_available();
- 
-+        return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
-+            "Changing system settings via systemd is not supported on NixOS.");
-+
-         /* If single locale without variable name is provided, then we assume it is LANG=. */
-         if (strv_length(l) == 1 && !strchr(l[0], '=')) {
-                 if (!locale_is_valid(l[0]))
-@@ -338,6 +341,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
-         if (r < 0)
-                 return bus_log_parse_error(r);
- 
-+        return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
-+            "Changing system settings via systemd is not supported on NixOS.");
-+
-         vc_context_empty_to_null(&in);
- 
-         r = vc_context_verify_and_warn(&in, LOG_ERR, error);
-@@ -455,6 +461,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
-         if (r < 0)
-                 return bus_log_parse_error(r);
- 
-+        return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
-+            "Changing system settings via systemd is not supported on NixOS.");
-+
-         x11_context_empty_to_null(&in);
- 
-         r = x11_context_verify_and_warn(&in, LOG_ERR, error);
-diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 43cf3fddb9..1455830cba 100644
---- a/src/timedate/timedated.c
-+++ b/src/timedate/timedated.c
-@@ -680,6 +680,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
-         if (r < 0)
-                 return r;
- 
-+        if (getenv("NIXOS_STATIC_TIMEZONE"))
-+                return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
-+                    "Changing timezone via systemd is not supported when it is set in NixOS configuration.");
-+
-         if (!timezone_is_valid(z, LOG_DEBUG))
-                 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);
- 
-@@ -758,6 +762,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
-         if (r < 0)
-                 return r;
- 
-+        return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
-+            "Changing system settings via systemd is not supported on NixOS.");
-+
-         if (lrtc == c->local_rtc && !fix_system)
-                 return sd_bus_reply_method_return(m, NULL);
- 
-@@ -956,6 +963,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
-         if (r < 0)
-                 return r;
- 
-+        return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
-+            "Changing system settings via systemd is not supported on NixOS.");
-+
-         r = context_update_ntp_status(c, bus, m);
-         if (r < 0)
-                 return r;
diff --git a/pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/pkgs/os-specific/linux/systemd/0006-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
similarity index 100%
rename from pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
rename to pkgs/os-specific/linux/systemd/0006-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
diff --git a/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch
deleted file mode 100644
index d2eb05c290be..000000000000
--- a/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Imuli <i@imu.li>
-Date: Wed, 19 Oct 2016 08:46:47 -0400
-Subject: [PATCH] localectl: use /etc/X11/xkb for list-x11-*
-
-NixOS has an option to link the xkb data files to /etc/X11, but not to
-/usr/share/X11.
----
- src/locale/localectl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/locale/localectl.c b/src/locale/localectl.c
-index 63703007ad..50def81940 100644
---- a/src/locale/localectl.c
-+++ b/src/locale/localectl.c
-@@ -295,7 +295,7 @@ static const char* xkb_directory(void) {
-         static const char *cached = NULL;
- 
-         if (!cached)
--                cached = secure_getenv("SYSTEMD_XKB_DIRECTORY") ?: "/usr/share/X11/xkb";
-+                cached = secure_getenv("SYSTEMD_XKB_DIRECTORY") ?: "/etc/X11/xkb";
-         return cached;
- }
- 
diff --git a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
deleted file mode 100644
index 5de6a93cd7f9..000000000000
--- a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Thu, 25 Jul 2019 20:45:55 +0300
-Subject: [PATCH] systemd-shutdown: execute scripts in
- /etc/systemd/system-shutdown
-
-This is needed for NixOS to use such scripts as systemd directory is immutable.
----
- src/shutdown/shutdown.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
-index fc6df238be..cb8b45a41b 100644
---- a/src/shutdown/shutdown.c
-+++ b/src/shutdown/shutdown.c
-@@ -330,6 +330,7 @@ static void notify_supervisor(void) {
- int main(int argc, char *argv[]) {
-         static const char* const dirs[] = {
-                 SYSTEM_SHUTDOWN_PATH,
-+                "/etc/systemd/system-shutdown",
-                 NULL
-         };
-         _cleanup_free_ char *cgroup = NULL;
diff --git a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
deleted file mode 100644
index 5da56ce4be17..000000000000
--- a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Thu, 25 Jul 2019 20:46:58 +0300
-Subject: [PATCH] systemd-sleep: execute scripts in /etc/systemd/system-sleep
-
-This is needed for NixOS to use such scripts as systemd directory is immutable.
----
- src/sleep/sleep.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index 43aaede5b0..a8e5a75e39 100644
---- a/src/sleep/sleep.c
-+++ b/src/sleep/sleep.c
-@@ -248,6 +248,7 @@ static int execute(
-         };
-         static const char* const dirs[] = {
-                 SYSTEM_SLEEP_PATH,
-+                "/etc/systemd/system-sleep",
-                 NULL
-         };
- 
diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
deleted file mode 100644
index 4645b2f6d269..000000000000
--- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Yuriy Taraday <yorik.sar@gmail.com>
-Date: Fri, 17 Jun 2022 12:45:10 +0000
-Subject: [PATCH] inherit systemd environment when calling generators.
-
-Systemd generators need access to the environment configured in
-stage-2-init.sh since it schedules fsck and mkfs executions based on
-being able to find an appropriate binary for the target filesystem.
-
-With this commit I am altering the systemd behaviour since upstream
-tries to gather environments with that they call
-"environment-generators" and then seems to pass that on to all the other
-executables that are being called from managers.
----
- src/core/manager.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/core/manager.c b/src/core/manager.c
-index 2115d74595..86f697313b 100644
---- a/src/core/manager.c
-+++ b/src/core/manager.c
-@@ -3999,9 +3999,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
-          * adjust generated units to that. Let's pass down some bits of information that are easy for us to
-          * determine (but a bit harder for generator scripts to determine), as environment variables. */
- 
-+        // On NixOS we must propagate PATH to generators so they are
-+        // able to find binaries such as `fsck.${fstype}` and
-+        // `mkfs.${fstype}`. That is why we ignore transient_environment that
-+        // overrides the PATH variable. This propagates systemd's
-+        // environment (e.g. PATH) that was setup
-+        // before calling systemd from stage-2-init.sh.
-+#if 0
-         nl = strv_copy(m->transient_environment);
-         if (!nl)
-                 return -ENOMEM;
-+#endif
- 
-         r = strv_env_assign(&nl, "SYSTEMD_SCOPE", runtime_scope_to_string(m->runtime_scope));
-         if (r < 0)
diff --git a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
deleted file mode 100644
index 2cf174823605..000000000000
--- a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nick Cao <nickcao@nichi.co>
-Date: Sun, 15 Jan 2023 20:15:55 +0800
-Subject: [PATCH] tpm2_context_init: fix driver name checking
-
-https://github.com/systemd/systemd/commit/542dbc623e introduced
-additional checks for tpm2 driver names, namely ensuring the driver
-name, when concated with "libtss2-tcti-" and ".so.0", generates a valid
-filename (with no '/' inside).
-
-For example, if the driver is name "device", the line
-  fn = strjoina("libtss2-tcti-", driver, ".so.0")
-would yield "libtss2-tcti-device.so.0", passing the check. And the
-filename is then passed to dlopen for loading the driver.
-
-Our current approach for systemd to correctly locate these dynamically
-loaded libraries is to patch the filenames to include their absolute
-path. Thus the line mentioned above is patched into
-  fn = strjoina("/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-", driver, ".so.0")
-yielding "/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-device.so.0",
-tripping the check.
-
-This patch relaxes the check to also accept absolute paths, by replacing
-filename_is_valid with path_is_valid.
----
- src/shared/tpm2-util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
-index 9e05c847ed..c0dd773eee 100644
---- a/src/shared/tpm2-util.c
-+++ b/src/shared/tpm2-util.c
-@@ -918,7 +918,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
-                         return log_oom_debug();
- 
-                 /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */
--                if (!filename_is_valid(fn))
-+                if (!path_is_valid(fn))
-                         return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "TPM2 driver name '%s' not valid, refusing.", driver);
- 
-                 const char *dle = NULL;
diff --git a/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch b/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
deleted file mode 100644
index e106791f3115..000000000000
--- a/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch <maximilian@mbosch.me>
-Date: Fri, 1 Sep 2023 09:57:02 +0200
-Subject: [PATCH] systemctl-edit: suggest `systemdctl edit --runtime` on system
- scope
-
-This is a NixOS-specific change. When trying to modify a unit with
-`systemctl edit` on NixOS, it'll fail with "Read-only file system":
-
-    $ systemctl edit libvirtd
-    Failed to open "/etc/systemd/system/libvirtd.service.d/.#override.conffa9825a0c9a249eb": Read-only file system
-
-This is because `/etc/systemd/system` is a symlink into the store. In
-fact, I'd consider this a feature rather than a bug since this ensures I
-don't introduce state imperatively.
-
-However, people wrongly assume that it's not possible to edit units
-ad-hoc and re-deploy their system for quick&dirty debugging where this
-would be absolutely fine (and doable with `--runtime` which adds a
-transient and non-persistent unit override in `/run`).
-
-To make sure that people learn about it quicker, this patch
-throws an error which suggests using `--runtime` when running
-`systemctl edit` on the system scope.
-
-For the user scope this isn't needed because user-level unit overrides
-are written into `$XDG_CONFIG_HOME/systemd/user`.
----
- src/systemctl/systemctl-edit.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
-index a28180922a..22c9c8fdbd 100644
---- a/src/systemctl/systemctl-edit.c
-+++ b/src/systemctl/systemctl-edit.c
-@@ -336,6 +336,9 @@ int verb_edit(int argc, char *argv[], void *userdata) {
-         sd_bus *bus = NULL;
-         int r;
- 
-+        if (!arg_runtime && arg_runtime_scope == RUNTIME_SCOPE_SYSTEM)
-+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "The unit-directory '/etc/systemd/system' is read-only on NixOS, so it's not possible to edit system-units directly. Use 'systemctl edit --runtime' instead.");
-+
-         if (!on_tty() && !arg_stdin)
-                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Cannot edit units interactively if not on a tty.");
- 
diff --git a/pkgs/os-specific/linux/systemd/0017-meson-Don-t-link-ssh-dropins.patch b/pkgs/os-specific/linux/systemd/0017-meson-Don-t-link-ssh-dropins.patch
deleted file mode 100644
index ffc324be19df..000000000000
--- a/pkgs/os-specific/linux/systemd/0017-meson-Don-t-link-ssh-dropins.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marie Ramlow <me@nycode.dev>
-Date: Sun, 24 Nov 2024 20:04:35 +0100
-Subject: [PATCH] meson: Don't link ssh dropins
-
----
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 3672005d75..406be24b45 100644
---- a/meson.build
-+++ b/meson.build
-@@ -210,13 +210,13 @@ sshconfdir = get_option('sshconfdir')
- if sshconfdir == ''
-         sshconfdir = sysconfdir / 'ssh/ssh_config.d'
- endif
--conf.set10('LINK_SSH_PROXY_DROPIN', sshconfdir != 'no' and not sshconfdir.startswith('/usr/'))
-+conf.set10('LINK_SSH_PROXY_DROPIN', 0)
- 
- sshdconfdir = get_option('sshdconfdir')
- if sshdconfdir == ''
-         sshdconfdir = sysconfdir / 'ssh/sshd_config.d'
- endif
--conf.set10('LINK_SSHD_USERDB_DROPIN', sshdconfdir != 'no' and not sshdconfdir.startswith('/usr/'))
-+conf.set10('LINK_SSHD_USERDB_DROPIN', 0)
- 
- sshdprivsepdir = get_option('sshdprivsepdir')
- conf.set10('CREATE_SSHDPRIVSEPDIR', sshdprivsepdir != 'no' and not sshdprivsepdir.startswith('/usr/'))
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 830d89de731a..e589188a6099 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -5,7 +5,6 @@
   pkgsCross,
   testers,
   fetchFromGitHub,
-  fetchzip,
   buildPackages,
   makeBinaryWrapper,
   ninja,
@@ -14,10 +13,8 @@
   pkg-config,
   coreutils,
   gperf,
-  getent,
   glibcLocales,
   autoPatchelfHook,
-  fetchpatch,
 
   # glib is only used during tests (test-bus-gvariant, test-bus-marshal)
   glib,
@@ -41,8 +38,6 @@
   libgpg-error,
   libidn2,
   curl,
-  gnutar,
-  gnupg,
   zlib,
   xz,
   zstd,
@@ -215,6 +210,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-FUKj3lvjz8TIsyu8NyJYtiNele+1BhdJPdw7r7nW6as=";
   };
 
+  # PATCH POLICY
+  #
+  # There are only two reasons we accept patches on systemd:
+  # 1. systemd functionality is fundamentally incompatible with how NixOS works
+  #    and workarounds are not possible.
+  # 2. Hotfixes that we want to apply before they have reached a systemd branch
+  #    we can use. If we come up with the fixes in Nixpkgs, they need to be
+  #    reported upstream and the upstream issue needs to be linked in the
+  #    commit message of the patch.
+  #
+  # Importantly, patches to improve usability, enable new features on NixOS or
+  # add entirely new features to systemd are not allowed.
+
   # On major changes, or when otherwise required, you *must* :
   # 1. reformat the patches,
   # 2. `git am path/to/00*.patch` them into a systemd worktree,
@@ -224,30 +232,14 @@ stdenv.mkDerivation (finalAttrs: {
   # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all
   # patches
   patches = [
-    ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
-    ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
-    ./0003-Fix-NixOS-containers.patch
-    ./0004-Add-some-NixOS-specific-unit-directories.patch
-    ./0005-Get-rid-of-a-useless-message-in-user-sessions.patch
-    ./0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
-    ./0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
-    ./0008-localectl-use-etc-X11-xkb-for-list-x11.patch
-    ./0009-add-rootprefix-to-lookup-dir-paths.patch
-    ./0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
-    ./0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
-    ./0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
-    ./0013-inherit-systemd-environment-when-calling-generators.patch
-    ./0014-core-don-t-taint-on-unmerged-usr.patch
-    ./0015-tpm2_context_init-fix-driver-name-checking.patch
-    ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
-
-    # systemd tries to link the systemd-ssh-proxy ssh config snippet with tmpfiles
-    # if the install prefix is not /usr, but that does not work for us
-    # because we include the config snippet manually
-    ./0017-meson-Don-t-link-ssh-dropins.patch
+    ./0001-Don-t-try-to-unmount-nix-or-nix-store.patch
+    ./0002-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+    ./0003-add-rootprefix-to-lookup-dir-paths.patch
+    ./0004-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+    ./0005-core-don-t-taint-on-unmerged-usr.patch
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
-    ./0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
+    ./0006-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
   ];
 
   postPatch = ''
@@ -400,6 +392,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3
     (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d")
     (lib.mesonOption "shellprofiledir" "${placeholder "out"}/etc/profile.d")
+    (lib.mesonOption "ntp-servers" "0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
 
     # /bin/sh is also the upstream default. Explicitly set this so that we're
     # independent of upstream changes to the default.
@@ -570,146 +563,31 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonBool "gshadow" false)
     (lib.mesonBool "idn" false)
   ];
-  preConfigure =
-    let
-      # A list of all the runtime binaries referenced by the source code (plus
-      # scripts and unit files) of systemd executables, tests and libraries.
-      # As soon as a dependency is lo longer required we should remove it from
-      # the list.
-      # The `where` attribute for each of the replacement patterns must be
-      # exhaustive. If another (unhandled) case is found in the source code the
-      # build fails with an error message.
-      binaryReplacements = [
-        {
-          search = "/sbin/mkswap";
-          replacement = "${lib.getBin util-linux}/sbin/mkswap";
-          where = [
-            "man/systemd-makefs@.service.xml"
-          ];
-        }
-        {
-          search = "/bin/echo";
-          replacement = "${coreutils}/bin/echo";
-          where = [
-            "man/systemd-analyze.xml"
-            "man/systemd.service.xml"
-            "man/systemd-run.xml"
-            "src/analyze/test-verify.c"
-            "src/test/test-env-file.c"
-            "src/test/test-load-fragment.c"
-          ];
-        }
-        {
-          search = "/bin/cat";
-          replacement = "${coreutils}/bin/cat";
-          where = [
-            "test/test-execute/exec-noexecpaths-simple.service"
-          ];
-        }
-        {
-          search = "/usr/lib/systemd/systemd-fsck";
-          replacement = "$out/lib/systemd/systemd-fsck";
-          where = [ "man/systemd-fsck@.service.xml" ];
-        }
-      ]
-      ++ lib.optionals withImportd [
-        {
-          search = "\"gpg\"";
-          replacement = "\\\"${gnupg}/bin/gpg\\\"";
-          where = [ "src/import/pull-common.c" ];
-        }
-        {
-          search = "\"tar\"";
-          replacement = "\\\"${gnutar}/bin/tar\\\"";
-          where = [
-            "src/import/export-tar.c"
-            "src/import/import-tar.c"
-          ];
-          ignore = [
-            # occurrences here refer to the tar sub command
-            "src/sysupdate/sysupdate-resource.c"
-            "src/sysupdate/sysupdate-transfer.c"
-            "src/import/pull.c"
-            "src/import/export.c"
-            "src/import/import.c"
-            "src/import/importd.c"
-            # runs `tar` but also creates a temporary directory with the string
-            "src/import/pull-tar.c"
-            # pull-oci.c has tar references handled in postPatch
-            "src/import/pull-oci.c"
-            # tar referenced as file suffix
-            "src/shared/import-util.c"
-          ];
-        }
-      ]
-      ++ lib.optionals withKmod [
-        {
-          search = "ExecStart=-modprobe";
-          replacement = "ExecStart=-${lib.getBin kmod}/bin/modprobe";
-          where = [ "units/modprobe@.service" ];
-        }
-      ];
-
-      # { replacement, search, where, ignore } -> List[str]
-      mkSubstitute =
-        {
-          replacement,
-          search,
-          where,
-          ignore ? [ ],
-        }:
-        map (path: "substituteInPlace ${path} --replace '${search}' \"${replacement}\"") where;
-      mkEnsureSubstituted =
-        {
-          replacement,
-          search,
-          where,
-          ignore ? [ ],
-        }:
-        let
-          ignore' = lib.concatStringsSep "|" (
-            ignore
-            ++ [
-              "^test"
-              "NEWS"
-            ]
-          );
-        in
-        ''
-          set +e
-          search=$(grep '${search}' -r | grep -v "${replacement}" | grep -Ev "${ignore'}")
-          set -e
-          if [[ -n "$search" ]]; then
-            echo "Not all references to '${search}' have been replaced. Found the following matches:"
-            echo "$search"
-            exit 1
-          fi
-        '';
-    in
-    ''
-      mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
-      export LC_ALL="en_US.UTF-8";
-
-      ${lib.concatStringsSep "\n" (lib.flatten (map mkSubstitute binaryReplacements))}
-      ${lib.concatMapStringsSep "\n" mkEnsureSubstituted binaryReplacements}
-
-      substituteInPlace src/libsystemd/sd-journal/catalog.c \
-        --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
-
-      substituteInPlace src/import/pull-tar.c src/import/pull-oci.c \
-        --replace 'wait_for_terminate_and_check("tar"' 'wait_for_terminate_and_check("${gnutar}/bin/tar"'
-    '';
+  preConfigure = ''
+    substituteInPlace src/libsystemd/sd-journal/catalog.c \
+      --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
+  '';
 
   # These defines are overridden by CFLAGS and would trigger annoying
   # warning messages
   postConfigure = ''
     substituteInPlace config.h \
-      --replace-fail "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH"
+      --replace-fail "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \
+      --replace-fail "SYSTEM_SHUTDOWN_PATH" "_SYSTEM_SHUTDOWN_PATH" \
+      --replace-fail "SYSTEM_SLEEP_PATH" "_SYSTEM_SLEEP_PATH"
   '';
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-USYSTEMD_BINARY_PATH"
     "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
+
+    # This path is not exposed via meson
+    "-USYSTEM_SHUTDOWN_PATH"
+    "-DSYSTEM_SHUTDOWN_PATH=\"/etc/systemd/system-shutdown\""
+
+    # This path is not exposed via meson
+    "-USYSTEM_SLEEP_PATH"
+    "-DSYSTEM_SLEEP_PATH=\"/etc/systemd/system-sleep\""
   ];
 
   doCheck = false;
@@ -740,12 +618,6 @@ stdenv.mkDerivation (finalAttrs: {
 
       # For compatibility with dependents that use sbin instead of bin.
       ln -s bin "$out/sbin"
-
-      rm -rf $out/etc/rpm
-    ''
-    + lib.optionalString (!withKernelInstall) ''
-      # "kernel-install" shouldn't be used on NixOS.
-      find $out -name "*kernel-install*" -exec rm {} \;
     ''
     + lib.optionalString (!withDocumentation) ''
       rm -rf $out/share/doc
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 46a0dfcfcfe9..ee5b8aaec1a0 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -141,10 +141,12 @@ optionalAttrs allowAliases aliases
             {
               nativeBuildInputs = [ jq ];
               value = builtins.toJSON value;
-              passAsFile = [ "value" ];
               preferLocalBuild = true;
+              __structuredAttrs = true;
             }
             ''
+              valuePath="$TMPDIR/value"
+              printf "%s" "$value" > "$valuePath"
               jq . "$valuePath" > $out
             ''
         ) { };
@@ -164,10 +166,12 @@ optionalAttrs allowAliases aliases
             {
               nativeBuildInputs = [ remarshal_0_17 ];
               value = builtins.toJSON value;
-              passAsFile = [ "value" ];
               preferLocalBuild = true;
+              __structuredAttrs = true;
             }
             ''
+              valuePath="$TMPDIR/value"
+              printf "%s" "$value" > "$valuePath"
               json2yaml "$valuePath" "$out"
             ''
         ) { };
@@ -187,10 +191,12 @@ optionalAttrs allowAliases aliases
             {
               nativeBuildInputs = [ remarshal ];
               value = builtins.toJSON value;
-              passAsFile = [ "value" ];
               preferLocalBuild = true;
+              __structuredAttrs = true;
             }
             ''
+              valuePath="$TMPDIR/value"
+              printf "%s" "$value" > "$valuePath"
               json2yaml "$valuePath" "$out"
             ''
         ) { };
@@ -466,10 +472,12 @@ optionalAttrs allowAliases aliases
             {
               nativeBuildInputs = [ remarshal ];
               value = builtins.toJSON value;
-              passAsFile = [ "value" ];
               preferLocalBuild = true;
+              __structuredAttrs = true;
             }
             ''
+              valuePath="$TMPDIR/value"
+              printf "%s" "$value" > "$valuePath"
               json2toml "$valuePath" "$out"
             ''
         ) { };
@@ -499,10 +507,12 @@ optionalAttrs allowAliases aliases
             {
               nativeBuildInputs = [ json2cdn ];
               value = builtins.toJSON value;
-              passAsFile = [ "value" ];
               preferLocalBuild = true;
+              __structuredAttrs = true;
             }
             ''
+              valuePath="$TMPDIR/value"
+              printf "%s" "$value" > "$valuePath"
               json2cdn "$valuePath" > $out
             ''
         ) { };
@@ -734,12 +744,12 @@ optionalAttrs allowAliases aliases
         pkgs.runCommand name
           {
             value = toConf value;
-            passAsFile = [ "value" ];
             nativeBuildInputs = [ elixir ];
             preferLocalBuild = true;
+            __structuredAttrs = true;
           }
           ''
-            cp "$valuePath" "$out"
+            printf "%s" "$value" > "$out"
             mix format "$out"
           '';
     };
@@ -783,14 +793,14 @@ optionalAttrs allowAliases aliases
               inherit indentWidth;
               indentType = if indentUsingTabs then "Tabs" else "Spaces";
               value = toLua { inherit asBindings multiline; } value;
-              passAsFile = [ "value" ];
               preferLocalBuild = true;
+              __structuredAttrs = true;
             }
             ''
               ${optionalString (!asBindings) ''
                 echo -n 'return ' >> $out
               ''}
-              cat $valuePath >> $out
+              printf "%s" "$value" >> $out
               stylua \
                 --no-editorconfig \
                 --line-endings Unix \
@@ -931,7 +941,7 @@ optionalAttrs allowAliases aliases
               ];
               imports = builtins.toJSON (value._imports or [ ]);
               value = builtins.toJSON (removeAttrs value [ "_imports" ]);
-              pythonGen = ''
+              pythonGen = pkgs.writeText "pythonGen" ''
                 import json
                 import os
 
@@ -964,16 +974,16 @@ optionalAttrs allowAliases aliases
                     for key, value in json.load(f).items():
                         print(f"{key} = {recursive_repr(value)}")
               '';
-              passAsFile = [
-                "imports"
-                "value"
-                "pythonGen"
-              ];
               preferLocalBuild = true;
+              __structuredAttrs = true;
             }
             ''
+              importsPath="$TMPDIR/imports"
+              printf "%s" "$imports" > "$importsPath"
+              valuePath="$TMPDIR/value"
+              printf "%s" "$value" > "$valuePath"
               cat "$valuePath"
-              python3 "$pythonGenPath" > $out
+              python3 "$pythonGen" > $out
               black $out
             ''
         ) { };
@@ -1003,7 +1013,7 @@ optionalAttrs allowAliases aliases
                   libxml2Python
                 ];
                 value = builtins.toJSON value;
-                pythonGen = ''
+                pythonGen = pkgs.writeText "pythonGen" ''
                   import json
                   import os
                   import xmltodict
@@ -1013,14 +1023,13 @@ optionalAttrs allowAliases aliases
                         if withHeader then "True" else "False"
                       }, pretty=True, indent=" " * 2))
                 '';
-                passAsFile = [
-                  "value"
-                  "pythonGen"
-                ];
                 preferLocalBuild = true;
+                __structuredAttrs = true;
               }
               ''
-                python3 "$pythonGenPath" > $out
+                valuePath="$TMPDIR/value"
+                printf "%s" "$value" > "$valuePath"
+                python3 "$pythonGen" > $out
                 xmllint $out > /dev/null
               ''
           ) { };
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index e2c2131eb762..d8c9470e5dfa 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -648,10 +648,6 @@ in
           inherit (prevStage) expand-response-params;
         };
 
-        # To allow users' overrides inhibit dependencies too heavy for
-        # bootstrap, like guile: https://github.com/NixOS/nixpkgs/issues/181188
-        gnumake = super.gnumake.override { inBootstrap = true; };
-
         gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) {
           nativeTools = false;
           nativeLibc = false;
@@ -869,8 +865,6 @@ in
                 libunistring
                 ;
             };
-
-            gnumake = super.gnumake.override { inBootstrap = false; };
           }
           // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
             # Need to get rid of these when cross-compiling.
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 78dc79d01319..639f10ab32e0 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -16,7 +16,6 @@
   selinuxSupport ? false,
   libselinux,
   libsepol,
-  texinfo,
   # No openssl in default version, so openssl-induced rebuilds aren't too big.
   # It makes *sum functions significantly faster.
   minimal ? true,
@@ -46,21 +45,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "coreutils" + (optionalString (!minimal) "-full");
-  version = "9.10"; # TODO: remove texinfo dep and the patches on next release.
+  version = "9.11";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/coreutils-${finalAttrs.version}.tar.xz";
-    hash = "sha256-FlNamt8LEANzZOLWEqrT2fTso6NElJztdNEvr0vVHSU=";
+    hash = "sha256-OUAk7aCllVIXztqc0SAeZdyPo6opwpURNaSVIdV8PMM=";
   };
 
-  patches = [
-    ./fix-kill-doctest.patch
-    # See https://github.com/NixOS/nixpkgs/pull/487081#issuecomment-3953615275,
-    # https://github.com/NixOS/nixpkgs/issues/495290,
-    # and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=80477
-    ./tests-notty-sighup.patch
-  ];
-
   postPatch = ''
     # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems.
     sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh
@@ -108,6 +99,10 @@ stdenv.mkDerivation (finalAttrs: {
     # intermittent failures on builders, unknown reason
     sed '2i echo Skipping du basic test && exit 77' -i ./tests/du/basic.sh
 
+    # flaky on some filesystems due to non-deterministic disk usage
+    sed '2i echo Skipping du deref test && exit 77' -i ./tests/du/deref.sh
+    sed '2i echo Skipping du inacc-dir test && exit 77' -i ./tests/du/inacc-dir.sh
+
     # fails when syscalls related to acl not being available, e.g. in sandboxed environment
     sed '2i echo Skipping ls -al with acl test && exit 77' -i ./tests/ls/acl.sh
   ''
@@ -140,7 +135,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     perl
-    texinfo
     xz.bin
   ];
 
@@ -245,8 +239,12 @@ stdenv.mkDerivation (finalAttrs: {
       # binlore only spots exec in runcon on some platforms (i.e., not
       # darwin; see comment on inverse case below)
       binlore.out = binlore.synthesize finalAttrs.finalPackage ''
-        execer can bin/{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout}
-        execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
+        execer can bin/${
+          if withPrefix then "g" else ""
+        }{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout}
+        execer cannot bin/${
+          if withPrefix then "g" else ""
+        }{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
       '';
     }
     // optionalAttrs (singleBinary == false) {
@@ -255,7 +253,7 @@ stdenv.mkDerivation (finalAttrs: {
       # hard-set it so people working on macOS don't miss cases of
       # runcon until ofBorg fails.
       binlore.out = binlore.synthesize finalAttrs.finalPackage ''
-        execer can bin/runcon
+        execer can bin/${if withPrefix then "g" else ""}runcon
       '';
     };
 
diff --git a/pkgs/tools/misc/coreutils/fix-kill-doctest.patch b/pkgs/tools/misc/coreutils/fix-kill-doctest.patch
deleted file mode 100644
index 1e54ed3fc783..000000000000
--- a/pkgs/tools/misc/coreutils/fix-kill-doctest.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 088c011bfc66643a16b22db77a3c458bb7412ea2 Mon Sep 17 00:00:00 2001
-From: Collin Funk <collin.funk1@gmail.com>
-Date: Thu, 5 Feb 2026 21:18:25 -0800
-Subject: [PATCH] doc: kill: adjust documentation to produce html anchors for
- --help
-
-* doc/coreutils.texi (kill invocation): Adjust documentation to use the
-@optItem macros.
-Fixes https://bugs.gnu.org/80339
-Fixes https://github.com/coreutils/coreutils/issues/185
----
- doc/coreutils.texi | 36 ++++++++++++++++++++++++------------
- 1 file changed, 24 insertions(+), 12 deletions(-)
-
-diff --git a/doc/coreutils.texi b/doc/coreutils.texi
-index a02e8d73b0..4559307462 100644
---- a/doc/coreutils.texi
-+++ b/doc/coreutils.texi
-@@ -18354,18 +18354,30 @@ The first form of the @command{kill} command succeeds if every @var{pid}
- argument specifies at least one process that the signal was sent to.
- 
- The second form of the @command{kill} command lists signal information.
--Either the @option{-l} or @option{--list} option, or the @option{-t}
--or @option{--table} option must be specified.  Without any
--@var{signal} argument, all supported signals are listed.  The output
--of @option{-l} or @option{--list} is a list of the signal names, one
--per line; if @var{signal} is already a name, the signal number is
--printed instead.  The output of @option{-t} or @option{--table} is a
--table of signal numbers, names, and descriptions.  This form of the
--@command{kill} command succeeds if all @var{signal} arguments are valid
--and if there is no output error.
--
--The @command{kill} command also supports the @option{--help} and
--@option{--version} options.  @xref{Common options}.
-+This form of the @command{kill} command succeeds if all @var{signal}
-+arguments are valid and if there is no output error.
-+
-+The program accepts the following options.  Also see @ref{Common options}.
-+
-+@table @samp
-+
-+@optAnchor{kill,-SIGNAL}
-+@optItem{kill,-s,}
-+@optItemx{kill,--signal,}
-+Specify the name or number of the signal to be sent.
-+
-+@optItem{kill,-l,}
-+@optItemx{kill,--list,}
-+List the supported signal names one per line if the @var{signal} option
-+is omitted.  If one or more @var{signal} options are provided, they are
-+converted between signal names and signal numbers.
-+
-+@optItem{kill,-t,}
-+@optItemx{kill,--table,}
-+This option behaves the same way as @option{--list} except it prints a
-+table of signal numbers, names, and descriptions.
-+
-+@end table
- 
- A @var{signal} may be a signal name like @samp{HUP}, or a signal
- number like @samp{1}, or an exit status of a process terminated by the
diff --git a/pkgs/tools/misc/coreutils/tests-notty-sighup.patch b/pkgs/tools/misc/coreutils/tests-notty-sighup.patch
deleted file mode 100644
index 8c3d974f654e..000000000000
--- a/pkgs/tools/misc/coreutils/tests-notty-sighup.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 3402c32b97c0d16138c6753c8268ba97d604eb43 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Tue, 24 Feb 2026 15:44:41 +0000
-Subject: [PATCH] tests: fix job control triggering test termination
-
-This avoids the test harness being terminated like:
-  make[1]: *** [Makefile:24419: check-recursive] Hangup
-  make[3]: *** [Makefile:24668: check-TESTS] Hangup
-  make: *** [Makefile:24922: check] Hangup
-  make[2]: *** [Makefile:24920: check-am] Hangup
-  make[4]: *** [Makefile:24685: tests/misc/usage_vs_refs.log] Error 129
-  ...
-
-This happened sometimes when the tests were being run non interactively.
-For example when run like:
-
-  setsid make TESTS="tests/timeout/timeout.sh \
-   tests/tail/overlay-headers.sh" SUBDIRS=. -j2 check
-
-Note the race window can be made bigger by adding a sleep
-after tail is stopped in overlay-headers.sh
-
-The race can trigger the kernel to induce its job control
-mechanism to prevent stuck processes.
-I.e. where it sends SIGHUP + SIGCONT to a process group
-when it determines that group may become orphaned,
-and there are stopped processes in that group.
-
-* tests/tail/overlay-headers.sh: Use setsid(1) to keep the stopped
-tail process in a separate process group, thus avoiding any kernel
-job control protection mechanism.
-* tests/timeout/timeout.sh: Use setsid(1) to avoid the kernel
-checking the main process group when sleep(1) is reparented.
-Fixes https://bugs.gnu.org/80477
----
- tests/tail/overlay-headers.sh | 10 ++++++++--
- tests/timeout/timeout.sh      | 11 ++++++++---
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/tests/tail/overlay-headers.sh b/tests/tail/overlay-headers.sh
-index be9b6a7df..52c7da056 100755
---- a/tests/tail/overlay-headers.sh
-+++ b/tests/tail/overlay-headers.sh
-@@ -20,6 +20,8 @@
- . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
- print_ver_ tail sleep
- 
-+setsid true || skip_ 'setsid required to control groups'
-+
- # Function to count number of lines from tail
- # while ignoring transient errors due to resource limits
- countlines_ ()
-@@ -54,8 +56,12 @@ echo start > file2 || framework_failure_
- env sleep 60 & sleep=$!
- 
- # Note don't use timeout(1) here as it currently
--# does not propagate SIGCONT
--tail $fastpoll --pid=$sleep -f file1 file2 > out & pid=$!
-+# does not propagate SIGCONT.
-+# Note use setsid here to ensure we're in a separate process group
-+# as we're going to STOP this tail process, and this can trigger
-+# the kernel to send SIGHUP to a group if other tests have
-+# processes that are reparented. (See tests/timeout/timeout.sh).
-+setsid tail $fastpoll --pid=$sleep -f file1 file2 > out & pid=$!
- 
- # Ensure tail is running
- kill -0 $pid || fail=1
-diff --git a/tests/timeout/timeout.sh b/tests/timeout/timeout.sh
-index 9a395416b..fbb043312 100755
---- a/tests/timeout/timeout.sh
-+++ b/tests/timeout/timeout.sh
-@@ -56,9 +56,14 @@ returns_ 124 timeout --foreground -s0 -k1 .1 sleep 10 && fail=1
- ) || fail=1
- 
- # Don't be confused when starting off with a child (Bug#9098).
--out=$(sleep .1 & exec timeout .5 sh -c 'sleep 2; echo foo')
--status=$?
--test "$out" = "" && test $status = 124 || fail=1
-+# Use setsid to avoid sleep being in the test's process group, as
-+# upon reparenting it can trigger an orphaned process group SIGHUP
-+# (if there were stopped processes in other tests).
-+if setsid true; then
-+  out=$(setsid sleep .1 & exec timeout .5 sh -c 'sleep 2; echo foo')
-+  status=$?
-+  test "$out" = "" && test $status = 124 || fail=1
-+fi
- 
- # Verify --verbose output
- cat > exp <<\EOF
--- 
-2.53.0
-
diff --git a/pkgs/tools/misc/file/0001-PR-745-streamout-Don-t-flush-when-trying-to-set-nega.patch b/pkgs/tools/misc/file/0001-PR-745-streamout-Don-t-flush-when-trying-to-set-nega.patch
new file mode 100644
index 000000000000..77ad10f252c7
--- /dev/null
+++ b/pkgs/tools/misc/file/0001-PR-745-streamout-Don-t-flush-when-trying-to-set-nega.patch
@@ -0,0 +1,57 @@
+From 12b76648185104ce9118d8b5fa57aa34a77ad084 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Wed, 15 Apr 2026 20:00:20 +0000
+Subject: [PATCH] PR/745: streamout: Don't flush when trying to set negative
+ offsets     on pipes, just continue, fixes 'cat file.zip | file -'
+
+---
+ ChangeLog       |  2 ++
+ src/softmagic.c | 22 ++++++++++++++++------
+ 2 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/src/softmagic.c b/src/softmagic.c
+index 7cf7c798..a5e758eb 100644
+--- a/src/softmagic.c
++++ b/src/softmagic.c
+@@ -245,14 +245,19 @@ match(struct magic_set *ms, struct magic *magic, file_regex_t **magic_rxcomp,
+ flush:
+ 			/* Skip sub-tests */
+ 			while (magindex < nmagic - 1 &&
+-			    magic[magindex + 1].cont_level != 0)
++			    magic[magindex + 1].cont_level != 0) {
+ 				magindex++;
++			}
+ 			cont_level = 0;
+ 			continue; /* Skip to next top-level test*/
+ 		}
+ 
+-		if (msetoffset(ms, m, &bb, b, offset, cont_level) == -1)
+-			goto flush;
++		if (msetoffset(ms, m, &bb, b, offset, cont_level) == -1) {
++			if (b->elen == FILE_BADSIZE)
++				continue;
++			else
++				goto flush;
++		}
+ 		ms->line = m->lineno;
+ 
+ 		/* if main entry matches, print it... */
+@@ -347,8 +352,13 @@ flush:
+ 				 */
+ 				cont_level = m->cont_level;
+ 			}
+-			if (msetoffset(ms, m, &bb, b, offset, cont_level) == -1)
+-				goto flush;
++			if (msetoffset(ms, m, &bb, b, offset, cont_level)
++			    == -1) {
++				if (b->elen == FILE_BADSIZE)
++					continue;
++				else
++					goto flush;
++			}
+ 			if (m->flag & OFFADD) {
+ 				if (cont_level == 0) {
+ 					if ((ms->flags & MAGIC_DEBUG) != 0)
+-- 
+2.53.0
+
diff --git a/pkgs/tools/misc/file/0002-PR-725-inliniac-Revert-previous-and-always-set-offse.patch b/pkgs/tools/misc/file/0002-PR-725-inliniac-Revert-previous-and-always-set-offse.patch
new file mode 100644
index 000000000000..ff405c446597
--- /dev/null
+++ b/pkgs/tools/misc/file/0002-PR-725-inliniac-Revert-previous-and-always-set-offse.patch
@@ -0,0 +1,26 @@
+From c54605718190ad8fe9c25cb475f1f32ca7cd54f7 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sun, 12 Apr 2026 22:15:14 +0000
+Subject: [PATCH] PR/725: inliniac: Revert previous and always set offset.
+
+---
+ src/softmagic.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/softmagic.c b/src/softmagic.c
+index 9aaf8b3e..7cf7c798 100644
+--- a/src/softmagic.c
++++ b/src/softmagic.c
+@@ -1577,8 +1577,7 @@ normal:
+ 			ms->offset = offset;
+ 			ms->eoffset = 0;
+ 		} else {
+-			if (b->fd != -1)
+-				ms->offset = ms->eoffset + offset;
++			ms->offset = ms->eoffset + offset;
+ 		}
+ 	}
+ 	if ((ms->flags & MAGIC_DEBUG) != 0) {
+-- 
+2.51.2
+
diff --git a/pkgs/tools/misc/file/32-bit-time_t.patch b/pkgs/tools/misc/file/32-bit-time_t.patch
deleted file mode 100644
index 19c595215d65..000000000000
--- a/pkgs/tools/misc/file/32-bit-time_t.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/file/file/commit/218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1.patch
-
-From 218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Fri, 28 Jul 2023 14:38:25 +0000
-Subject: [PATCH] deal with 32 bit time_t
-
----
- src/file.h | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/file.h b/src/file.h
-index 2e0494d2f..78f574ea1 100644
---- a/src/file.h
-+++ b/src/file.h
-@@ -27,7 +27,7 @@
-  */
- /*
-  * file.h - definitions for file(1) program
-- * @(#)$File: file.h,v 1.247 2023/07/27 19:40:22 christos Exp $
-+ * @(#)$File: file.h,v 1.248 2023/07/28 14:38:25 christos Exp $
-  */
- 
- #ifndef __file_h__
-@@ -159,9 +159,11 @@
- /*
-  * Dec 31, 23:59:59 9999
-  * we need to make sure that we don't exceed 9999 because some libc
-- * implementations like muslc crash otherwise
-+ * implementations like muslc crash otherwise. If you are unlucky
-+ * to be running on a system with a 32 bit time_t, then it is even less.
-  */
--#define	MAX_CTIME	CAST(time_t, 0x3afff487cfULL)
-+#define	MAX_CTIME \
-+    CAST(time_t, sizeof(time_t) > 4 ? 0x3afff487cfULL : 0x7fffffffULL)
- 
- #define FILE_BADSIZE CAST(size_t, ~0ul)
- #define MAXDESC	64		/* max len of text description/MIME type */
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 34f58c1f92a8..ae27a481b38f 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "file";
-  version = "5.45";
+  version = "5.47";
 
   src = fetchurl {
     urls = [
       "https://astron.com/pub/file/file-${finalAttrs.version}.tar.gz"
       "https://distfiles.macports.org/file/file-${finalAttrs.version}.tar.gz"
     ];
-    hash = "sha256-/Jf1ECm7DiyfTjv/79r2ePDgOe6HK53lwAKm0Jx4TYI=";
+    hash = "sha256-RWcv7BZctMwTWKLXa11X0ih23Ll6sWlCesOFy+HVWXo=";
   };
 
   outputs = [
@@ -33,17 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    # Upstream patch to fix 32-bit tests.
-    #
-    # It is included in 5.46+, but we are not updating to it or a later version until:
-    #
-    # https://bugs.astron.com/view.php?id=622
-    # https://bugs.astron.com/view.php?id=638
-    #
-    # are resolved. See also description of the 1st bug here:
-    #
-    # https://github.com/NixOS/nixpkgs/pull/402318#issuecomment-2881163359
-    ./32-bit-time_t.patch
+    # Fixes `cat archive.zip | file -` just showing a generic "data" type. See:
+    # - https://bugs.astron.com/view.php?id=764
+    # - https://github.com/file/file/commit/12b76648185104ce9118d8b5fa57aa34a77ad084
+    # Vendored patch because using fetchpatch is impossible for a package in
+    # this part of the bootstrap chain.
+    ./0001-PR-745-streamout-Don-t-flush-when-trying-to-set-nega.patch
+    # Fixes breakage of python3Packages.python-magic and xdg-utils
+    ./0002-PR-725-inliniac-Revert-previous-and-always-set-offse.patch
   ];
 
   strictDeps = true;
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 0507bab15ca4..b67fa5f4e3a3 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -10,15 +10,15 @@
   fortran,
   zlibSupport ? true,
   zlib,
-  szipSupport ? false,
-  szip,
+  szipSupport ? true,
+  libaec,
   mpiSupport ? false,
   mpi,
   enableShared ? !stdenv.hostPlatform.isStatic,
   enableStatic ? stdenv.hostPlatform.isStatic,
   javaSupport ? false,
   jdk,
-  usev110Api ? false,
+  apiVersion ? null,
   threadsafe ? false,
   python3,
 }:
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       zlibSupport
       zlib
       szipSupport
-      szip
+      libaec
       mpiSupport
       mpi
       ;
@@ -82,31 +82,28 @@ stdenv.mkDerivation rec {
   ++ optional fortranSupport fortran;
 
   buildInputs =
-    optional fortranSupport fortran ++ optional szipSupport szip ++ optional javaSupport jdk;
+    optional fortranSupport fortran ++ optional szipSupport libaec ++ optional javaSupport jdk;
 
   propagatedBuildInputs = optional zlibSupport zlib ++ optional mpiSupport mpi;
 
   cmakeFlags = [
     "-DHDF5_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake"
-    "-DBUILD_STATIC_LIBS=${lib.boolToString enableStatic}"
+    (lib.cmakeBool "BUILD_STATIC_LIBS" enableStatic)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
+    (lib.cmakeBool "HDF5_BUILD_CPP_LIB" cppSupport)
+    (lib.cmakeBool "HDF5_BUILD_FORTRAN" fortranSupport)
+    (lib.cmakeBool "HDF5_ENABLE_SZIP_SUPPORT" szipSupport)
+    (lib.cmakeBool "HDF5_ENABLE_PARALLEL" mpiSupport)
+    (lib.cmakeBool "HDF5_BUILD_JAVA" javaSupport)
+    (lib.cmakeBool "HDF5_ENABLE_THREADSAFE" threadsafe)
+    (lib.cmakeBool "HDF5_BUILD_HL_LIB" (!threadsafe))
+    # broken in nixpkgs since around 1.14.3 -> 1.14.4.3
+    # https://github.com/HDFGroup/hdf5/issues/4208#issuecomment-2098698567
+    (lib.cmakeBool "HDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16" (
+      with stdenv.hostPlatform; !(isDarwin && isx86_64)
+    ))
   ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin "-DHDF5_BUILD_WITH_INSTALL_NAME=ON"
-  ++ lib.optional cppSupport "-DHDF5_BUILD_CPP_LIB=ON"
-  ++ lib.optional fortranSupport "-DHDF5_BUILD_FORTRAN=ON"
-  ++ lib.optional szipSupport "-DHDF5_ENABLE_SZIP_SUPPORT=ON"
-  ++ lib.optionals mpiSupport [ "-DHDF5_ENABLE_PARALLEL=ON" ]
-  ++ lib.optional enableShared "-DBUILD_SHARED_LIBS=ON"
-  ++ lib.optional javaSupport "-DHDF5_BUILD_JAVA=ON"
-  ++ lib.optional usev110Api "-DDEFAULT_API_VERSION=v110"
-  ++ lib.optionals threadsafe [
-    "-DHDF5_ENABLE_THREADSAFE:BOOL=ON"
-    "-DHDF5_BUILD_HL_LIB=OFF"
-  ]
-  # broken in nixpkgs since around 1.14.3 -> 1.14.4.3
-  # https://github.com/HDFGroup/hdf5/issues/4208#issuecomment-2098698567
-  ++ lib.optional (
-    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
-  ) "-DHDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16=OFF";
+  ++ lib.optional (apiVersion != null) (lib.cmakeFeature "HDF5_DEFAULT_API_VERSION" apiVersion);
 
   postInstall = ''
     find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
@@ -118,17 +115,15 @@ stdenv.mkDerivation rec {
     moveToOutput 'bin/h5hlcc' "''${!outputDev}"
     moveToOutput 'bin/h5hlc++' "''${!outputDev}"
   ''
-  +
-    lib.optionalString enableShared
-      # The shared build creates binaries with -shared suffixes,
-      # so we remove these suffixes.
-      ''
-        pushd ''${!outputBin}/bin
-        for file in *-shared; do
-          mv "$file" "''${file%%-shared}"
-        done
-        popd
-      ''
+  # The shared build creates binaries with -shared suffixes,
+  # so we remove these suffixes.
+  + lib.optionalString enableShared ''
+    pushd ''${!outputBin}/bin
+    for file in *-shared; do
+      mv "$file" "''${file%%-shared}"
+    done
+    popd
+  ''
   + lib.optionalString fortranSupport ''
     mv $out/mod/shared $dev/include
     rm -r $out/mod
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 6c9f80ea429c..1861ca498ede 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -83,12 +83,12 @@ in
 
   openssh_gssapi = common rec {
     pname = "openssh-with-gssapi";
-    version = "10.2p1";
+    version = "10.3p1";
     extraDesc = " with GSSAPI support";
 
     src = fetchurl {
       url = urlFor version;
-      hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI=";
+      hash = "sha256-VmgqNruS3PS08Bb9jsjnQFm3mo3iXBXWcNcx59GORfQ=";
     };
 
     extraPatches = [
@@ -96,8 +96,8 @@ in
 
       (fetchpatch {
         name = "openssh-gssapi.patch";
-        url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%2510.2p1-6/debian/patches/gssapi.patch";
-        hash = "sha256-mYrJJrE6l0r/VYLWlOTGkKLzj9Dj4wOLgJyW/NLGaeo=";
+        url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%2510.3p1-1/debian/patches/gssapi.patch";
+        hash = "sha256-gs5Vw4f/TDxmme1DbrtgwvWcPGGmYIWE/A4JWa551zA=";
       })
     ];
 
diff --git a/pkgs/tools/security/pinentry/fix-with-xcbuild-plistbuddy.patch b/pkgs/tools/security/pinentry/fix-with-xcbuild-plistbuddy.patch
deleted file mode 100644
index 3af1da2319de..000000000000
--- a/pkgs/tools/security/pinentry/fix-with-xcbuild-plistbuddy.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/macosx/copyInfoPlist.sh b/macosx/copyInfoPlist.sh
-index f366665153..dfd9511e79 100755
---- a/macosx/copyInfoPlist.sh
-+++ b/macosx/copyInfoPlist.sh
-@@ -20,9 +20,10 @@
- cp "$1" "$dest" || exit 1
- 
- 
--/usr/libexec/PlistBuddy \
--	-c "Set CommitHash '${COMMIT_HASH:--}'" \
--	-c "Set BuildNumber '${BUILD_NUMBER:-0}'" \
--	-c "Set CFBundleVersion '${BUILD_VERSION:-0n}'" \
--	-c "Set CFBundleShortVersionString '$VERSION'" \
--	"$dest" || exit 1
-+PlistBuddy "$dest" <<EOF || exit 1
-+    Set CommitHash "${COMMIT_HASH:--}"
-+    Set BuildNumber "${BUILD_NUMBER:-0}"
-+    Set CFBundleVersion "${BUILD_VERSION:-0n}"
-+    Set CFBundleShortVersionString "$VERSION"
-+    Save
-+EOF
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index 17978b0ae856..6b354ef48d23 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -7,9 +7,9 @@
   libgpg-error,
   makeBinaryWrapper,
   texinfo,
-  xcbuild,
   common-updater-scripts,
   writers,
+  re-plistbuddy,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,9 +28,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./gettext-0.25.patch
-
-    # Fix the build with xcbuild’s inferior `PlistBuddy(8)`.
-    ./fix-with-xcbuild-plistbuddy.patch
   ];
 
   # use pregenerated nib files because generating them requires XCode
@@ -40,6 +37,8 @@ stdenv.mkDerivation rec {
     chmod -R u+w macosx/*.nib
     # pinentry_mac requires updated macros to correctly detect v2 API support in libassuan 3.x.
     cp '${lib.getDev libassuan}/share/aclocal/libassuan.m4' m4/libassuan.m4
+    substituteInPlace macosx/copyInfoPlist.sh \
+      --replace-fail "/usr/libexec/PlistBuddy" "PlistBuddy"
   '';
 
   strictDeps = true;
@@ -47,9 +46,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
     makeBinaryWrapper
     texinfo
-
-    # for `PlistBuddy(8)`
-    xcbuild
+    re-plistbuddy
   ];
 
   configureFlags = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b99ec6ad47d5..a42069191e8c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1090,6 +1090,7 @@ mapAliases {
   libgda = throw "'libgda' has been renamed to/replaced by 'libgda5'"; # Converted to throw 2025-10-27
   libGDSII = libgdsii; # Added 2026-02-08
   libgme = throw "'libgme' has been renamed to/replaced by 'game-music-emu'"; # Converted to throw 2025-10-27
+  libgnome-games-support_2_0 = throw "'libgnome-games-support_2_0' has been removed. Upstream has converted this library to a copylib and no more releases will happen"; # Added 2026-03-27
   libgnome-keyring3 = throw "'libgnome-keyring3' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2025-10-27
   libheimdal = throw "'libheimdal' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2025-10-27
   libHX = libhx; # Added 2026-02-08
@@ -1525,6 +1526,8 @@ mapAliases {
   nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30
   nmapsi4 = throw "'nmapsi4' has been removed as it depended on qt5 webengine, which is EOL"; # Added 2026-04-25
   node2nix = throw "node2nix has been removed because it was only used to maintain the now-removed nodePackages set. Use the newer builders in nixpkgs instead, such as buildNpmPackage"; # Added 2026-03-03
+  nodejs-slim_25 = nodejs_25;
+  nodejs_25 = throw "Node.js 25 support was removed given upstream End-of-Life on 2026-06-01"; # Added 2026-04-26
   nodePackages = throw "nodePackages has been removed. Many packages are now available at the top level (e.g. `pkgs.package-name`). Check on https://search.nixos.org to see if the package is still available."; # Added 2026-03-03
   nodePackages_latest = throw "nodePackages has been removed. Many packages are now available at the top level (e.g. `pkgs.package-name`). Check on https://search.nixos.org to see if the package is still available."; # Added 2026-03-03
   nofi = throw "'nofi' has been removed due to being archived upstream."; # Added 2026-01-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2857a88f812..0ce7b7033829 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2679,7 +2679,7 @@ with pkgs;
   };
 
   medfile = callPackage ../development/libraries/medfile {
-    hdf5 = hdf5.override { usev110Api = true; };
+    hdf5 = hdf5.override { apiVersion = "v110"; };
   };
 
   mhonarc = perlPackages.MHonArc;
@@ -2720,12 +2720,12 @@ with pkgs;
   nodejs_24 = callPackage ../development/web/nodejs/symlink.nix { nodejs-slim = nodejs-slim_24; };
   corepack_24 = callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs-slim_24; };
 
-  nodejs-slim_25 = callPackage ../development/web/nodejs/v25.nix { };
-  nodejs_25 = callPackage ../development/web/nodejs/symlink.nix { nodejs-slim = nodejs-slim_25; };
+  nodejs-slim_26 = callPackage ../development/web/nodejs/v26.nix { };
+  nodejs_26 = callPackage ../development/web/nodejs/symlink.nix { nodejs-slim = nodejs-slim_26; };
 
   # Update this when adding the newest nodejs major version!
-  nodejs_latest = nodejs_25;
-  nodejs-slim_latest = nodejs-slim_25;
+  nodejs_latest = nodejs_26;
+  nodejs-slim_latest = nodejs-slim_26;
 
   buildNpmPackage = callPackage ../build-support/node/build-npm-package { };
 
@@ -2877,7 +2877,7 @@ with pkgs;
   maple-mono = recurseIntoAttrs (callPackage ../data/fonts/maple-font { });
 
   netcdf-mpi = netcdf.override {
-    hdf5 = hdf5-mpi.override { usev110Api = true; };
+    hdf5 = hdf5-mpi.override { apiVersion = "v110"; };
   };
 
   ioskeley-mono = recurseIntoAttrs (callPackage ../data/fonts/ioskeley-mono { });
@@ -4497,15 +4497,15 @@ with pkgs;
   wrapRustcWith = { rustc-unwrapped, ... }@args: callPackage ../build-support/rust/rustc-wrapper args;
   wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
 
-  rust_1_94 = callPackage ../development/compilers/rust/1_94.nix { };
-  rust = rust_1_94;
+  rust_1_95 = callPackage ../development/compilers/rust/1_95.nix { };
+  rust = rust_1_95;
 
   mrustc = callPackage ../development/compilers/mrustc { };
   mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
   mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
 
-  rustPackages_1_94 = rust_1_94.packages.stable;
-  rustPackages = rustPackages_1_94;
+  rustPackages_1_95 = rust_1_95.packages.stable;
+  rustPackages = rustPackages_1_95;
 
   inherit (rustPackages)
     cargo
@@ -5635,8 +5635,6 @@ with pkgs;
 
   m4 = gnum4;
 
-  gnumake = callPackage ../development/tools/build-managers/gnumake { };
-
   gradle-packages = callPackage ../development/tools/build-managers/gradle { };
 
   gradle_7-unwrapped = gradle-packages.gradle_7;
@@ -6225,6 +6223,8 @@ with pkgs;
       }
   );
 
+  jsoncppSecureMemory = jsoncpp.override { secureMemory = true; };
+
   mtrace = callPackage ../development/libraries/glibc/mtrace.nix { };
 
   # Provided by libc on Operating Systems that use the Extensible Linker Format.
@@ -7391,7 +7391,7 @@ with pkgs;
   };
 
   vigra = callPackage ../development/libraries/vigra {
-    hdf5 = hdf5.override { usev110Api = true; };
+    hdf5 = hdf5.override { apiVersion = "v110"; };
   };
 
   vte-gtk4 = vte.override {
@@ -7654,14 +7654,6 @@ with pkgs;
     ];
   };
 
-  sbcl_2_6_1 = wrapLisp {
-    pkg = callPackage ../development/compilers/sbcl { version = "2.6.1"; };
-    faslExt = "fasl";
-    flags = [
-      "--dynamic-space-size"
-      "3000"
-    ];
-  };
   sbcl_2_6_3 = wrapLisp {
     pkg = callPackage ../development/compilers/sbcl { version = "2.6.3"; };
 
@@ -7671,7 +7663,15 @@ with pkgs;
       "3000"
     ];
   };
-  sbcl = sbcl_2_6_3;
+  sbcl_2_6_4 = wrapLisp {
+    pkg = callPackage ../development/compilers/sbcl { version = "2.6.4"; };
+    faslExt = "fasl";
+    flags = [
+      "--dynamic-space-size"
+      "3000"
+    ];
+  };
+  sbcl = sbcl_2_6_4;
 
   sbclPackages = recurseIntoAttrs sbcl.pkgs;
 
@@ -8620,11 +8620,6 @@ with pkgs;
   systemd = callPackage ../os-specific/linux/systemd {
     # break some cyclic dependencies
     util-linux = util-linuxMinimal;
-    # provide a super minimal gnupg used for systemd-machined
-    gnupg = gnupg.override {
-      enableMinimal = true;
-      guiSupport = false;
-    };
   };
   systemdMinimal = systemd.override {
     pname = "systemd-minimal";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c10b82dbd6b0..ac47671a24ad 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -144,23 +144,6 @@ in
         inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
         inherit buildTargetLlvmPackages llvmPackages;
       };
-      ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix {
-        bootPkgs =
-          if
-            stdenv.buildPlatform.isPower64
-            && stdenv.buildPlatform.isBigEndian
-            && pkgs.stdenv.hostPlatform.isAbiElfv1
-          then
-            # No bindist, "borrowing" the GHC from Debian
-            bb.packages.ghc966DebianBinary
-          else if stdenv.buildPlatform.isi686 then
-            bb.packages.ghc967
-          else
-            bb.packages.ghc984Binary;
-        inherit (buildPackages.python3Packages) sphinx;
-        inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
-        inherit buildTargetLlvmPackages llvmPackages;
-      };
       ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix {
         bootPkgs =
           if
@@ -178,14 +161,6 @@ in
         inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
         inherit buildTargetLlvmPackages llvmPackages;
       };
-      ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {
-        bootPkgs =
-          # No suitable bindist packaged yet
-          bb.packages.ghc9103;
-        inherit (buildPackages.python3Packages) sphinx;
-        inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
-        inherit buildTargetLlvmPackages llvmPackages;
-      };
       ghc9123 = callPackage ../development/compilers/ghc/9.12.3.nix {
         bootPkgs =
           # No suitable bindist packaged yet
@@ -294,21 +269,11 @@ in
         ghc = bh.compiler.ghc984;
         compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
       };
-      ghc9102 = callPackage ../development/haskell-modules {
-        buildHaskellPackages = bh.packages.ghc9102;
-        ghc = bh.compiler.ghc9102;
-        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
-      };
       ghc9103 = callPackage ../development/haskell-modules {
         buildHaskellPackages = bh.packages.ghc9103;
         ghc = bh.compiler.ghc9103;
         compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
       };
-      ghc9122 = callPackage ../development/haskell-modules {
-        buildHaskellPackages = bh.packages.ghc9122;
-        ghc = bh.compiler.ghc9122;
-        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
-      };
       ghc9123 = callPackage ../development/haskell-modules {
         buildHaskellPackages = bh.packages.ghc9123;
         ghc = bh.compiler.ghc9123;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f09928ddacb6..1a33645ecfe7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7270,6 +7270,8 @@ self: super: with self; {
 
   httpx-auth = callPackage ../development/python-modules/httpx-auth { };
 
+  httpx-curl-cffi = callPackage ../development/python-modules/httpx-curl-cffi { };
+
   httpx-ntlm = callPackage ../development/python-modules/httpx-ntlm { };
 
   httpx-oauth = callPackage ../development/python-modules/httpx-oauth { };
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 48cf97bd9653..6ed29a18e494 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -293,6 +293,7 @@ let
         hlint
         hpack
         hscolour
+        hugs
         icepeak
         ihaskell
         jacinda
@@ -376,7 +377,10 @@ let
             "aarch64-darwin"
           ]
           {
-            haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler;
+            haskell.compiler = packagePlatforms (
+              # hugs doesn't build on musl yet
+              lib.filterAttrs (name: _: !(lib.hasPrefix "microhs" name)) pkgs.pkgsMusl.haskell.compiler
+            );
 
             # Get some cache going for MUSL-enabled GHC.
             haskellPackages = {
@@ -543,6 +547,7 @@ let
       ] released;
       hpack = released;
       hsdns = released;
+      iserv-proxy = released;
       jailbreak-cabal = released;
       language-nix = released;
       nix-paths = released;