R updates (#523821)

https://hydra.nixos.org/build/331060145/nixlog/4/tail

doc/languages-frameworks/javascript.section.md

@@ -366,7 +366,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-slim_22; };
++  # pnpm = pnpm_10.override { nodejs-slim = nodejs-slim_22; };
 +in
  stdenv.mkDerivation (finalAttrs: {
    pname = "foo";

maintainers/maintainer-list.nix

@@ -4158,6 +4158,13 @@
     githubId = 30717258;
     name = "bubblepipe";
   };
+  bubylou = {
+    email = "bubylou@pm.me";
+    matrix = "@bubylou:matrix.org";
+    github = "bubylou";
+    githubId = 3878640;
+    name = "Nicholas Malcolm";
+  };
   buckley310 = {
     email = "sean.bck@gmail.com";
     matrix = "@buckley310:matrix.org";

nixos/doc/manual/redirects.json

@@ -65,6 +65,42 @@
   "module-services-keycloak-unix-socket": [
     "index.html#module-services-keycloak-unix-socket"
   ],
+  "module-services-mautrix-discord": [
+    "index.html#module-services-mautrix-discord"
+  ],
+  "module-services-mautrix-discord-advanced": [
+    "index.html#module-services-mautrix-discord-advanced"
+  ],
+  "module-services-mautrix-discord-authentication": [
+    "index.html#module-services-mautrix-discord-authentication"
+  ],
+  "module-services-mautrix-discord-backfill": [
+    "index.html#module-services-mautrix-discord-backfill"
+  ],
+  "module-services-mautrix-discord-basic-example": [
+    "index.html#module-services-mautrix-discord-basic-example"
+  ],
+  "module-services-mautrix-discord-basic-usage": [
+    "index.html#module-services-mautrix-discord-basic-usage"
+  ],
+  "module-services-mautrix-discord-double-puppet": [
+    "index.html#module-services-mautrix-discord-double-puppet"
+  ],
+  "module-services-mautrix-discord-encryption": [
+    "index.html#module-services-mautrix-discord-encryption"
+  ],
+  "module-services-mautrix-discord-server-defaults": [
+    "index.html#module-services-mautrix-discord-server-defaults"
+  ],
+  "module-services-mautrix-discord-setup": [
+    "index.html#module-services-mautrix-discord-setup"
+  ],
+  "module-services-mautrix-discord-synapse": [
+    "index.html#module-services-mautrix-discord-synapse"
+  ],
+  "module-services-mautrix-discord-troubleshooting": [
+    "index.html#module-services-mautrix-discord-troubleshooting"
+  ],
   "module-services-tandoor-recipes-migrating-media-option-move": [
     "index.html#module-services-tandoor-recipes-migrating-media-option-move",
     "index.html#module-services-tandoor-recipes-migrating-media-option-1"

nixos/modules/programs/iotop.nix

@@ -12,9 +12,15 @@ in
   options = {
     programs.iotop = {
       enable = lib.mkEnableOption "iotop + setcap wrapper";
+
       package = lib.mkPackageOption pkgs "iotop" { example = "iotop-c"; };
+
+      enableDelayacct = lib.mkEnableOption ''
+        the task_delayacct kernel task delay accounting in order to show all
+        statistics'';
     };
   };
+
   config = lib.mkIf cfg.enable {
     security.wrappers.iotop = {
       owner = "root";
@@ -22,5 +28,7 @@ in
       capabilities = "cap_net_admin+p";
       source = lib.getExe cfg.package;
     };
+
+    boot.kernel.sysctl = lib.mkIf cfg.enableDelayacct { "kernel.task_delayacct" = 1; };
   };
 }

nixos/modules/services/matrix/mautrix-discord.md

@@ -0,0 +1,156 @@
+# Mautrix-Discord {#module-services-mautrix-discord}
+
+*Source:* {file}`modules/services/matrix/mautrix-discord`
+
+*Upstream documentation:* <https://docs.mau.fi/bridges/go/discord/index.html>
+
+[Mautrix-Discord](https://github.com/mautrix/discord) is a Matrix-Discord bridge.
+
+## Basic Usage {#module-services-mautrix-discord-basic-usage}
+
+The common setup is to enable the bridge, point it at your homeserver, and set the permissions you want to allow:
+
+1. Set `services.mautrix-discord.enable` to `true`.
+2. Set `services.mautrix-discord.settings.homeserver.address` and `services.mautrix-discord.settings.homeserver.domain`.
+3. Override `services.mautrix-discord.settings.bridge.permissions` if the default relay permissions do not fit your deployment.
+
+The module provides sensible defaults for the appservice listener, registration tokens, and relay permissions.
+
+### Basic Example {#module-services-mautrix-discord-basic-example}
+
+```nix
+{
+  services.mautrix-discord = {
+    enable = true;
+    registerToSynapse = true;
+    settings = {
+      homeserver = {
+        address = "http://localhost:8008";
+        domain = "example.com";
+      };
+      bridge.permissions = {
+        "example.com" = "user";
+        "@admin:example.com" = "admin";
+      };
+    };
+  };
+}
+```
+
+### Server Defaults {#module-services-mautrix-discord-server-defaults}
+
+By default, the bridge listens on `http://localhost:29334` and generates its appservice tokens automatically.
+
+## Authentication {#module-services-mautrix-discord-authentication}
+
+If you want to store the bridge database outside the default SQLite file, set `settings.appservice.database` to use PostgreSQL instead of SQLite:
+
+```nix
+{
+  services.mautrix-discord.settings.appservice.database = {
+    type = "postgres";
+    uri = "postgresql:///mautrix-discord?host=/run/postgresql";
+  };
+}
+```
+
+If the connection needs a password, combine it with `services.mautrix-discord.environmentFile`:
+
+```nix
+{
+  services.mautrix-discord = {
+    environmentFile = "/run/secrets/mautrix-discord-env";
+    settings.appservice.database.uri = "postgresql://mautrix:$DB_PASSWORD@localhost/mautrix-discord";
+  };
+}
+```
+
+Use `services.mautrix-discord.environmentFile` for any secret you do not want in the Nix store.
+This includes database passwords, shared secrets, and similar values.
+
+Example:
+
+```nix
+{
+  services.mautrix-discord = {
+    environmentFile = "/run/secrets/mautrix-discord-env";
+    settings.bridge.login_shared_secret_map = {
+      "example.com" = "$SHARED_SECRET";
+    };
+  };
+}
+```
+
+## Bridge Setup {#module-services-mautrix-discord-setup}
+
+After the service starts, open a chat with `@discordbot:example.com`, send `login`, and follow the instructions to link your Discord account.
+
+For more detail, see the [Mautrix-Discord documentation](https://docs.mau.fi/bridges/go/discord/index.html).
+
+## Advanced Configuration {#module-services-mautrix-discord-advanced}
+
+The upstream default configuration is available at [example-config.yaml](https://github.com/mautrix/discord/blob/main/example-config.yaml). To print the generated default configuration from the package, run:
+
+```bash
+nix-shell -p mautrix-discord --run "mautrix-discord -e"
+```
+
+### Encryption {#module-services-mautrix-discord-encryption}
+
+```nix
+{
+  services.mautrix-discord.settings.bridge.encryption = {
+    allow = true;
+    default = true;
+    require = false;
+  };
+}
+```
+
+Encryption needs additional bridge-side setup. See the [bridge encryption documentation](https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html) for details.
+
+### Backfill {#module-services-mautrix-discord-backfill}
+
+```nix
+{
+  services.mautrix-discord.settings.bridge.backfill.forward_limits.initial = {
+    dm = 50;
+    channel = 50;
+    thread = 50;
+  };
+}
+```
+
+### Double Puppeting {#module-services-mautrix-discord-double-puppet}
+
+```nix
+{
+  services.mautrix-discord = {
+    environmentFile = "/run/secrets/mautrix-discord-env";
+    settings.bridge.login_shared_secret_map = {
+      "example.com" = "$SHARED_SECRET";
+    };
+  };
+}
+```
+where  `/run/secrets/mautrix-discord-env` contains
+```
+SHARED_SECRET=aProtectedSecret
+```
+
+## Synapse Integration {#module-services-mautrix-discord-synapse}
+
+When `services.mautrix-discord.registerToSynapse` is `true`, the bridge writes its registration file automatically and Synapse picks it up.
+
+If Synapse is enabled, this option defaults to `true`.
+
+## Troubleshooting {#module-services-mautrix-discord-troubleshooting}
+
+- View logs with `journalctl -u mautrix-discord.service -f`.
+- Check `systemctl status mautrix-discord` if the bridge does not start.
+- Verify the homeserver can reach the configured appservice address.
+- Ensure the registration file exists and Synapse can read it.
+
+For more help, see the
+[Mautrix-Discord documentation](https://docs.mau.fi/bridges/go/discord/index.html)
+or the support room at [#discord:maunium.net](https://matrix.to/#/#discord:maunium.net).

nixos/modules/services/matrix/mautrix-discord.nix

@@ -5,15 +5,59 @@
   ...
 }:
 let
+  defaultDataDir = "/var/lib/mautrix-discord";
   cfg = config.services.mautrix-discord;
   dataDir = cfg.dataDir;
   format = pkgs.formats.yaml { };
+  serviceDependencies = [
+    "mautrix-discord-registration.service"
+  ]
+  ++ (lib.lists.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit)
+  ++ (lib.lists.optional config.services.matrix-conduit.enable "matrix-conduit.service")
+  ++ (lib.lists.optional config.services.dendrite.enable "dendrite.service");
 
   registrationFile = "${dataDir}/discord-registration.yaml";
 
   settingsFile = "${dataDir}/config.yaml";
   settingsFileUnformatted = format.generate "discord-config-unsubstituted.yaml" cfg.settings;
   default_token = "This value is generated when generating the registration";
+  settingsDefault = {
+    homeserver = {
+      address = "";
+      domain = "";
+    };
+
+    appservice = {
+      address = "http://localhost:29334";
+      hostname = "0.0.0.0";
+      port = 29334;
+      database = {
+        type = "sqlite3";
+        uri = "file:${defaultDataDir}/mautrix-discord.db?_txlock=immediate";
+      };
+      id = "discord";
+      bot = {
+        username = "discordbot";
+        displayname = "Discord bridge bot";
+        avatar = "mxc://maunium.net/nIdEykemnwdisvHbpxflpDlC";
+      };
+      as_token = default_token;
+      hs_token = default_token;
+    };
+
+    bridge.permissions."*" = "relay";
+
+    logging = {
+      min_level = "info";
+      writers = [
+        {
+          type = "stdout";
+          format = "pretty-colored";
+          time_format = " ";
+        }
+      ];
+    };
+  };
 in
 {
   options = {
@@ -23,238 +67,14 @@ in
       package = lib.mkPackageOption pkgs "mautrix-discord" { };
 
       settings = lib.mkOption {
-        type = lib.types.submodule {
-          freeformType = format.type;
-
-          config = {
-            _module.args = { inherit cfg lib; };
-          };
-
-          options = {
-            homeserver = lib.mkOption {
-              type = lib.types.attrs;
-              default = {
-                software = "standard";
-                status_endpoint = null;
-                message_send_checkpoint_endpoint = null;
-                async_media = false;
-                websocket = false;
-                ping_interval_seconds = 0;
-              };
-              description = ''
-                fullDataDiration.
-                                See [example-config.yaml](https://github.com/mautrix/discord/blob/main/example-config.yaml)
-                                for more information.
-              '';
-            };
-
-            appservice = lib.mkOption {
-              type = lib.types.attrs;
-              default = {
-                address = "http://localhost:29334";
-                hostname = "0.0.0.0";
-                port = 29334;
-                database = {
-                  type = "sqlite3";
-                  uri = "file:/var/lib/mautrix-discord/mautrix-discord.db?_txlock=immediate";
-                  max_open_conns = 20;
-                  max_idle_conns = 2;
-                  max_conn_idle_time = null;
-                  max_conn_lifetime = null;
-                };
-                id = "discord";
-                bot = {
-                  username = "discordbot";
-                  displayname = "Discord bridge bot";
-                  avatar = "mxc://maunium.net/nIdEykemnwdisvHbpxflpDlC";
-                };
-                ephemeral_events = true;
-                async_transactions = false;
-                as_token = "This value is generated when generating the registration";
-                hs_token = "This value is generated when generating the registration";
-              };
-              defaultText = lib.literalExpression ''
-                {
-                  address = "http://localhost:29334";
-                  hostname = "0.0.0.0";
-                  port = 29334;
-                  database = {
-                    type = "sqlite3";
-                    uri = "file:''${config.services.mautrix-discord.dataDir}/mautrix-discord.db?_txlock=immediate";
-                    max_open_conns = 20;
-                    max_idle_conns = 2;
-                    max_conn_idle_time = null;
-                    max_conn_lifetime = null;
-                  };
-                  id = "discord";
-                  bot = {
-                    username = "discordbot";
-                    displayname = "Discord bridge bot";
-                    avatar = "mxc://maunium.net/nIdEykemnwdisvHbpxflpDlC";
-                  };
-                  ephemeral_events = true;
-                  async_transactions = false;
-                  as_token = "This value is generated when generating the registration";
-                  hs_token = "This value is generated when generating the registration";
-                }
-              '';
-              description = ''
-                Appservice configuration.
-                See [example-config.yaml](https://github.com/mautrix/discord/blob/main/example-config.yaml)
-                for more information.
-              '';
-            };
-
-            bridge = lib.mkOption {
-              type = lib.types.attrs;
-              default = {
-                username_template = "discord_{{.}}";
-                displayname_template = "{{if .Webhook}}Webhook{{else}}{{or .GlobalName .Username}}{{if .Bot}} (bot){{end}}{{end}}";
-                channel_name_template = "{{if or (eq .Type 3) (eq .Type 4)}}{{.Name}}{{else}}#{{.Name}}{{end}}";
-                guild_name_template = "{{.Name}}";
-                private_chat_portal_meta = "default";
-                public_address = null;
-                avatar_proxy_key = "generate";
-                portal_message_buffer = 128;
-                startup_private_channel_create_limit = 5;
-                delivery_receipts = false;
-                message_status_events = false;
-                message_error_notices = true;
-                restricted_rooms = true;
-                autojoin_thread_on_open = true;
-                embed_fields_as_tables = true;
-                mute_channels_on_create = false;
-                sync_direct_chat_list = false;
-                resend_bridge_info = false;
-                custom_emoji_reactions = true;
-                delete_portal_on_channel_delete = false;
-                delete_guild_on_leave = true;
-                federate_rooms = true;
-                prefix_webhook_messages = true;
-                enable_webhook_avatars = false;
-                use_discord_cdn_upload = true;
-                #proxy =
-                cache_media = "unencrypted";
-                direct_media = {
-                  enabled = false;
-                  #server_name = "discord-media.example.com";
-                  #well_known_response =
-                  allow_proxy = true;
-                  server_key = "generate";
-                };
-                animated_sticker = {
-                  target = "webp";
-                  args = {
-                    width = 320;
-                    height = 320;
-                    fps = 25;
-                  };
-                };
-                double_puppet_server_map = {
-                  #"example.com" = "https://example.com";
-                };
-                double_puppet_allow_discovery = false;
-                login_shared_secret_map = {
-                  #"example.com" = "foobar";
-                };
-                command_prefix = "!discord";
-                management_room_text = {
-                  welcome = "Hello, I'm a Discord bridge bot.";
-                  welcome_connected = "Use `help` for help.";
-                  welcome_unconnected = "Use `help` for help or `login` to log in.";
-                  additional_help = "";
-                };
-                backfill = {
-                  forward_limits = {
-                    initial = {
-                      dm = 0;
-                      channel = 0;
-                      thread = 0;
-                    };
-                    missed = {
-                      dm = 0;
-                      channel = 0;
-                      thread = 0;
-                    };
-                    max_guild_members = -1;
-                  };
-                };
-                encryption = {
-                  allow = false;
-                  default = false;
-                  appservice = false;
-                  msc4190 = false;
-                  require = false;
-                  allow_key_sharing = false;
-                  plaintext_mentions = false;
-                  delete_keys = {
-                    delete_outbound_on_ack = false;
-                    dont_store_outbound = false;
-                    ratchet_on_decrypt = false;
-                    delete_fully_used_on_decrypt = false;
-                    delete_prev_on_new_session = false;
-                    delete_on_device_delete = false;
-                    periodically_delete_expired = false;
-                    delete_outdated_inbound = false;
-                  };
-                  verification_levels = {
-                    receive = "unverified";
-                    send = "unverified";
-                    share = "cross-signed-tofu";
-                  };
-                  rotation = {
-                    enable_custom = false;
-                    milliseconds = 604800000;
-                    messages = 100;
-                    disable_device_change_key_rotation = false;
-                  };
-                };
-                provisioning = {
-                  prefix = "/_matrix/provision";
-                  shared_secret = "generate";
-                  debug_endpoints = false;
-                };
-                permissions = {
-                  "*" = "relay";
-                  #"example.com" = "user";
-                  #"@admin:example.com": "admin";
-                };
-              };
-              description = ''
-                Bridge configuration.
-                See [example-config.yaml](https://github.com/mautrix/discord/blob/main/example-config.yaml)
-                for more information.
-              '';
-            };
-            logging = lib.mkOption {
-              type = lib.types.attrs;
-              default = {
-                min_level = "info";
-                writers = lib.singleton {
-                  type = "stdout";
-                  format = "pretty-colored";
-                  time_format = " ";
-                };
-              };
-              description = ''
-                Logging configuration.
-                See [example-config.yaml](https://github.com/mautrix/discord/blob/main/example-config.yaml)
-                for more information.
-              '';
-            };
-          };
-        };
-        default = { };
+        apply = lib.recursiveUpdate settingsDefault;
+        type = format.type;
+        default = settingsDefault;
         example = lib.literalExpression ''
           {
             homeserver = {
               address = "http://localhost:8008";
-              domain = "public-domain.tld";
-            };
-
-            appservice.public = {
-              prefix = "/public";
-              external = "https://public-appservice-address/public";
+              domain = "example.com";
             };
 
             bridge.permissions = {
@@ -265,8 +85,12 @@ in
         '';
         description = ''
           {file}`config.yaml` configuration as a Nix attribute set.
+
           Configuration options should match those described in
           [example-config.yaml](https://github.com/mautrix/discord/blob/main/example-config.yaml).
+
+          Secret tokens should be specified using {option}`environmentFile`
+          instead of this world-readable attribute set.
         '';
       };
 
@@ -282,12 +106,9 @@ in
 
       dataDir = lib.mkOption {
         type = lib.types.path;
-        default = "/var/lib/mautrix-discord";
-        defaultText = "/var/lib/mautrix-discord";
-        description = ''
-          Directory to store the bridge's configuration and database files.
-          This directory will be created if it does not exist.
-        '';
+        default = defaultDataDir;
+        defaultText = defaultDataDir;
+        description = "Directory to store the bridge's data.";
       };
 
       # TODO: Get upstream to add an environment File option. Refer to https://github.com/NixOS/nixpkgs/pull/404871#issuecomment-2895663652 and https://github.com/mautrix/discord/issues/187
@@ -295,92 +116,31 @@ in
         type = lib.types.nullOr lib.types.path;
         default = null;
         description = ''
-          File containing environment variables to substitute when copying the configuration
-          out of Nix store to the `services.mautrix-discord.dataDir`.
-          Can be used for storing the secrets without making them available in the Nix store.
-          For example, you can set `services.mautrix-discord.settings.appservice.as_token = "$MAUTRIX_DISCORD_APPSERVICE_AS_TOKEN"`
-          and then specify `MAUTRIX_DISCORD_APPSERVICE_AS_TOKEN="{token}"` in the environment file.
-          This value will get substituted into the configuration file as a token.
+          File containing environment variables for secret substitution.
+          Variables in the config like `$VARIABLE` will be replaced.
         '';
       };
 
-      serviceUnit = lib.mkOption {
-        type = lib.types.str;
-        readOnly = true;
-        default = "mautrix-discord.service";
-        description = ''
-          The systemd unit (a service or a target) for other services to depend on if they
-          need to be started after matrix-synapse.
-          This option is useful as the actual parent unit for all matrix-synapse processes
-          changes when configuring workers.
-        '';
-      };
-
-      registrationServiceUnit = lib.mkOption {
-        type = lib.types.str;
-        readOnly = true;
-        default = "mautrix-discord-registration.service";
-        description = ''
-          The registration service that generates the registration file.
-          Systemd unit (a service or a target) for other services to depend on if they
-          need to be started after mautrix-discord registration service.
-          This option is useful as the actual parent unit for all matrix-synapse processes
-          changes when configuring workers.
-        '';
-      };
-
-      serviceDependencies = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        default = [
-          cfg.registrationServiceUnit
-        ]
-        ++ (lib.lists.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit)
-        ++ (lib.lists.optional config.services.matrix-conduit.enable "matrix-conduit.service")
-        ++ (lib.lists.optional config.services.dendrite.enable "dendrite.service");
-
-        defaultText = ''
-          [ cfg.registrationServiceUnit ] ++
-          (lib.lists.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) ++
-          (lib.lists.optional config.services.matrix-conduit.enable "matrix-conduit.service") ++
-          (lib.lists.optional config.services.dendrite.enable "dendrite.service");
-        '';
-        description = ''
-          List of Systemd services to require and wait for when starting the application service.
-        '';
-      };
     };
   };
   config = lib.mkIf cfg.enable {
+
     assertions = [
       {
         assertion =
-          cfg.settings.homeserver.domain or "" != "" && cfg.settings.homeserver.address or "" != "";
-        message = ''
-          The options with information about the homeserver:
-          `services.mautrix-discord.settings.homeserver.domain` and
-          `services.mautrix-discord.settings.homeserver.address` have to be set.
-        '';
-      }
-      {
-        assertion = cfg.settings.bridge.permissions or { } != { };
-        message = ''
-          The option `services.mautrix-discord.settings.bridge.permissions` has to be set.
-        '';
+          cfg.settings.homeserver.address or "" != "" && cfg.settings.homeserver.domain or "" != "";
+        message = "services.mautrix-discord.settings.homeserver.{address,domain} must be set.";
       }
     ];
 
     users.users.mautrix-discord = {
       isSystemUser = true;
       group = "mautrix-discord";
-      extraGroups = [ "mautrix-discord-registration" ];
       home = dataDir;
       description = "Mautrix-Discord bridge user";
     };
 
     users.groups.mautrix-discord = { };
-    users.groups.mautrix-discord-registration = {
-      members = lib.lists.optional config.services.matrix-synapse.enable "matrix-synapse";
-    };
 
     services.matrix-synapse = lib.mkIf cfg.registerToSynapse {
       settings.app_service_config_files = [ registrationFile ];
@@ -392,7 +152,9 @@ in
 
     systemd.services = {
       matrix-synapse = lib.mkIf cfg.registerToSynapse {
-        serviceConfig.SupplementaryGroups = [ "mautrix-discord-registration" ];
+        serviceConfig.SupplementaryGroups = [
+          "mautrix-discord"
+        ];
         # Make synapse depend on the registration service when auto-registering
         wants = [ "mautrix-discord-registration.service" ];
         after = [ "mautrix-discord-registration.service" ];
@@ -471,15 +233,18 @@ in
             '${settingsFile}' '${registrationFile}' > '${registrationFile}.tmp'
           mv '${registrationFile}.tmp' '${registrationFile}'
 
+          # Application services should not be rate limited by default.
+          yq -Y '.rate_limited = false' '${registrationFile}' > '${registrationFile}.tmp'
+          mv '${registrationFile}.tmp' '${registrationFile}'
+
           umask $old_umask
-          chown :mautrix-discord-registration '${registrationFile}'
           chmod 640 '${registrationFile}'
         '';
 
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
-          UMask = 27;
+          UMask = "027";
 
           User = "mautrix-discord";
           Group = "mautrix-discord";
@@ -501,8 +266,8 @@ in
         description = "Mautrix-Discord, a Matrix-Discord puppeting/relaybot bridge";
 
         wantedBy = [ "multi-user.target" ];
-        wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
-        after = [ "network-online.target" ] ++ cfg.serviceDependencies;
+        wants = [ "network-online.target" ] ++ serviceDependencies;
+        after = [ "network-online.target" ] ++ serviceDependencies;
         path = [
           pkgs.lottieconverter
           pkgs.ffmpeg-headless
@@ -536,6 +301,8 @@ in
           ProtectHostname = true;
           ProtectClock = true;
 
+          UMask = "027";
+
           SystemCallArchitectures = "native";
           SystemCallErrorNumber = "EPERM";
           SystemCallFilter = "@system-service";
@@ -546,10 +313,12 @@ in
       };
     };
 
-    meta = {
-      maintainers = with lib.maintainers; [
-        mistyttm
-      ];
-    };
+  };
+
+  meta = {
+    maintainers = with lib.maintainers; [
+      mistyttm
+    ];
+    doc = ./mautrix-discord.md;
   };
 }

nixos/tests/installer.nix

@@ -1209,9 +1209,9 @@ in
     createPartitions = ''
       installer.succeed(
           "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
-          + " mkpart ESP fat32 1M 100MiB"  # /boot
+          + " mkpart ESP fat32 1M 170MiB"  # /boot
           + " set 1 boot on"
-          + " mkpart primary linux-swap 100MiB 1024MiB"
+          + " mkpart primary linux-swap 170MiB 1024MiB"
           + " mkpart primary ext2 1024MiB -1MiB",  # /
           "udevadm settle",
           "mkswap /dev/vda2 -L swap",

nixos/tests/matrix/mautrix-discord.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 let
   homeserverUrl = "http://homeserver:8008";
 in
@@ -53,6 +53,7 @@ in
 
             appservice = {
               address = "http://homeserver:8009";
+              hostname = "0.0.0.0";
               port = 8009;
               id = "discord";
               bot = {
@@ -60,8 +61,6 @@ in
                 displayname = "Discord bridge bot";
                 avatar = "mxc://maunium.net/nIdEykemnwdisvHbpxflpDlC";
               };
-              # Don't override as_token/hs_token - let them use the default placeholder
-              # which will trigger automatic generation
 
               database = {
                 type = "sqlite3";
@@ -75,6 +74,17 @@ in
                 "*" = "relay";
               };
             };
+
+            logging = {
+              min_level = "info";
+              writers = [
+                {
+                  type = "stdout";
+                  format = "pretty-colored";
+                  time_format = " ";
+                }
+              ];
+            };
           };
         };
 
@@ -157,6 +167,57 @@ in
     with subtest("verify registration file was created"):
         homeserver.wait_until_succeeds("test -f /var/lib/mautrix-discord/discord-registration.yaml")
 
+        # Verify the module wrote the expected bridge configuration.
+        config_homeserver_address = homeserver.succeed("yq -r '.homeserver.address' /var/lib/mautrix-discord/config.yaml").strip()
+        config_homeserver_domain = homeserver.succeed("yq -r '.homeserver.domain' /var/lib/mautrix-discord/config.yaml").strip()
+        config_appservice_address = homeserver.succeed("yq -r '.appservice.address' /var/lib/mautrix-discord/config.yaml").strip()
+        config_appservice_hostname = homeserver.succeed("yq -r '.appservice.hostname' /var/lib/mautrix-discord/config.yaml").strip()
+        config_appservice_port = homeserver.succeed("yq -r '.appservice.port' /var/lib/mautrix-discord/config.yaml").strip()
+        config_appservice_id = homeserver.succeed("yq -r '.appservice.id' /var/lib/mautrix-discord/config.yaml").strip()
+        config_bot_username = homeserver.succeed("yq -r '.appservice.bot.username' /var/lib/mautrix-discord/config.yaml").strip()
+        config_bot_displayname = homeserver.succeed("yq -r '.appservice.bot.displayname' /var/lib/mautrix-discord/config.yaml").strip()
+        config_bot_avatar = homeserver.succeed("yq -r '.appservice.bot.avatar' /var/lib/mautrix-discord/config.yaml").strip()
+        config_database_type = homeserver.succeed("yq -r '.appservice.database.type' /var/lib/mautrix-discord/config.yaml").strip()
+        config_database_uri = homeserver.succeed("yq -r '.appservice.database.uri' /var/lib/mautrix-discord/config.yaml").strip()
+        config_permission = homeserver.succeed("yq -r '.bridge.permissions[\"*\"]' /var/lib/mautrix-discord/config.yaml").strip()
+        config_logging_min_level = homeserver.succeed("yq -r '.logging.min_level' /var/lib/mautrix-discord/config.yaml").strip()
+        config_logging_writer_type = homeserver.succeed("yq -r '.logging.writers[0].type' /var/lib/mautrix-discord/config.yaml").strip()
+        config_logging_writer_format = homeserver.succeed("yq -r '.logging.writers[0].format' /var/lib/mautrix-discord/config.yaml").strip()
+        reg_rate_limited = homeserver.succeed("yq -r '.rate_limited' /var/lib/mautrix-discord/discord-registration.yaml").strip()
+
+        assert config_homeserver_address == "http://homeserver:8008", \
+          f"Unexpected homeserver address: {config_homeserver_address}"
+        assert config_homeserver_domain == "homeserver", \
+          f"Unexpected homeserver domain: {config_homeserver_domain}"
+        assert config_appservice_address == "http://homeserver:8009", \
+          f"Unexpected appservice address: {config_appservice_address}"
+        assert config_appservice_hostname == "0.0.0.0", \
+          f"Unexpected appservice hostname: {config_appservice_hostname}"
+        assert config_appservice_port == "8009", \
+          f"Unexpected appservice port: {config_appservice_port}"
+        assert config_appservice_id == "discord", \
+          f"Unexpected appservice id: {config_appservice_id}"
+        assert config_bot_username == "discordbot", \
+          f"Unexpected bot username: {config_bot_username}"
+        assert config_bot_displayname == "Discord bridge bot", \
+          f"Unexpected bot displayname: {config_bot_displayname}"
+        assert config_bot_avatar == "mxc://maunium.net/nIdEykemnwdisvHbpxflpDlC", \
+          f"Unexpected bot avatar: {config_bot_avatar}"
+        assert config_database_type == "sqlite3-fk-wal", \
+          f"Unexpected database type: {config_database_type}"
+        assert config_database_uri == "file:/var/lib/mautrix-discord/mautrix-discord.db?_txlock=immediate", \
+          f"Unexpected database uri: {config_database_uri}"
+        assert config_permission == "relay", \
+          f"Unexpected default permission mapping: {config_permission}"
+        assert config_logging_min_level == "info", \
+          f"Unexpected logging min_level: {config_logging_min_level}"
+        assert config_logging_writer_type == "stdout", \
+          f"Unexpected logging writer type: {config_logging_writer_type}"
+        assert config_logging_writer_format == "pretty-colored", \
+          f"Unexpected logging writer format: {config_logging_writer_format}"
+        assert reg_rate_limited == "false", \
+          f"Registration file should disable rate limiting by default, got: {reg_rate_limited}"
+
         # Verify tokens were generated and are not default values
         config_as_token = homeserver.succeed("yq -r '.appservice.as_token' /var/lib/mautrix-discord/config.yaml").strip()
         config_hs_token = homeserver.succeed("yq -r '.appservice.hs_token' /var/lib/mautrix-discord/config.yaml").strip()

pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix

@@ -10,12 +10,12 @@
   nix-update-script,
 }:
 let
-  version = "2.0.3";
+  version = "2.0.5";
   src = fetchFromGitHub {
     owner = "mistricky";
     repo = "codesnap.nvim";
     tag = "v${version}";
-    hash = "sha256-mpH+sewIXgl4vYLDToMYx3IX19HFPDjBWmMRdYGVsIw=";
+    hash = "sha256-X631pK8pAAdQMO4uQUoNk+jL1V9BvAq3cIi4f5LMT5s=";
   };
   codesnap-lib = rustPlatform.buildRustPackage {
     pname = "codesnap-lib";
@@ -23,7 +23,7 @@ let
 
     sourceRoot = "${src.name}/generator";
 
-    cargoHash = "sha256-tV0Mi+SgdVWkY0fSQ3ZfQnHa8mM8f/49Zy8iv94qBjA=";
+    cargoHash = "sha256-b+S56yRtly25fW1XmOVx5D3AT6PEY186r/KXVPI13dM=";
 
     nativeBuildInputs = [
       pkg-config

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -132,6 +132,8 @@
   # tv.nvim dependency
   television,
   tree-sitter,
+  # fugit2-nvim
+  gpgme,
 }:
 self: super:
 let
@@ -1502,11 +1504,17 @@ assertNoAdditions {
       plenary-nvim
     ];
     # Patch libgit2 library dependency
+    # Patch gpgme path
     postPatch = ''
       substituteInPlace lua/fugit2/core/libgit2.lua \
         --replace-fail \
         'M.library_path = "libgit2"' \
         'M.library_path = "${lib.getLib libgit2}/lib/libgit2${stdenv.hostPlatform.extensions.sharedLibrary}"'
+
+      substituteInPlace lua/fugit2/core/gpgme.lua \
+        --replace-fail \
+        'local gpgme_library_path = "gpgme"' \
+        'local gpgme_library_path = "${lib.getLib gpgme}/lib/libgpgme${stdenv.hostPlatform.extensions.sharedLibrary}"'
     '';
   };
 

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

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore rec {
   core = "atari800";
-  version = "0-unstable-2026-05-11";
+  version = "0-unstable-2026-05-28";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-atari800";
-    rev = "1851228de23b47cb74fbc8ea589a1c7c5e02ea98";
-    hash = "sha256-s7M7yezPWzRokrxpoo8JbgOzi5R18yOQNgmHkTQR7S4=";
+    rev = "b6638e72b9d7770144837b0b63c637dd7ab2b39c";
+    hash = "sha256-G1RJXhgMq8txotriK0Xy8HdDDCzeDbEQ+3LQ5sUt8G0=";
   };
 
   makefile = "Makefile";

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

@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2026-05-22";
+  version = "0-unstable-2026-06-05";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "bb304918f8d9f1d2c1e80ccabfa86806ef70bcfa";
-    hash = "sha256-ZtPXCv1nte0Z39jvZremR9POSanz+MZbkzqFXtoZLqc=";
+    rev = "751295151eed3cae619b14bcee49bb07f4fdb59c";
+    hash = "sha256-PwmJspKYWS7WUAK7XRr2FYiAMnc03xp8qH23EZUC6Hs=";
     fetchSubmodules = true;
   };
 

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -580,13 +580,13 @@
     "vendorHash": "sha256-sPQR+LDZRMXygLUd9xj6/bI+8DhAPKbkytlTzmrEOBU="
   },
   "hashicorp_google": {
-    "hash": "sha256-Aj6eAquHfntl2682UedJ4b6DNPuGr+4aeNo++L76mEA=",
+    "hash": "sha256-GTcMwL5lZ81KDtohog4cCvy9zxXU/jh5k+aLosZZfRM=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v7.33.0",
+    "rev": "v7.35.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-qSiOXUfoNaG2+Fu7QvP9uafZp0CMvJJBzaKluCf1g+4="
+    "vendorHash": "sha256-R3Bd+n/ySx4FyDQAP72P0hIjTSQjzNJE2QqUgRV+eQE="
   },
   "hashicorp_google-beta": {
     "hash": "sha256-MGiIQ+BPe5HUn60EnKwflhxfz1I6NaRxN/OyEh/tXKs=",
@@ -815,13 +815,13 @@
     "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk="
   },
   "keycloak_keycloak": {
-    "hash": "sha256-55/a3lJCJEOIDsnFckx5BsUClphPZ9BSBvWxQBq1D9Y=",
+    "hash": "sha256-3KlfUM3qQwzRlUkuq+91z1VjRxIL3qcdCHfkVnfYJKQ=",
     "homepage": "https://registry.terraform.io/providers/keycloak/keycloak",
     "owner": "keycloak",
     "repo": "terraform-provider-keycloak",
-    "rev": "v5.7.0",
+    "rev": "v5.8.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-JgQqOm+cAMLACp/rVz3ek1C4uuTAs8vqDcwRkpFssYc="
+    "vendorHash": "sha256-JTcIyUKoeCRxAzUWJy9FkMCYy3+D70uyzuiSTW3nHlA="
   },
   "kislerdm_neon": {
     "hash": "sha256-1o5EnAI9X8Q+dXxh1/jZwimy1MmPDF3X2aRc+HO7HpQ=",

pkgs/applications/science/math/R/default.nix

@@ -45,7 +45,7 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "R";
-  version = "4.5.3";
+  version = "4.6.0";
 
   src =
     let
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     in
     fetchurl {
       url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
-      hash = "sha256-qlwe1Ck8cnGsUT1lRnA1asDopq1eQr4BQ2XREVC1uPI=";
+      hash = "sha256-uNybRUNmDHtZa4eTjfUyOUNQNgl2Un00QijuDtEuRew=";
     };
 
   outputs = [

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

@@ -50,9 +50,21 @@ in
       filterFlags = lib.map (package: "--filter=${package}") pnpmWorkspaces;
 
       pnpm-fixup-state-db' =
-        if pnpm.nodejs or null != null then
+        if pnpm.nodejs-slim or null != null then
           pnpm-fixup-state-db.override {
-            inherit (pnpm) nodejs;
+            # FIXME: make npm-config-hook accept nodejs-slim
+            nodejs =
+              let
+                inherit (pnpm) nodejs-slim;
+              in
+              if nodejs-slim ? paths && builtins.isList nodejs-slim.paths then
+                # If nodejs-slim has a list `paths` attribute, it's likely a simlinkJoin
+                nodejs-slim
+              else
+                # Otherwise we need to recreate one by overriding the default one
+                pnpm-fixup-state-db.nodejs.override {
+                  inherit nodejs-slim;
+                };
           }
         else
           pnpm-fixup-state-db;

pkgs/by-name/az/azure-cli/python-packages.nix

@@ -148,8 +148,14 @@ let
 
       # AttributeError: type object 'CustomDomainsOperations' has no attribute 'disable_custom_https'
       azure-mgmt-cdn =
-        overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip"
-          "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0=";
+        (overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip"
+          "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="
+        ).overridePythonAttrs
+          (attrs: {
+            propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [
+              self.msrest
+            ];
+          });
 
       # ImportError: cannot import name 'ConfigMap' from 'azure.mgmt.containerinstance.models'
       azure-mgmt-containerinstance = super.azure-mgmt-containerinstance.overridePythonAttrs (attrs: rec {

pkgs/by-name/dr/drupal/package.nix

@@ -8,18 +8,18 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "drupal";
-  version = "11.3.10";
+  version = "11.3.11";
 
   src = fetchFromGitLab {
     domain = "git.drupalcode.org";
     owner = "project";
     repo = "drupal";
     tag = finalAttrs.version;
-    hash = "sha256-22oi80H8CZfafX0PFMmMinwIdKKdPs0iM0ime1aYXDI=";
+    hash = "sha256-O1Al14D9vZEdNOtOKcvMnlp6hyjrfu8n2nTE5qk4Xe0=";
   };
 
   composerNoPlugins = false;
-  vendorHash = "sha256-jwCHtpshEVzBhcXjCl5HOdkIiHRcH3V7fBxTxU39/S0=";
+  vendorHash = "sha256-pA1Hy4WtHqWQTBxD0fbbetg0heVYfuPJUUOHPE3JyGc=";
 
   passthru = {
     tests = {

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

@@ -2,10 +2,11 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
-  buildNpmPackage,
+  stdenvNoCC,
   fetchPnpmDeps,
   pnpmConfigHook,
-  nodejs_24,
+  pnpmBuildHook,
+  nodejs-slim,
   pnpm_10,
   nix-update-script,
   nixosTests,
@@ -17,23 +18,25 @@ let
   src = fetchFromGitHub {
     owner = "filebrowser";
     repo = "filebrowser";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-/X/TztbZDC1hkRL97jkm6Ak8QmKFDMycekLl6NVPS0k=";
   };
 
-  frontend = buildNpmPackage rec {
+  frontend = stdenvNoCC.mkDerivation (finalAttrs: {
     pname = "filebrowser-frontend";
     inherit version src;
 
     sourceRoot = "${src.name}/frontend";
 
-    nativeBuildInputs = [ pnpm_10 ];
-    npmConfigHook = pnpmConfigHook;
-    npmDeps = pnpmDeps;
-    nodejs = nodejs_24;
+    nativeBuildInputs = [
+      nodejs-slim
+      pnpmConfigHook
+      pnpmBuildHook
+      pnpm_10
+    ];
 
     pnpmDeps = fetchPnpmDeps {
-      inherit
+      inherit (finalAttrs)
         pname
         version
         src
@@ -52,7 +55,7 @@ let
 
       runHook postInstall
     '';
-  };
+  });
 
 in
 buildGoModule {
@@ -87,6 +90,7 @@ buildGoModule {
   meta = {
     description = "Web application for managing files and directories";
     homepage = "https://filebrowser.org";
+    changelog = "https://github.com/filebrowser/filebrowser/releases/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ oakenshield ];
     mainProgram = "filebrowser";

pkgs/by-name/fo/forgejo-cli/package.nix

@@ -10,11 +10,14 @@
   oniguruma,
   openssl,
   zlib,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "forgejo-cli";
   version = "0.5.0";
 
+  __structuredAttrs = true;
+
   src = fetchFromCodeberg {
     owner = "forgejo-contrib";
     repo = "forgejo-cli";
@@ -49,6 +52,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --zsh <($out/bin/fj completion zsh)
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
+
   meta = {
     description = "CLI application for interacting with Forgejo";
     homepage = "https://codeberg.org/forgejo-contrib/forgejo-cli";

pkgs/by-name/go/golden-cheetah/package.nix

@@ -26,13 +26,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "golden-cheetah";
-  version = "3.8-DEV2603";
+  version = "3.8-DEV2605";
 
   src = fetchFromGitHub {
     owner = "GoldenCheetah";
     repo = "GoldenCheetah";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FxQ18KJfR+fegQ5Qu4vI3vqckj4mB8s9VtSdRtIQISg=";
+    hash = "sha256-umy1EcLSoSDO5XFiGxfunniDr8RruyPvRTbypMbl7xU=";
   };
 
   buildInputs =

pkgs/by-name/gu/guix/package.nix

@@ -161,6 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
       Guix is based on the Nix package manager.
     '';
     homepage = "https://guix.gnu.org/";
+    donationPage = "https://guix.gnu.org/donate/";
     changelog = "https://codeberg.org/guix/guix/raw/tag/v${finalAttrs.version}/NEWS";
     license = lib.licenses.gpl3Plus;
     mainProgram = "guix";

pkgs/by-name/i1/i18next-cli/package.nix

@@ -6,13 +6,13 @@
 }:
 buildNpmPackage rec {
   pname = "i18next-cli";
-  version = "1.56.12";
+  version = "1.61.0";
 
   src = fetchFromGitHub {
     owner = "i18next";
     repo = "i18next-cli";
     tag = "v${version}";
-    hash = "sha256-Ll0gHmY+L9wsZDg0fG6QqPdopC2lxKhm4XYVSiI7SVw=";
+    hash = "sha256-birjO9dfj3LhY/c1VQZJwVGDP9WWOmjPTeFF43/DetM=";
   };
 
   # NOTE: Generating lock-file
@@ -21,7 +21,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-821k53HnkbXmsMF6J3XI5Qlih6gK6yA/zoUu2sWrS1Y=";
+  npmDepsHash = "sha256-uLnszHMzL+zEgOtlYzqUjlCxcF44KUjkdPy+QJe/3zs=";
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ "--generate-lockfile" ];

pkgs/by-name/it/itgmania/themes/digital-dance.nix

@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "digital-dance";
-  version = "1.1.3-unstable-2026-05-14";
+  version = "1.1.3-unstable-2026-06-04";
 
   src = fetchFromCodeberg {
     owner = "JNero";
     repo = "Digital-Dance-ITGMania";
-    rev = "02e2c0a2177429a42d69a3aeea582759ed646c18";
-    hash = "sha256-aw+nzABmDTsdn7hPI2B61S5HtzixTl3/JCOSFH5mNB0=";
+    rev = "827d963fdc5732f11781bf3db7343a8897a10196";
+    hash = "sha256-V3EmAg42BExodFiGd2u7brmTq4t3iVduWtxo5NjwGm8=";
   };
 
   postInstall = ''

pkgs/by-name/it/itgmania/themes/itg3encore.nix

@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "itg3encore";
-  version = "0-unstable-2026-05-26";
+  version = "0-unstable-2026-06-05";
 
   src = fetchFromGitHub {
     owner = "DarkBahamut162";
     repo = "itg3encore";
-    rev = "7cb2d0f4c1e36964b041380f9361598b568a0bd5";
-    hash = "sha256-W9pJ48tiKre+G5xHd9JKHroZecOgkE7E9dRMTp0JoZQ=";
+    rev = "7aad94a63462efc85eb6e0e23bd0bd50be28137c";
+    hash = "sha256-oaj76RMD+Ibm8n8/EiUZYVBlyy5PefpBsWhFbWEjM08=";
   };
 
   postInstall = ''

pkgs/by-name/jo/joplin-desktop/package.nix

@@ -224,7 +224,7 @@ stdenv.mkDerivation (finalAttrs: {
       icon = "joplin";
       comment = "Joplin for Desktop";
       categories = [ "Office" ];
-      startupWMClass = "@joplin/app-desktop";
+      startupWMClass = "joplin-app-desktop";
       mimeTypes = [ "x-scheme-handler/joplin" ];
     })
   ];

pkgs/by-name/la/lasuite-meet/frontend.nix

@@ -13,7 +13,7 @@ buildNpmPackage (finalAttrs: {
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) version src sourceRoot;
-    hash = "sha256-LDH8aR+FSiIFYMDaQ3wNYAzv6VpHtH5X+DMHGBhPkm0=";
+    hash = "sha256-Dd0wqssmLBfHkOHI5aactLnCPG4JxPLhNC+eo//QRXM=";
   };
   npmBuildScript = "build";
 

pkgs/by-name/la/lasuite-meet/mail.nix

@@ -11,24 +11,18 @@ buildNpmPackage (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/src/mail";
 
-  # TODO: Remove package-lock.json patch when
-  # https://github.com/suitenumerique/meet/pull/1321 is merged.
   postPatch = ''
     substituteInPlace bin/html-to-plain-text bin/mjml-to-html \
       --replace-fail \
         '../backend/core/templates/mail' \
         '${placeholder "out"}'
-
-    cp ${./package-lock.json} package-lock.json
   '';
 
   npmDeps = fetchNpmDeps {
     pname = "${finalAttrs.pname}-npm-deps";
     inherit version src;
     inherit (finalAttrs) sourceRoot;
-    hash = "sha256-jjLzgGqCsMu6Smyfaam6coqOM9UW2zG88adSPVrWPEE=";
-
-    postPatch = "cp ${./package-lock.json} package-lock.json";
+    hash = "sha256-dvOmSQjtw7Qv3H+flOcXDaIxQzf9YBmsQo7jmSTA7tI=";
   };
   npmBuildScript = "build";
 

pkgs/by-name/la/lasuite-meet/package.nix

@@ -6,13 +6,13 @@
   python3,
 }:
 let
-  version = "1.15.0";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-18DcrrEvqWR6caEVZYxQlSnKcxItEpNE+bMhtS4Aa0M=";
+    hash = "sha256-hmkJwFYTBTbYsroegaRp/dcaNmeyPQ0Rbh/D1PGbh04=";
   };
 
   meta = {
@@ -85,6 +85,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
       markdown
       mozilla-django-oidc
       nested-multipart-parser
+      phonenumbers
       psycopg
       pydantic
       pyjwt

pkgs/by-name/lu/lux-cli/package.nix

@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lux-cli";
 
-  version = "0.30.1";
+  version = "0.31.1";
 
   src = fetchFromGitHub {
     owner = "lumen-oss";
     repo = "lux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sp1lNdPJuHfXvq3TYdQ7MJCZVpL8EyJEN9K/u7hnkYg=";
+    hash = "sha256-3gS3QO0i1ApVYG/hL/EyZhH1LykeJ5Ttt59vSDLUPMY=";
   };
 
   buildAndTestSubdir = "lux-cli";
 
-  cargoHash = "sha256-RqHONrfNwnOwuri0LmViFfJThiwLWqyA9eEBrdsYWrc=";
+  cargoHash = "sha256-Ventw1LRk5795+X38yzyFGHFbvW1tEq6PE1zjhZSDDM=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

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

@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "malwoverview";
-  version = "8.0.1";
+  version = "8.0.2";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "alexandreborges";
     repo = "malwoverview";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yIlKrZaIJmz3INGTrk+ydU+8gjAt54glSteMUrXSAgU=";
+    hash = "sha256-dT1FnVm6J93mQHUfodVGgEFy7HAKFcHVicp4B9QKBrs=";
   };
 
   build-system = with python3Packages; [

pkgs/by-name/mu/murmure/package.nix

@@ -0,0 +1,137 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchPnpmDeps,
+
+  # patches
+  libayatana-appindicator,
+
+  # nativeBuildInputs
+  cargo-tauri,
+  nodejs,
+  pkg-config,
+  pnpm,
+  pnpmConfigHook,
+
+  # buildInputs
+  atk,
+  glib,
+  libsoup_3,
+  onnxruntime,
+  openssl,
+  pango,
+  # linux-only:
+  alsa-lib,
+  libappindicator-gtk3,
+  libx11,
+  libxi,
+  libxkbcommon,
+  libxtst,
+  webkitgtk_4_1,
+  xdotool,
+
+  # passthru
+  nix-update-script,
+}:
+
+let
+  parakeet-model = fetchzip {
+    url = "https://github.com/Kieirra/murmure-model/releases/download/1.0.0/parakeet-tdt-0.6b-v3-int8.zip";
+    hash = "sha256-rlV7mi5Y6qu/9jRWRPNBlABW8GxsvVAMCM6Ye2tVb2s=";
+  };
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "murmure";
+  version = "1.9.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Kieirra";
+    repo = "murmure";
+    tag = finalAttrs.version;
+    hash = "sha256-Yh1XWpwTKrYIPhbOqi0XGfqV+kVB/QVXX4y7Hb+iqrM=";
+  };
+
+  # The libappindicator_sys crate loads these libraries at runtime
+  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteInPlace $cargoDepsCopy/source-registry-0/libappindicator-sys-*/src/lib.rs \
+      --replace-fail \
+        "libayatana-appindicator3.so.1" \
+        "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" \
+  '';
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      ;
+    fetcherVersion = 3;
+    hash = "sha256-Jtd+sxpievLyNozMJW6JAHQEKA6UVPvgLEB/3Q2Pl/s=";
+  };
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  cargoHash = "sha256-PRp04YHkifhFY9W03IQDu9Dd8y05zd4d9o8CDySf+Nw=";
+
+  env.OPENSSL_NO_VENDOR = true;
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    nodejs
+    pkg-config
+    pnpm
+    pnpmConfigHook
+  ];
+
+  buildInputs = [
+    atk
+    glib
+    libsoup_3
+    onnxruntime
+    openssl
+    pango
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+    libappindicator-gtk3
+    libx11
+    libxi
+    libxkbcommon
+    libxtst
+    webkitgtk_4_1
+    xdotool
+  ];
+
+  checkFlags = [
+    # Couldn't compile the test.
+    # error[E0433]: failed to resolve: use of unresolved module or unlinked crate `transcribe_rs`
+    "--skip=engine::engine::ParakeetEngine"
+    "--skip=engine::engine::ParakeetEngine::new"
+    "--skip=engine::engine::ParakeetModelParams::int8"
+    "--skip=engine::transcription_engine::TranscriptionEngine"
+    "--skip=engine::transcription_engine::TranscriptionEngine"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/lib/murmure/resources
+    ln -s ${parakeet-model} $out/lib/murmure/resources/parakeet-tdt-0.6b-v3-int8
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Privacy-first and free Speech-to-Text";
+    homepage = "https://murmure.al1x-ai.com";
+    downloadPage = "https://github.com/Kieirra/murmure";
+    changelog = "https://github.com/Kieirra/murmure/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    mainProgram = "murmure";
+  };
+})

pkgs/by-name/mv/mvnd/package.nix

@@ -22,17 +22,17 @@ in
 
 maven.buildMavenPackage (finalAttrs: {
   pname = "mvnd";
-  version = "1.0.5";
+  version = "1.0.6";
   src = fetchFromGitHub {
     owner = "apache";
     repo = "maven-mvnd";
     rev = finalAttrs.version;
-    sha256 = "sha256-/ODRS6xaxkn7okUh8phN1GUNG7tDAKjmAIQn8NrC+ag=";
+    sha256 = "sha256-0Po3LOsK3u984+g7ACtGa5KSgKfsAwLLORP6YEUHhKo=";
   };
 
   # need graalvm at build-time for the `native-image` tool
   mvnJdk = graalvmPackages.graalvm-ce;
-  mvnHash = "sha256-flA72bE6on3KolJ/tQT1ad92GQnybyykPbWG4Yn88rU=";
+  mvnHash = "sha256-dgKQj6xa10MkFmxUckwW5FqKS3Tf95aP/RmKXSRqtCg=";
 
   nativeBuildInputs = [
     graalvmPackages.graalvm-ce

pkgs/by-name/ok/okteto/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "okteto";
-  version = "3.19.0";
+  version = "3.20.0";
 
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
     tag = finalAttrs.version;
-    hash = "sha256-Gc8ZLCsE5k4YtoN6VYT9FfnuqFDNBwcrdDbcDQLjDE4=";
+    hash = "sha256-s733L3Jhaz780fEa+mQnnokUXXwvUPDCZq3fWEUBaT0=";
   };
 
-  vendorHash = "sha256-riNqDuD+LftGnQfRQwOB1VHVV7R2rp4cSU5d9jBvJQM=";
+  vendorHash = "sha256-/qZEO/oXEmr4VsrKZMiaJ/LOyFG7rQ8j3aUdqSspfCg=";
 
   postPatch = ''
     # Disable some tests that need file system & network access.

pkgs/by-name/op/open-webui/package.nix

@@ -9,13 +9,13 @@
 }:
 let
   pname = "open-webui";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-RVmFRThK6dNJyqxKepk9WfxzXIwkRoYijZjR1HEhDm8=";
+    hash = "sha256-0d9GfBQY6YtsUbHeO6NTFPFHV6WE51D4fq+NfsM7J5g=";
   };
 
   frontend = buildNpmPackage rec {
@@ -30,7 +30,7 @@ let
       url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
     };
 
-    npmDepsHash = "sha256-kAUbFAFNo5RHMGqO7sPHSxSEZw9Ky6Pxp/vddDyw90E=";
+    npmDepsHash = "sha256-NhDsqfP95RAbSarM07OSII8vbPYWScRMxtWt+gRQ/4c=";
 
     npmFlags = [ "--force" ];
 

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

@@ -6,7 +6,7 @@
   fetchPnpmDeps,
   pnpmConfigHook,
   pnpm_11,
-  nodejs_22,
+  nodejs-slim_22,
   makeWrapper,
   versionCheckHook,
   rolldown,
@@ -14,7 +14,7 @@
   version ? "2026.5.12",
 }:
 let
-  pnpm = pnpm_11.override { nodejs = nodejs_22; };
+  pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_22; };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openclaw";
@@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pnpmConfigHook
     pnpm
-    nodejs_22
+    nodejs-slim_22
     makeWrapper
     installShellFiles
   ];
@@ -86,7 +86,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # Remove symlinks pointing back to the build sandbox
     find $libdir/dist/extensions -type l -lname "$NIX_BUILD_TOP/*" -delete
 
-    makeWrapper ${lib.getExe nodejs_22} $out/bin/openclaw \
+    makeWrapper ${lib.getExe nodejs-slim_22} $out/bin/openclaw \
       --add-flags "$libdir/dist/index.js" \
       --set NODE_PATH "$libdir/node_modules"
     ln -s $out/bin/openclaw $out/bin/moltbot

pkgs/by-name/ph/phpactor/package.nix

@@ -7,16 +7,16 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpactor";
-  version = "2025.12.21.1";
+  version = "2026.05.30.1";
 
   src = fetchFromGitHub {
     owner = "phpactor";
     repo = "phpactor";
     tag = finalAttrs.version;
-    hash = "sha256-9hkYU/Mhxl49tIZa3Vyj3kXftNIgZXUlH1T6/4obM7I=";
+    hash = "sha256-Harrs0SM00MVBicMfvs3bcLQf/PSTp6k7hcEExGELWE=";
   };
 
-  vendorHash = "sha256-XsybPL391WGHztWPaZAN1l2hWQMQ0tklZ9yjkKjGzsI=";
+  vendorHash = "sha256-PztP3qN6LL+1UshNyuJof0WT9Dg5MfXwfQr57kBG9hM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/pi/picocrypt-ng/package.nix

@@ -16,18 +16,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "picocrypt-ng";
-  version = "2.09";
+  version = "2.10";
 
   src = fetchFromGitHub {
     owner = "Picocrypt-NG";
     repo = "Picocrypt-NG";
     tag = finalAttrs.version;
-    hash = "sha256-s+93NoJ1O6/Af33pUobSA0kAhpw7W0IdA9H6CVxShQY=";
+    hash = "sha256-Rp7BgtJnV3fPed/QlWSxH8nL7cCTgMDpRGcgX5VI2l0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
-  vendorHash = "sha256-2c8Q7+97jSGo8lwWOYBg76K04+TFXG1DdQzVMR8G7ik=";
+  vendorHash = "sha256-yAM1jzebUlNkVWiY8lPtlelfqpFQonNcAqNmmghCdPU=";
 
   ldflags = [
     "-s"
@@ -50,6 +50,9 @@ buildGoModule (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
+  # git ls-files doesn't work as source is not a git repo
+  checkFlags = [ "-skip=^TestOldVersionLiteralsAreAllowlisted$" ];
+
   env.CGO_ENABLED = 1;
 
   postInstall = ''
@@ -73,7 +76,10 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/Picocrypt-NG/Picocrypt-NG";
     changelog = "https://github.com/Picocrypt-NG/Picocrypt-NG/blob/${finalAttrs.version}/Changelog.md";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ tbutter ];
+    maintainers = with lib.maintainers; [
+      tbutter
+      ryand56
+    ];
     mainProgram = "picocrypt-ng-gui";
   };
 })

pkgs/by-name/po/podman-desktop/package.nix

@@ -5,7 +5,7 @@
   makeBinaryWrapper,
   copyDesktopItems,
   electron_41,
-  nodejs_24,
+  nodejs-slim_24,
   pnpm_10_29_2,
   fetchPnpmDeps,
   pnpmConfigHook,
@@ -21,8 +21,8 @@
 }:
 
 let
-  nodejs = nodejs_24;
-  pnpm = pnpm_10_29_2.override { inherit nodejs; };
+  nodejs-slim = nodejs-slim_24;
+  pnpm = pnpm_10_29_2.override { inherit nodejs-slim; };
   electron = electron_41;
   appName = "Podman Desktop";
 in
@@ -91,7 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     makeBinaryWrapper
-    nodejs
+    nodejs-slim
+    nodejs-slim.npm
     pnpm
     pnpmConfigHook
   ]

pkgs/by-name/po/porn-vault/package.nix

@@ -6,7 +6,7 @@
   fetchPnpmDeps,
   pnpmConfigHook,
   stdenvNoCC,
-  nodejs_22,
+  nodejs-slim_22,
   ffmpeg,
   imagemagick,
   makeWrapper,
@@ -37,8 +37,8 @@ let
       mainProgram = "izzy";
     };
   };
-  nodejs = nodejs_22;
-  pnpm' = pnpm_9.override { nodejs = nodejs_22; };
+  nodejs-slim = nodejs-slim_22;
+  pnpm' = pnpm_9.override { inherit nodejs-slim; };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "porn-vault";
@@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    nodejs
+    nodejs-slim
     pnpmConfigHook
     pnpm'
     makeWrapper
@@ -92,7 +92,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   preFixup = ''
-    makeWrapper "${lib.getExe nodejs}" "$out/bin/porn-vault" \
+    makeWrapper "${lib.getExe nodejs-slim}" "$out/bin/porn-vault" \
       --chdir "$out/share/porn-vault" \
       --add-flags "dist/index.js" \
       --set-default IZZY_PATH "${lib.getExe izzy}" \
@@ -110,7 +110,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.com/porn-vault/porn-vault";
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.luNeder ];
-    inherit (nodejs.meta) platforms;
+    inherit (nodejs-slim.meta) platforms;
     mainProgram = "porn-vault";
   };
 })

pkgs/by-name/qm/qmmp/package.nix

@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qmmp";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchurl {
     url = "https://qmmp.ylsoftware.com/files/qmmp/2.3/qmmp-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-TYu65hnpnP1mXZbDaI0tMG9f/DAUTgezfKcBqZ4yY2U=";
+    hash = "sha256-Uclk6eaFz2cmay6OMTXuRQS2v2sig/Rrv9Sr42rjaQ0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/rd/rdap/package.nix

@@ -2,31 +2,39 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "rdap";
   version = "0.9.1";
-  vendorHash = "sha256-8b1EAnR8PkEAw9yLBqPKFeANJit0OCJG+fssAGR/iTk=";
 
   src = fetchFromGitHub {
     owner = "openrdap";
     repo = "rdap";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-FiaUyhiwKXZ3xnFPmdxb8bpbm5eRRFNDL3duOGDnc/A=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FiaUyhiwKXZ3xnFPmdxb8bpbm5eRRFNDL3duOGDnc/A=";
   };
 
+  vendorHash = "sha256-8b1EAnR8PkEAw9yLBqPKFeANJit0OCJG+fssAGR/iTk=";
+
   doCheck = false;
 
   ldflags = [
     "-s"
-    "-w"
-    "-X \"github.com/openrdap/rdap.version=OpenRDAP ${finalAttrs.version}\""
+    "-X=github.com/openrdap/rdap.version=${finalAttrs.version}"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "-h" ];
+
   meta = {
-    homepage = "https://www.openrdap.org/";
     description = "Command line client for the Registration Data Access Protocol (RDAP)";
+    homepage = "https://www.openrdap.org/";
+    changelog = "https://github.com/openrdap/rdap/releases/tag/v${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sebastianblunt ];
     mainProgram = "rdap";

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

@@ -6,7 +6,7 @@
   fetchFromGitHub,
   stdenv,
   makeWrapper,
-  nodejs_22,
+  nodejs-slim_22,
   python3,
   python3Packages,
   sqlite,
@@ -15,8 +15,8 @@
 }:
 
 let
-  nodejs = nodejs_22;
-  pnpm = pnpm_10.override { inherit nodejs; };
+  nodejs-slim = nodejs-slim_22;
+  pnpm = pnpm_10.override { inherit nodejs-slim; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "seerr";
@@ -41,14 +41,14 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     python3
     python3Packages.distutils
-    nodejs
+    nodejs-slim
     makeWrapper
     pnpmConfigHook
     pnpm
   ];
 
   preBuild = ''
-    export npm_config_nodedir=${nodejs}
+    export npm_config_nodedir=${nodejs-slim}
     pushd node_modules
     pnpm rebuild bcrypt sqlite3
     popd
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     mkdir -p $out/bin
-    makeWrapper '${nodejs}/bin/node' "$out/bin/seerr" \
+    makeWrapper '${nodejs-slim}/bin/node' "$out/bin/seerr" \
       --add-flags "$out/share/dist/index.js" \
       --chdir "$out/share" \
       --set NODE_ENV production

pkgs/by-name/sh/sharkey/package.nix

@@ -11,7 +11,7 @@
   jemalloc,
   makeWrapper,
   nix-update-script,
-  nodejs_22,
+  nodejs-slim_22,
   pango,
   pixman,
   pkg-config,
@@ -24,7 +24,7 @@
 }:
 
 let
-  pnpm = pnpm_10.override { nodejs = nodejs_22; };
+  pnpm = pnpm_10.override { nodejs-slim = nodejs-slim_22; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sharkey";
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     makeWrapper
-    nodejs_22
+    nodejs-slim_22
     pkg-config
     pnpmConfigHook
     pnpm
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     popd
 
     # rebuild some node modules that have native dependencies
-    export npm_config_nodedir=${nodejs_22}
+    export npm_config_nodedir=${nodejs-slim_22}
 
     pushd node_modules/.pnpm/node_modules/re2
     pnpm rebuild
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     let
       binPath = lib.makeBinPath [
         bash
-        nodejs_22
+        nodejs-slim_22
         pnpm
       ];
       libPath = lib.makeLibraryPath [

pkgs/by-name/sh/shopify-cli/package.nix

@@ -6,7 +6,7 @@
   pnpmConfigHook,
   pnpm_10,
   faketty,
-  nodejs_22,
+  nodejs-slim_22,
   versionCheckHook,
   makeBinaryWrapper,
   nix-update-script,
@@ -14,8 +14,8 @@
 let
   pnpm = pnpm_10;
 
-  nodejs = nodejs_22;
-  pnpm' = pnpm.override { inherit nodejs; };
+  nodejs-slim = nodejs-slim_22;
+  pnpm' = pnpm.override { inherit nodejs-slim; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shopify";
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     faketty
-    nodejs
+    nodejs-slim
     pnpmConfigHook
     pnpm'
     makeBinaryWrapper
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm install --offline --prod --ignore-scripts --frozen-lockfile
     mv node_modules $out/lib/node_modules/@shopify/cli/node_modules
 
-    makeWrapper ${lib.getExe nodejs} $out/bin/shopify \
+    makeWrapper ${lib.getExe nodejs-slim} $out/bin/shopify \
       --add-flags "$out/lib/node_modules/@shopify/cli/bin/run.js"
 
     runHook postInstall

pkgs/by-name/sh/shopware-cli/package.nix

@@ -11,12 +11,12 @@
 
 buildGoModule (finalAttrs: {
   pname = "shopware-cli";
-  version = "0.15.2";
+  version = "0.15.3";
   src = fetchFromGitHub {
     repo = "shopware-cli";
     owner = "shopware";
     tag = finalAttrs.version;
-    hash = "sha256-HWIfumFTBBLMjXa+2AHzXS1UR8Z91C6/x9pHXQcO6WE=";
+    hash = "sha256-3Bx3GaCR/yrvxsMrDYriwYaxUSIduW5WLhLtZDEJnsw=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     dart-sass
   ];
 
-  vendorHash = "sha256-KQDPTyw24BqjetYSJfMeSrgO9mgHxIBuKgp0/0H76R0=";
+  vendorHash = "sha256-mQLRSX68cJVvY9Dj51qaDDNv04LuyJnRIqiw0SzLxpc=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd shopware-cli \

pkgs/by-name/ta/taler-wallet-core/package.nix

@@ -7,7 +7,7 @@
   fetchgit,
   srcOnly,
   removeReferencesTo,
-  nodejs_24,
+  nodejs-slim_24,
   pnpm_9,
   fetchPnpmDeps,
   pnpmConfigHook,
@@ -17,8 +17,10 @@
   zip,
 }:
 let
-  nodeSources = srcOnly nodejs_24;
-  pnpm' = pnpm_9.override { nodejs = nodejs_24; };
+  nodeSources = (srcOnly nodejs-slim_24).overrideAttrs {
+    outputChecks = { };
+  };
+  pnpm' = pnpm_9.override { nodejs-slim = nodejs-slim_24; };
   esbuild' = esbuild.override {
     buildGoModule =
       args:
@@ -61,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     customPython
-    nodejs_24
+    nodejs-slim_24
+    nodejs-slim_24.npm
     pnpmConfigHook
     pnpm'
     gitMinimal
@@ -70,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    nodejs_24
+    nodejs-slim_24
   ];
 
   # Make a fake git repo with a commit.

pkgs/by-name/ts/tsx/package.nix

@@ -5,12 +5,12 @@
   pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
-  nodejs_22,
+  nodejs-slim_22,
   versionCheckHook,
   nix-update-script,
 }:
 let
-  pnpm' = pnpm_10.override { nodejs = nodejs_22; };
+  pnpm' = pnpm_10.override { nodejs-slim = nodejs-slim_22; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "tsx";
@@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    nodejs_22
+    nodejs-slim_22
     pnpmConfigHook
     pnpm'
   ];
 
   buildInputs = [
-    nodejs_22
+    nodejs-slim_22
   ];
 
   patchPhase = ''

pkgs/by-name/vi/vintagestory/package.nix

@@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vintagestory";
-  version = "1.22.2";
+  version = "1.22.3";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
-    hash = "sha256-caLSOm/WXpXrjC1az72Nc0XDWOpWB2R9iVq8ShDEZgU=";
+    hash = "sha256-sa4Pj1DwT6W6LJCAYznmbyqPtMUTaLSNTkXS1imQp04=";
   };
 
   __structuredAttrs = true;
@@ -137,6 +137,7 @@ stdenv.mkDerivation (finalAttrs: {
       artturin
       gigglesquid
       dtomvan
+      bubylou
     ];
     mainProgram = "vintagestory";
   };

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

@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  nodejs_22,
+  nodejs-slim_22,
   gitMinimal,
   gitSetupHook,
   pnpm_8,
@@ -11,7 +11,7 @@
   nix-update-script,
 }:
 let
-  pnpm' = pnpm_8.override { nodejs = nodejs_22; };
+  pnpm' = pnpm_8.override { nodejs-slim = nodejs-slim_22; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vtsls";
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    nodejs_22
+    nodejs-slim_22
     # patches are applied with git during build
     gitMinimal
     gitSetupHook
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     pnpm'
   ];
 
-  buildInputs = [ nodejs_22 ];
+  buildInputs = [ nodejs-slim_22 ];
 
   pnpmWorkspaces = [ "@vtsls/language-server" ];
 

pkgs/by-name/xe/xenia-canary/package.nix

@@ -33,14 +33,14 @@ let
 in
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2026-05-03";
+  version = "0-unstable-2026-06-05";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "9467c77f0825f3f8156038ef1a03e27b6c727393";
-    hash = "sha256-hGr8KJcvLkluup5FN+MW7+ciuztgGO+SyTvKXYSHeIk=";
+    rev = "99fd19d02598e45121a665053c56fa46b2e06f09";
+    hash = "sha256-Kz93Is6tDdg4svUidN3HeF5TRk8Mz5JK9tGHoiPFues=";
   };
 
   dontConfigure = true;

pkgs/by-name/zi/zipline/package.nix

@@ -31,7 +31,7 @@ let
     PRISMA_FMT_BINARY = lib.getExe' prisma-engines_6 "prisma-fmt";
   };
 
-  pnpm' = pnpm_10.override { nodejs = nodejs_24; };
+  pnpm' = pnpm_10.override { nodejs-slim = nodejs_24; };
 in
 
 stdenv.mkDerivation (finalAttrs: {

pkgs/by-name/zw/zwave-js-ui/package.nix

@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.19.0";
+  version = "11.19.1";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-hn5Y5ADAybwSK5hv3J7qlyjPztD6QRB4oq9JTuLg9Vk=";
+    hash = "sha256-9dqvQxlk+DdYcpCgoLR8EqtgwJwMA4Dvtwc8n1K8Cic=";
   };
-  npmDepsHash = "sha256-hHalQUYj2T6AnxU0/EcbobY5UxgwvaS2NAy95FASTCk=";
+  npmDepsHash = "sha256-dED08xcbgO3zfNRP9iNuTcL+73HnfBnwDrPCGY4TZBQ=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 

pkgs/development/interpreters/python/cpython/default.nix

@@ -202,6 +202,7 @@ let
         in
         python;
       pythonVersion = with sourceVersion; "${major}.${minor}";
+      abiFlags = lib.optionalString (!enableGIL) "t" + lib.optionalString enableDebug "d";
       libPrefix = "python${pythonVersion}${lib.optionalString (!enableGIL) "t"}";
     in
     passthruFun {
@@ -213,7 +214,7 @@ let
         pythonVersion
         ;
       implementation = "cpython";
-      executable = libPrefix;
+      executable = "python${pythonVersion}${abiFlags}";
       sitePackages = "lib/${libPrefix}/site-packages";
       inherit hasDistutilsCxxPatch pythonAttr;
       inherit (splices)
@@ -227,7 +228,7 @@ let
       pythonABITags = [
         "abi3"
         "none"
-        "cp${sourceVersion.major}${sourceVersion.minor}${lib.optionalString (!enableGIL) "t"}"
+        "cp${sourceVersion.major}${sourceVersion.minor}${abiFlags}"
       ];
     };
 

pkgs/development/python-modules/actron-neo-api/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "actron-neo-api";
-  version = "0.5.11";
+  version = "0.5.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kclif9";
     repo = "actronneoapi";
     tag = "v${version}";
-    hash = "sha256-1cXYMYS8quBVtUbv+Wrcvm13I47VuSKTHwwlQKvGcRI=";
+    hash = "sha256-j7qjVkpZFkWLVQd+/ndnjPOi8/xo357ez6yte78ny5U=";
   };
 
   build-system = [

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

@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aiostreammagic";
-  version = "2.13.1";
+  version = "2.13.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "noahhusby";
     repo = "aiostreammagic";
     tag = finalAttrs.version;
-    hash = "sha256-yxiK5zB6nYXMJGVrebjdCjDr1wpNPlagusCiyf4TeRA=";
+    hash = "sha256-9HDQdzPq2YyVZ0GHmtJcK5ppk3OPNevYtlPK26hJ0TI=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/python-modules/azure-mgmt-cdn/default.nix

@@ -5,19 +5,24 @@
   buildPythonPackage,
   fetchPypi,
   isodate,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "azure-mgmt-cdn";
   version = "13.1.1";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-RmMwTzG2Zy3sMgx857qXFcK5nn2LaEs3XwtO/9qQIQw=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     isodate
     azure-common
     azure-mgmt-core
@@ -26,11 +31,13 @@ buildPythonPackage rec {
   # has no tests
   doCheck = false;
 
+  pythonImportsCheck = [ "azure.mgmt.cdn" ];
+
   meta = {
     description = "This is the Microsoft Azure CDN Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
-    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-cdn_${version}/sdk/cdn/azure-mgmt-cdn/CHANGELOG.md";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-cdn_${finalAttrs.version}/sdk/cdn/azure-mgmt-cdn/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ maxwilson ];
   };
-}
+})

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

@@ -2,18 +2,23 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
+  setuptools,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "base58check";
   version = "1.0.2";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
+  build-system = [ setuptools ];
 
   src = fetchFromGitHub {
     owner = "joeblackwaslike";
     repo = "base58check";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Tig6beLRDsXC//x4+t/z2BGaJQWzcP0J+QEKx3D0rhs=";
   };
 
@@ -27,4 +32,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

pkgs/development/python-modules/bc-jsonpath-ng/default.nix

@@ -5,21 +5,26 @@
   fetchFromGitHub,
   ply,
   pytestCheckHook,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bc-jsonpath-ng";
   version = "1.6.1";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "jsonpath-ng";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-FWP4tzlacAWVXG3YnPwl5MKc12geaCxZ2xyKx9PSarU=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     decorator
     ply
   ];
@@ -40,4 +45,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ asl20 ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

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

@@ -2,26 +2,33 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "beanstalkc";
   version = "0.5.2";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "bosondata";
     repo = "beanstalkc";
-    rev = "v${version}";
-    sha256 = "1dpb1yimp2pfnikmgsb2fr9x6h8riixlsx3xfqphnfvrid49vw5s";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-uvCdSIt5Owsvdn10TXuMGUHTU3Zi6VdntO6KW6MP67Y=";
   };
 
+  build-system = [ setuptools ];
+
   doCheck = false;
 
+  pythonImportsCheck = [ "beanstalkc" ];
+
   meta = {
     description = "Simple beanstalkd client library for Python";
     maintainers = with lib.maintainers; [ aanderse ];
     license = lib.licenses.asl20;
-    homepage = "https://github.com/earl/beanstalkc";
+    homepage = "https://github.com/bosondata/beanstalkc";
   };
-}
+})

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

@@ -2,23 +2,28 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   wcwidth,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "beautifultable";
   version = "1.1.0";
-  format = "setuptools";
+  pyproject = true;
+
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "pri22296";
     repo = "beautifultable";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/SReCEvSwiNjBoz/3tGJ9zUNBAag4mLsHlUXwm47zCw=";
   };
 
-  propagatedBuildInputs = [ wcwidth ];
+  build-system = [ setuptools ];
+
+  dependencies = [ wcwidth ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -32,4 +37,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

pkgs/development/python-modules/dio-chacon-wifi-api/default.nix

@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "dio-chacon-wifi-api";
-  version = "1.2.2";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cnico";
     repo = "dio-chacon-wifi-api";
     tag = "v${version}";
-    hash = "sha256-YlomB3/EBX2tFifjcF38q+sr2z1bHwUjmqyNE2wTp90=";
+    hash = "sha256-c91xCrlNpCutZZYO6y0pOaqPCF4exbr7xVxfsf5LI0Q=";
   };
 
   build-system = [ poetry-core ];

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

@@ -18,24 +18,18 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "extractcode";
-  version = "31.0.0";
+  version = "31.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aboutcode-org";
     repo = "extractcode";
-    tag = "v${version}";
-    hash = "sha256-mPHGe/pMaOnIykDd4AjGcvh/T4UrbaGxrSVGhchqYFM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KTLhTvTn5awIJD32lsztm6nh15eoFew1mGJvHIT8H2U=";
   };
 
-  postPatch = ''
-    # PEP440 support was removed in newer setuptools, https://github.com/nexB/extractcode/pull/46
-    substituteInPlace setup.cfg \
-      --replace-fail ">=3.6.*" ">=3.6"
-  '';
-
   dontConfigure = true;
 
   build-system = [ setuptools-scm ];
@@ -76,6 +70,12 @@ buildPythonPackage rec {
     "test_extract_python_testtar_tar_archive_with_special_files"
     # AssertionError: [<function extract at 0x7ffff493dd00>] == [] for archive/rar/basic.rar
     "test_get_extractors_2"
+    # assert [functools.pa...ffff452df80>)] == []
+    "test_windows_media_player_skins_are_zip"
+    # AssertionError: assert Handler(name='Nuget', filetypes=('zip archive', 'mic...
+    "test_get_best_handler_nuget_is_selected_over_zip"
+    "test_get_best_handler_nuget_is_selected_over_zip2"
+    "test_get_best_handler_nuget_is_selected_over_zip3"
   ];
 
   pythonImportsCheck = [ "extractcode" ];
@@ -83,9 +83,10 @@ buildPythonPackage rec {
   meta = {
     description = "Universal archive extractor using z7zip, libarchive, other libraries and the Python standard library";
     homepage = "https://github.com/aboutcode-org/extractcode";
-    changelog = "https://github.com/aboutcode-org/extractcode/releases/tag/v${version}";
-    license = lib.licenses.asl20;
-    maintainers = [ ];
+    changelog = "https://github.com/aboutcode-org/extractcode/releases/tag/v${finalAttrs.version}";
     mainProgram = "extractcode";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
   };
-}
+})

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fastapi-pagination";
-  version = "0.15.13";
+  version = "0.15.14";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
     owner = "uriyyo";
     repo = "fastapi-pagination";
     tag = finalAttrs.version;
-    hash = "sha256-c+bXtc4MQdd+UlsBHtVL6F2lBu46yry9OTKsMbu1Mhw=";
+    hash = "sha256-W3SgSne3GgRl2W6l3NWUguvzxigLCVgMLiT/fMIWSAE=";
   };
 
   build-system = [

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

@@ -15,7 +15,7 @@
 
   # web assets
   zip,
-  nodejs_24,
+  nodejs-slim,
   pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
@@ -78,8 +78,7 @@
   writableTmpDirAsHomeHook,
 }:
 let
-  nodejs = nodejs_24;
-  pnpm = pnpm_10.override { inherit nodejs; };
+  pnpm = pnpm_10;
 in
 buildPythonPackage (finalAttrs: {
   pname = "gradio";
@@ -110,7 +109,7 @@ buildPythonPackage (finalAttrs: {
 
   nativeBuildInputs = [
     zip
-    nodejs
+    nodejs-slim
     pnpm
     pnpmConfigHook
     writableTmpDirAsHomeHook

pkgs/development/python-modules/homelink-integration-api/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "homelink-integration-api";
-  version = "0.0.1";
+  version = "0.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Gentex-Corporation";
     repo = "homelink-integration-api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ELEqx41JSAmXBEowwJ1tYPZV40hMjswaHQonD+1IG5E=";
+    hash = "sha256-N46c7SgEUQUs2UlNVjcCLpNBpUNI4WPDydl3gB+jmag=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/idasen-ha/default.nix

@@ -1,4 +1,5 @@
 {
+  bleak-retry-connector,
   buildPythonPackage,
   fetchFromGitHub,
   idasen,
@@ -10,19 +11,22 @@
 
 buildPythonPackage rec {
   pname = "idasen-ha";
-  version = "2.6.5";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "abmantis";
     repo = "idasen-ha";
     tag = version;
-    hash = "sha256-Ksckc4aayv33Xd4tmfzCUq8e5kWPnxw7xAlPKOIlmow=";
+    hash = "sha256-1BciJ3Hox9Ky1HuNw+8jWGaMX3amAhGNTGAXqwWEDX8=";
   };
 
   build-system = [ setuptools ];
 
-  dependencies = [ idasen ];
+  dependencies = [
+    bleak-retry-connector
+    idasen
+  ];
 
   pythonImportsCheck = [ "idasen_ha" ];
 

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

@@ -7,22 +7,22 @@
   voluptuous,
   pytestCheckHook,
   pytest-asyncio,
-  poetry-core,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "idasen";
-  version = "0.12.0";
+  version = "0.13.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "newAM";
     repo = "idasen";
-    tag = "v${version}";
-    hash = "sha256-TQ+DBFpG+IeZ4/dN+YKMw3AM4Dl1rpqA1kRcb3Tb3jA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ejKfXAVvHyWIkg06XqC2pKJjpPuOgHEciPzBb/TGiSU=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ setuptools ];
 
   dependencies = [
     bleak
@@ -41,8 +41,8 @@ buildPythonPackage rec {
     description = "Python API and CLI for the ikea IDÅSEN desk";
     mainProgram = "idasen";
     homepage = "https://github.com/newAM/idasen";
-    changelog = "https://github.com/newAM/idasen/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/newAM/idasen/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ newam ];
   };
-}
+})

pkgs/development/python-modules/imgw-pib/default.nix

@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "imgw-pib";
-  version = "2.2.0";
+  version = "2.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bieniu";
     repo = "imgw-pib";
     tag = finalAttrs.version;
-    hash = "sha256-VAmRrcTTNro8J/+25YeHII7jpw2BI87FNeDIo5ATOjQ=";
+    hash = "sha256-LWyaTi4OIxK+Nyrwp9/Czl2hxCiRjoTeKhl0Yfw95pk=";
   };
 
   build-system = [ setuptools ];

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

@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llm-anthropic";
-  version = "0.25";
+  version = "0.25.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-anthropic";
     tag = finalAttrs.version;
-    hash = "sha256-dgt8DQkwVsAduzvwzN0xmLuJ4erj5KYU8x+SFCynDBI=";
+    hash = "sha256-b9XnPxKDGsiy20Me70sYrkMVO36OF3EwWOHLyEd5z4E=";
   };
 
   build-system = [

pkgs/development/python-modules/pycrdt-websocket/default.nix

@@ -27,7 +27,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pycrdt-websocket";
-  version = "0.16.1";
+  version = "0.16.2";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -35,7 +35,7 @@ buildPythonPackage (finalAttrs: {
     owner = "y-crdt";
     repo = "pycrdt-websocket";
     tag = finalAttrs.version;
-    hash = "sha256-OZ3LaXFwZY0gcLVHSkNKRrFZuCbggD9EeQNXYIVOSZ0=";
+    hash = "sha256-0HGDH3RP7uHr6eAU/s0e1LnRgtdz+v0ToZdrxG1wduc=";
   };
 
   build-system = [ hatchling ];

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

@@ -17,7 +17,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pysmartthings";
-  version = "4.0.0";
+  version = "4.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
     owner = "andrewsayre";
     repo = "pysmartthings";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ls+b37/m20CHVerl5wb6LIH0ttuN7H8Mr8cKNdk2+t0=";
+    hash = "sha256-yxGrtEMWMargZ9i0b4DqxSh/x3pbK1J8unL7goGnURY=";
   };
 
   build-system = [ hatchling ];

pkgs/development/python-modules/scancode-toolkit/default.nix

@@ -59,14 +59,14 @@
   xmltodict,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "scancode-toolkit";
   version = "32.5.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "scancode_toolkit";
-    inherit version;
+    inherit (finalAttrs) version;
     hash = "sha256-WXAZCk0aRmKb1UU1ud95mZFHAMC9U+gDRd9w7TZTVSA=";
   };
 
@@ -146,11 +146,12 @@ buildPythonPackage rec {
   meta = {
     description = "Tool to scan code for license, copyright, package and their documented dependencies and other interesting facts";
     homepage = "https://github.com/nexB/scancode-toolkit";
-    changelog = "https://github.com/nexB/scancode-toolkit/blob/v${version}/CHANGELOG.rst";
+    changelog = "https://github.com/nexB/scancode-toolkit/blob/v${finalAttrs.version}/CHANGELOG.rst";
     license = with lib.licenses; [
       asl20
       cc-by-40
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
   };
-}
+})

pkgs/development/python-modules/smg-grpc-proto/default.nix

@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  grpcio-tools,
+  setuptools,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "smg-grpc-proto";
+  version = "0.4.8";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  # No tags on GitHub
+  src = fetchPypi {
+    format = "setuptools";
+    pname = "smg_grpc_proto";
+    inherit (finalAttrs) version;
+    hash = "sha256-BK2sEbhHsa5/+yej9SB5A06SHB+9oCuuMmwENHJPyHY=";
+  };
+
+  build-system = [
+    grpcio-tools
+    setuptools
+  ];
+
+  postInstall = ''
+    find $out -name __pycache__ -type d | xargs rm -rv
+  '';
+
+  env.PYTHONDONTWRITEBYTECODE = 1;
+
+  pythonImportsCheck = [ "smg_grpc_proto" ];
+
+  # no tests
+  doCheck = false;
+
+  meta = {
+    description = "SMG gRPC proto definitions for SGLang, vLLM, TRT-LLM, and MLX";
+    homepage = "https://github.com/lightseekorg/smg/tree/main/crates/grpc_client/python";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ prince213 ];
+  };
+})

pkgs/development/python-modules/smg-grpc-servicer/default.nix

@@ -0,0 +1,57 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  grpcio,
+  grpcio-health-checking,
+  grpcio-reflection,
+  smg-grpc-proto,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "smg-grpc-servicer";
+  version = "0.5.3";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  # No tags on GitHub
+  src = fetchPypi {
+    format = "setuptools";
+    pname = "smg_grpc_servicer";
+    inherit (finalAttrs) version;
+    hash = "sha256-/stjZWK+5XSTmD9iIRWq+dqthd5kRhty6F7Ffvbfr74=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    grpcio
+    grpcio-health-checking
+    grpcio-reflection
+    smg-grpc-proto
+  ];
+
+  postInstall = ''
+    find $out -name __pycache__ -type d | xargs rm -rv
+  '';
+
+  env.PYTHONDONTWRITEBYTECODE = 1;
+
+  pythonImportsCheck = [ "smg_grpc_servicer" ];
+
+  # no tests
+  doCheck = false;
+
+  meta = {
+    description = "SMG gRPC servicer implementations for LLM inference engines (vLLM, SGLang, MLX)";
+    homepage = "https://github.com/lightseekorg/smg/tree/main/grpc_servicer";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ prince213 ];
+  };
+})

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

@@ -53,12 +53,8 @@ buildPythonPackage (finalAttrs: {
     # Many of the failures below are reported in:
     # https://github.com/aboutcode-org/typecode/issues/36
 
-    # AssertionError: assert 'application/x-bytecode.python'...
-    "test_package_json"
-
     # fails due to change in file (libmagic) 5.45
-    "test_doc_postscript_eps"
-    "test_package_debian"
+    "test_media_image_img"
   ];
 
   pythonImportsCheck = [ "typecode" ];
@@ -68,6 +64,7 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/aboutcode-org/typecode";
     changelog = "https://github.com/aboutcode-org/typecode/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
   };
 })

pkgs/development/python-modules/typecode/libmagic.nix

@@ -6,7 +6,7 @@
   file,
   zlib,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "typecode-libmagic";
   version = "21.5.31";
   format = "setuptools";
@@ -14,11 +14,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aboutcode-org";
     repo = "scancode-plugins";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-nGgFjp1N1IM/Sm4xLJw5WiZncc369/LqNcwFJBS1EQs=";
   };
 
-  sourceRoot = "${src.name}/builtins/typecode_libmagic-linux";
+  sourceRoot = "${finalAttrs.src.name}/builtins/typecode_libmagic-linux";
 
   propagatedBuildInputs = [ plugincode ];
 
@@ -42,7 +42,8 @@ buildPythonPackage rec {
     description = "ScanCode Toolkit plugin to provide pre-built binary libraries and utilities and their locations";
     homepage = "https://github.com/aboutcode-org/scancode-plugins/tree/main/builtins/typecode_libmagic-linux";
     license = lib.licenses.asl20;
-    maintainers = [ ];
     platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
   };
-}
+})

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

@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  symlinkJoin,
 
   # build-system
   setuptools,
@@ -30,6 +31,7 @@
   joblib,
   # jsonpath-python,
   nltk,
+  nltk-data,
   olefile,
   orderly-set,
   python-dateutil,
@@ -118,6 +120,18 @@
 }:
 let
   version = "0.18.31";
+
+  # unstructured downloads these NLTK corpora at import time unless they are already on
+  # nltk.data.path, which fails in offline or read-only builds. Bundle them and register
+  # the directory in postPatch. It must be named "nltk_data": unstructured's resolver
+  # uses paths ending in "nltk_data" as-is and appends "/nltk_data" to any others.
+  nltkData = symlinkJoin {
+    name = "nltk_data";
+    paths = with nltk-data; [
+      averaged-perceptron-tagger-eng
+      punkt-tab
+    ];
+  };
 in
 buildPythonPackage rec {
   pname = "unstructured";
@@ -133,6 +147,11 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  postPatch = ''
+    substituteInPlace unstructured/nlp/tokenize.py \
+      --replace-fail 'import nltk' 'import nltk; nltk.data.path.append("${nltkData}")'
+  '';
+
   dependencies = [
     # Base dependencies
     anyio
@@ -257,10 +276,14 @@ buildPythonPackage rec {
     ];
   };
 
-  pythonImportsCheck = [ "unstructured" ];
+  pythonImportsCheck = [
+    "unstructured"
+    # exercises the bundled NLTK corpora lookup, so the build catches an attempted download
+    "unstructured.nlp.tokenize"
+  ];
 
-  # test try to download punkt from nltk
-  # figure out how to make it available to enable the tests
+  # the import-time NLTK download is handled via nltkData above, but the test suite has
+  # further offline/data requirements that are not yet verified, so keep it disabled.
   doCheck = false;
 
   nativeCheckInputs = [

pkgs/development/python-modules/yoto-api/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "yoto-api";
-  version = "3.1.5";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cdnninja";
     repo = "yoto_api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pe1bxpheFBbUuTGL5ucQc5OZrk4HgLTtu1ORWUDm4+M=";
+    hash = "sha256-pzU+qResc+fqC1nhwbCYNNXKrD1aAjXZujjgL/5AGkc=";
   };
 
   build-system = [ setuptools ];

pkgs/development/r-modules/bioc-annotation-packages.json

@@ -1,6 +1,6 @@
 {
   "extraArgs": {
-    "biocVersion": "3.22"
+    "biocVersion": "3.23"
   },
   "packages": {
     "AHCytoBands": {
@@ -737,8 +737,8 @@
     },
     "BioMartGOGeneSets": {
       "name": "BioMartGOGeneSets",
-      "version": "0.99.11",
-      "sha256": "1ack8v1q0zg15gs816n9f4pwrzrpsv4va6j0r8847pw0pvavwpiq",
+      "version": "0.99.12",
+      "sha256": "11x00v18vd5ppm9asg120dmhmqamzsacy64v3kmmxfn7rhxl25b2",
       "depends": ["GenomicRanges", "S4Vectors"]
     },
     "CENTREannotation": {
@@ -749,8 +749,8 @@
     },
     "CTCF": {
       "name": "CTCF",
-      "version": "0.99.13",
-      "sha256": "097w2rad5fxyg2dkghz6ws93q1l7hlc6f9dnw1n30gs2bdv5hbyb",
+      "version": "0.99.14",
+      "sha256": "06nyz5758mq04hzvc7bl0ld2d173zabs9xyhva01y92b19yy8nfp",
       "depends": []
     },
     "ChemmineDrugs": {
@@ -887,14 +887,14 @@
     },
     "GO_db": {
       "name": "GO.db",
-      "version": "3.22.0",
-      "sha256": "1liyl1ic2d08an0h6yxllggkv9n8vyp1bfjwvqzk5ana17lzmimf",
+      "version": "3.23.1",
+      "sha256": "0ays2n3jivigpr7m3y3rba8gjyqr7g3qxdslppww0z0zzm4m808z",
       "depends": ["AnnotationDbi"]
     },
     "GeneSummary": {
       "name": "GeneSummary",
-      "version": "0.99.6",
-      "sha256": "0h6afrjb00afrcw6mwslxp7cmwfzp4qfxh0aa4f41kfjd3cymmp5",
+      "version": "0.99.7",
+      "sha256": "0pl843r230cgq0nh5pwp19zz823dwdv789kfcgdhylijx3h2ymfk",
       "depends": []
     },
     "GenomeInfoDbData": {
@@ -1241,8 +1241,8 @@
     },
     "Orthology_eg_db": {
       "name": "Orthology.eg.db",
-      "version": "3.22.0",
-      "sha256": "14wng7izmr7wx3yimjlvmk87vf1z3z0n88y2nghn8a2iqci1rl3s",
+      "version": "3.23.0",
+      "sha256": "0640jwylw67cw8sylmyfcqm8cak5i2bx9k925bwm0bjmayxl8yw3",
       "depends": ["AnnotationDbi"]
     },
     "PANTHER_db": {
@@ -1673,8 +1673,8 @@
     },
     "UniProtKeywords": {
       "name": "UniProtKeywords",
-      "version": "0.99.7",
-      "sha256": "10id2lk2mbccay7p44pk58zhkiqc58x237qr76plivgpcc8xhjzq",
+      "version": "0.99.8",
+      "sha256": "1mhbhar70acwgjmlfkfrqc2hskqvbgsaf9xlzv8ph66x6gvbyqb7",
       "depends": []
     },
     "XtraSNPlocs_Hsapiens_dbSNP144_GRCh37": {
@@ -2093,8 +2093,8 @@
     },
     "excluderanges": {
       "name": "excluderanges",
-      "version": "0.99.10",
-      "sha256": "0j9njpnbh731ffimr1sbvix3wsivnh9nwxg6sbrpwp8gl0pnl7r0",
+      "version": "0.99.11",
+      "sha256": "1czr9hr84hzwa7fyzm51425nphy0b9h5yfvgkij5v8qgq565w02a",
       "depends": ["GenomicRanges"]
     },
     "fitCons_UCSC_hg19": {
@@ -2513,8 +2513,8 @@
     },
     "hpAnnot": {
       "name": "hpAnnot",
-      "version": "1.1.1",
-      "sha256": "0bkfcj9igi7ylhf3arszqnqzaxsxvfv2gn2smzx6ymzq5a8sc0yg",
+      "version": "1.1.3",
+      "sha256": "0gnir407flzzkkljxf2brqrw2kaycl8azi0wc5yn1fhl7x5zidq1",
       "depends": ["AnnotationHub"]
     },
     "hs25kresogen_db": {
@@ -3749,20 +3749,20 @@
     },
     "org_Hs_eg_db": {
       "name": "org.Hs.eg.db",
-      "version": "3.22.0",
-      "sha256": "0bia1ppxnyjpw4p3rk19q1l8rrcraccpz4w69f3ja0q0im0xrgfi",
+      "version": "3.23.1",
+      "sha256": "1zlwsk1hq40xi8xd7wc974jp8gky6x7icc9788ch77glbik201j7",
       "depends": ["AnnotationDbi"]
     },
     "org_Mm_eg_db": {
       "name": "org.Mm.eg.db",
-      "version": "3.22.0",
-      "sha256": "16liabdbkfqzhna3rw1zgf777r3xm8knrbvy0181c2nsn2jkxsv3",
+      "version": "3.23.0",
+      "sha256": "0i252737v6wk0im41gnksz4qkzf286kwgfq60yqc1mfva77m8yjh",
       "depends": ["AnnotationDbi"]
     },
     "org_Mmu_eg_db": {
       "name": "org.Mmu.eg.db",
-      "version": "3.22.0",
-      "sha256": "0ga0c9635pkigmr0l9vazh3qdpyxki1y8l7mbgcp1y8sfkyjn33c",
+      "version": "3.23.0",
+      "sha256": "08l4bckvn42yjgpkcmq87c1c2z4g8cfjc9jm5ibb84v5ffjw92ij",
       "depends": ["AnnotationDbi"]
     },
     "org_Mxanthus_db": {
@@ -3779,14 +3779,14 @@
     },
     "org_Pt_eg_db": {
       "name": "org.Pt.eg.db",
-      "version": "3.22.0",
-      "sha256": "1i67vccx3a6zak34nwdhrbhm7hkjz9qbai9jvwrlql6z8xc6n6q0",
+      "version": "3.23.0",
+      "sha256": "1hfvrv2n9gc0h4s6ql4lv8q8qjf75c4y5p2hlplhphzi38j54vhl",
       "depends": ["AnnotationDbi"]
     },
     "org_Rn_eg_db": {
       "name": "org.Rn.eg.db",
-      "version": "3.22.0",
-      "sha256": "0vqpmbivxd1yvapa5gz9mrxlk6ivrzak55dw2sfjm8sl308rmaj4",
+      "version": "3.23.0",
+      "sha256": "1j1gs8bk1a247shhs5z41s4pk6hw4ssy7405fv5q16m5ilpwgc1g",
       "depends": ["AnnotationDbi"]
     },
     "org_Sc_sgd_db": {
@@ -3797,14 +3797,14 @@
     },
     "org_Ss_eg_db": {
       "name": "org.Ss.eg.db",
-      "version": "3.22.0",
-      "sha256": "03qlbkvxfmdgpl8dwx72msd9asx12izvq2vmidqfyipyr7r79cbm",
+      "version": "3.23.0",
+      "sha256": "0ijn7dfh485lww1d9bp8j40fcjr1lx8vdnlq6ydwq3ni4bifkzqp",
       "depends": ["AnnotationDbi"]
     },
     "org_Xl_eg_db": {
       "name": "org.Xl.eg.db",
-      "version": "3.22.0",
-      "sha256": "1h8jvdzhpp9d4zaaczhmg6hk32p77l63v3095ln58rhy9m18pg0f",
+      "version": "3.23.0",
+      "sha256": "1w856a5hkp9a5g41nd69xwvzaf1nmq7zqjsn7w5p1i2zsxv1i1k1",
       "depends": ["AnnotationDbi"]
     },
     "paeg1acdf": {
@@ -5111,8 +5111,8 @@
     },
     "reactome_db": {
       "name": "reactome.db",
-      "version": "1.95.0",
-      "sha256": "1b87byr45cmqa7jyd5fw3askmrzfhdljjp2d7jcmm88baf45mfg6",
+      "version": "1.96.0",
+      "sha256": "0b43ri3clg6ynp197vy24936n762k0f43v9m51g1lar2w4qc2zhb",
       "depends": ["AnnotationDbi"]
     },
     "rgu34a_db": {

pkgs/development/r-modules/default.nix

@@ -765,7 +765,9 @@ let
     ];
     RGtk2 = [ pkgs.gtk2.dev ];
     rhdf5 = [ pkgs.zlib ];
-    Rhdf5lib = with pkgs; [ zlib.dev ];
+    Rhdf5lib = with pkgs; [
+      cmake
+    ];
     Rhpc = with pkgs; [
       zlib
       bzip2.dev
@@ -821,7 +823,10 @@ let
     rpanel = [ pkgs.tclPackages.bwidget ];
     Rpoppler = [ pkgs.poppler ];
     RPostgreSQL = with pkgs; [ libpq.pg_config ];
-    RProtoBuf = [ pkgs.protobuf ];
+    RProtoBuf = with pkgs; [
+      protobuf
+      abseil-cpp.dev
+    ];
     rsamplr = with pkgs; [
       cargo
       rustc
@@ -865,6 +870,10 @@ let
       cargo
       rustc
     ];
+    tinyimg = with pkgs; [
+      cargo
+      rustc
+    ];
     caugi = with pkgs; [
       cargo
       rustc
@@ -966,6 +975,7 @@ let
       fontconfig.dev
       freetype.dev
     ];
+    rlas = [ pkgs.pkg-config ];
     TAQMNGR = [ pkgs.zlib.dev ];
     TDA = [ pkgs.gmp ];
     tesseract = with pkgs; [
@@ -1227,10 +1237,16 @@ let
       xz.dev
       zlib.dev
     ];
+    fs = [ pkgs.libuv ];
     pgenlibr = [ pkgs.zlib.dev ];
     fftw = [ pkgs.pkg-config ];
     gdtools = [ pkgs.pkg-config ];
     archive = [ pkgs.libarchive ];
+    lpsymphony = with pkgs; [
+      symphony
+      cgl
+      clp
+    ];
     gdalcubes = with pkgs; [
       proj.dev
       gdal
@@ -1251,6 +1267,10 @@ let
       fftw.dev
       pkg-config
     ];
+    Rhdf5lib = with pkgs; [
+      curl
+      zlib.dev
+    ];
     GRAB = [ pkgs.zlib.dev ];
     jqr = [ pkgs.jq.out ];
     kza = [ pkgs.pkg-config ];
@@ -1541,7 +1561,13 @@ let
     redux = [ pkgs.hiredis ];
     RmecabKo = [ pkgs.mecab ];
     markets = [ pkgs.gsl ];
-    rlas = [ pkgs.boost ];
+    rlas = with pkgs; [
+      boost
+      gdal
+      proj
+      sqlite
+      geos
+    ];
     bgx = [ pkgs.boost ];
     PoissonBinomial = [ pkgs.fftw.dev ];
     poisbinom = [ pkgs.fftw.dev ];
@@ -1947,6 +1973,10 @@ let
       postPatch = "patchShebangs configure";
     });
 
+    fixest = old.fixest.overrideAttrs (attrs: {
+      postPatch = "patchShebangs configure";
+    });
+
     arcgisplaces = old.arcgisplaces.overrideAttrs (attrs: {
       postPatch = "patchShebangs configure";
     });
@@ -1979,6 +2009,10 @@ let
       postPatch = "patchShebangs configure";
     });
 
+    ramr = old.ramr.overrideAttrs (attrs: {
+      postPatch = "patchShebangs configure";
+    });
+
     roxigraph = old.roxigraph.overrideAttrs (attrs: {
       env = (attrs.env or { }) // {
         LIBCLANG_PATH = "${lib.getLib pkgs.libclang}/lib";
@@ -2440,6 +2474,10 @@ let
       '';
     });
 
+    RProtoBuf = old.RProtoBuf.overrideAttrs (attrs: {
+      configureFlags = [ "ac_cv_prog_cxx_cxx11=" ];
+    });
+
     JavaGD = old.JavaGD.overrideAttrs (attrs: {
       preConfigure = ''
         export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/
@@ -2948,7 +2986,10 @@ let
     );
 
     lpsymphony = old.lpsymphony.overrideAttrs (attrs: {
-      preConfigure = ''
+      postPatch = ''
+        substituteInPlace configure \
+          --replace-fail '--libs SYMPHONY' '--libs symphony' \
+          --replace-fail '--cflags SYMPHONY' '--cflags symphony'
         patchShebangs configure
       '';
     });
@@ -3108,7 +3149,13 @@ let
 
     Rhdf5lib =
       let
-        hdf5 = pkgs.hdf5_1_10;
+        hdf5 = pkgs.hdf5.overrideAttrs (attrs: {
+          cmakeFlags = attrs.cmakeFlags ++ [ "-DHDF5_ENABLE_ROS3_VFD:BOOL=TRUE" ];
+          buildInputs = attrs.buildInputs ++ [ pkgs.curl.dev ];
+          postInstall = attrs.postInstall or "" + ''
+            cp src/libhdf5.settings $dev/lib
+          '';
+        });
       in
       old.Rhdf5lib.overrideAttrs (attrs: {
         propagatedBuildInputs = attrs.propagatedBuildInputs ++ [

pkgs/development/r-modules/patches/Rhdf5lib.patch

@@ -1,8 +1,8 @@
 diff --git a/R/zzz.R b/R/zzz.R
-index 97becd7..803ca39 100644
+index 2af2b3e..21ddc00 100644
 --- a/R/zzz.R
 +++ b/R/zzz.R
-@@ -20,7 +20,7 @@ pkgconfig <- function(opt = c("PKG_CXX_LIBS", "PKG_C_LIBS", "PKG_CXX_HL_LIBS", "
+@@ -22,7 +22,7 @@ pkgconfig <- function(opt = c("PKG_CXX_LIBS", "PKG_C_LIBS", "PKG_CXX_HL_LIBS", "
  
    path <- Sys.getenv(
      x = "RHDF5LIB_RPATH",
@@ -10,70 +10,48 @@ index 97becd7..803ca39 100644
 +    unset = ""
    )
  
-   if (nzchar(.Platform$r_arch)) {
-@@ -59,7 +59,7 @@ pkgconfig <- function(opt = c("PKG_CXX_LIBS", "PKG_C_LIBS", "PKG_CXX_HL_LIBS", "
-                               sprintf('-L%s -lhdf5 %s',
+   sysname <- Sys.info()['sysname']
+@@ -47,7 +47,7 @@ pkgconfig <- function(opt = c("PKG_CXX_LIBS", "PKG_C_LIBS", "PKG_CXX_HL_LIBS", "
+                               sprintf('-L%s -lhdf5 %s', 
                                        patharch, winlibs)
                              }, {
 -                              sprintf('"%s/libhdf5.a"%s%s', 
-+                              sprintf('-lhdf5',
-                                       patharch, .getSzipLoc(patharch), .getDynamicLinks())
++                              sprintf('-lhdf5', 
+                                       patharch, .getSzipLoc(patharch), .getDynamicLinks(patharch))
                              }
                       )
-@@ -70,7 +70,7 @@ pkgconfig <- function(opt = c("PKG_CXX_LIBS", "PKG_C_LIBS", "PKG_CXX_HL_LIBS", "
-                               sprintf('-L%s -lhdf5_cpp -lhdf5 %s',
+@@ -58,7 +58,7 @@ pkgconfig <- function(opt = c("PKG_CXX_LIBS", "PKG_C_LIBS", "PKG_CXX_HL_LIBS", "
+                               sprintf('-L%s -lhdf5_cpp -lhdf5 %s', 
                                        patharch, winlibs)
                              }, {
 -                              sprintf('"%s/libhdf5_cpp.a" "%s/libhdf5.a"%s%s',
 +                              sprintf('-lhdf5_cpp -lhdf5',
-                                       patharch, patharch, .getSzipLoc(patharch), .getDynamicLinks())
+                                       patharch, patharch, .getSzipLoc(patharch), .getDynamicLinks(patharch))
                              }
                       )
-@@ -81,7 +81,7 @@ pkgconfig <- function(opt = c("PKG_CXX_LIBS", "PKG_C_LIBS", "PKG_CXX_HL_LIBS", "
-                               sprintf('-L%s -lhdf5_hl -lhdf5 %s',
+@@ -69,7 +69,7 @@ pkgconfig <- function(opt = c("PKG_CXX_LIBS", "PKG_C_LIBS", "PKG_CXX_HL_LIBS", "
+                               sprintf('-L%s -lhdf5_hl -lhdf5 %s', 
                                        patharch, winlibs)
                              }, {
 -                              sprintf('"%s/libhdf5_hl.a" "%s/libhdf5.a"%s%s', 
-+                              sprintf('-lhdf5_hl -lhdf5',
-                                       patharch, patharch, .getSzipLoc(patharch), .getDynamicLinks())
++                              sprintf('-lhdf5_hl -lhdf5', 
+                                       patharch, patharch, .getSzipLoc(patharch), .getDynamicLinks(patharch))
                              }
                       )
-@@ -92,7 +92,7 @@ pkgconfig <- function(opt = c("PKG_CXX_LIBS", "PKG_C_LIBS", "PKG_CXX_HL_LIBS", "
-                               sprintf('-L%s -lhdf5_hl_cpp -lhdf5_hl -lhdf5_cpp -lhdf5 %s',
+@@ -80,7 +80,7 @@ pkgconfig <- function(opt = c("PKG_CXX_LIBS", "PKG_C_LIBS", "PKG_CXX_HL_LIBS", "
+                               sprintf('-L%s -lhdf5_hl_cpp -lhdf5_hl -lhdf5_cpp -lhdf5 %s', 
                                        patharch, winlibs)
                              }, {
 -                              sprintf('"%s/libhdf5_hl_cpp.a" "%s/libhdf5_hl.a" "%s/libhdf5_cpp.a" "%s/libhdf5.a"%s%s',
 +                              sprintf('-lhdf5_hl_cpp -lhdf5_hl -lhdf5_cpp -lhdf5',
-                                       patharch, patharch, patharch, patharch, .getSzipLoc(patharch), .getDynamicLinks())
+                                       patharch, patharch, patharch, patharch, .getSzipLoc(patharch), .getDynamicLinks(patharch))
                              }
                       )
-@@ -124,6 +124,7 @@ getHdf5Version <- function() {
- #'
+@@ -113,6 +113,7 @@ getHdf5Version <- function() {
+ #' @noRd
  #' @keywords internal
- .getDynamicLinks <- function() {
+ .getDynamicLinks <- function(path) {
 +  return("")
-   sysname <- Sys.info()['sysname']
-   if(sysname == "Windows") {
-     links <- "-lz"
-diff --git a/src/Makevars.in b/src/Makevars.in
-index addb6a0..590784a 100644
---- a/src/Makevars.in
-+++ b/src/Makevars.in
-@@ -18,7 +18,7 @@ USER_LIB_DIR = ${R_PACKAGE_DIR}/lib${R_ARCH}/
- 
- PKG_CPPFLAGS = -I${USER_INCLUDE_DIR} ${ZLIB_INCLUDE}
- PKG_CFLAGS = ${ZLIB_LIB}
--PKG_LIBS = "${USER_LIB_DIR}libhdf5.a" @SZIP_LIB@ -lz
-+PKG_LIBS = -lhdf5 -lsz
- 
- 
- 
-@@ -26,7 +26,7 @@ all: $(SHLIB)
- 
- $(SHLIB): Rhdf5lib.o
- 
--Rhdf5lib.o: copy-hdf5 @COPY_SZIP@
-+Rhdf5lib.o:
- 
- copy-szip: copy-hdf5
- 	cp hdf5/libaec-1.0.4/build/szip/lib/libsz.a "${USER_LIB_DIR}"
+   settings_file <- file.path(path, "libhdf5.settings")
+   libhdf5_settings <- readLines(settings_file)
+   libstr <- grep("Extra libraries", x = libhdf5_settings, fixed = TRUE, value = TRUE) |> 

pkgs/development/r-modules/patches/rhdf5.patch

@@ -9,39 +9,3 @@ index 713b44c..704ac17 100644
  
  #PKG_CFLAGS = -Wall
  
-diff --git a/src/h5testLock.c b/src/h5testLock.c
-index b326444..5d58b4a 100644
---- a/src/h5testLock.c
-+++ b/src/h5testLock.c
-@@ -8,16 +8,16 @@ SEXP _h5fileLock(SEXP _file_name) {
-   int lk = -1;
- 
-   /* create the temporary file */
--  fd = HDopen(file_name, O_RDWR | O_CREAT | O_TRUNC, 0666);
-+  fd = open(file_name, O_RDWR | O_CREAT | O_TRUNC, 0666);
- 
-   /* try to lock file */
--  lk = HDflock(fd, LOCK_EX | LOCK_NB);
-+  lk = flock(fd, LOCK_EX | LOCK_NB);
-   
-   /* unlock so we can remove */
--  HDflock(fd, LOCK_UN);
-+  flock(fd, LOCK_UN);
-   
-   /* close */
--  HDclose(fd);
-+  close(fd);
-   
-   /* return value of lock attempt */
-   PROTECT(Rval = allocVector(INTSXP, 1));
-diff --git a/src/h5testLock.h b/src/h5testLock.h
-index 2c1c5e4..25914ff 100644
---- a/src/h5testLock.h
-+++ b/src/h5testLock.h
-@@ -1,5 +1,5 @@
- #include <fcntl.h>
-+#include <unistd.h>
- #include "myhdf5.h"
--#include <H5private.h>
- 
- SEXP _h5fileLock();

pkgs/development/tools/pnpm/default.nix

@@ -31,7 +31,13 @@ let
     };
   };
 
-  callPnpm = variant: callPackage ./generic.nix { inherit (variant) version hash; };
+  callPnpm =
+    variant:
+    callPackage ./generic.nix {
+      inherit (variant) version hash;
+      #FIXME: remove this hack in a future version.
+      nodejs = null; # Passing null to detect out-of-tree overrides
+    };
 
   mkPnpm = versionSuffix: variant: nameValuePair "pnpm_${versionSuffix}" (callPnpm variant);
 in

pkgs/development/tools/pnpm/generic.nix

@@ -6,7 +6,9 @@
   pnpmConfigHook,
   fetchurl,
   installShellFiles,
-  nodejs,
+  #FIXME: remove this arg in a future version.
+  nodejs, # Should be null, unless overridden.
+  nodejs-slim,
   testers,
   buildPackages,
   bashNonInteractive,
@@ -18,6 +20,12 @@
 }:
 let
   majorVersion = lib.versions.major version;
+  nodejs-slim' =
+    #FIXME: remove this hack in a future version.
+    if nodejs == null then
+      nodejs-slim
+    else
+      lib.warn "pnpm: Override nodejs-slim instead of nodejs" nodejs;
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pnpm";
@@ -30,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     installShellFiles
-    nodejs
+    nodejs-slim'
   ];
 
   buildInputs = [
     bashNonInteractive # needed for node-gyp wrapper script
   ]
-  ++ lib.optionals withNode [ nodejs ];
+  ++ lib.optionals withNode [ nodejs-slim' ];
 
   # Remove binary files from src, we don't need them, and this way we make sure
   # our distribution is free of binaryNativeCode
@@ -109,7 +117,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
               ];
             })
           );
-      inherit nodejs majorVersion;
+      nodejs-slim = nodejs-slim';
+      #FIXME: remove this in a future version.
+      nodejs = lib.warn "pnpm.nodejs: Use pnpm.nodejs-slim instead of pnpm.nodejs" nodejs-slim';
+      inherit majorVersion;
 
       tests = {
         inherit (tests) pnpm;

pkgs/servers/home-assistant/component-packages.nix

@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2026.6.0";
+  version = "2026.6.1";
   components = {
     "3_day_blinds" =
       ps: with ps; [

pkgs/servers/home-assistant/custom-components/dreo/package.nix

@@ -12,13 +12,13 @@
 buildHomeAssistantComponent rec {
   owner = "JeffSteinbok";
   domain = "dreo";
-  version = "1.9.8";
+  version = "1.9.9";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hass-dreo";
     tag = "v${version}";
-    hash = "sha256-F/r5r8lgYbJdIFtaHPDXtlpOQFKDsBClTA0954OrAzM=";
+    hash = "sha256-r8Nt5LLJRKYxbx6znS46QCdejKCpCG7ybGd8wbv0Wgk=";
   };
 
   dependencies = [ websockets ];

pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix

@@ -54,6 +54,8 @@ buildHomeAssistantComponent rec {
   disabledTests = [
     # custom_components.homematicip_local.support.InvalidConfig: C
     "test_async_validate_config_and_get_system_information"
+    # Failed: Lingering timer after test <TimerHandle when=3043632.864116499 Store._async_schedule_callback_delayed_write() created at /nix/store/5rh57mhaihd9wff1rqnskvs8nxh9sv3z-homeassistant-2026.6.0/lib/python3.14/site-packages/homeassistant/helpers/storage.py:516>
+    "test_reauth_flow_success"
   ];
 
   meta = {

pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix

@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wills106";
   domain = "solax_modbus";
-  version = "2026.06.1";
+  version = "2026.06.3";
 
   src = fetchFromGitHub {
     owner = "wills106";
     repo = "homeassistant-solax-modbus";
     tag = version;
-    hash = "sha256-R1z/BLFaKt80HSC5VqnmZSaI/onmIamYlYIxszeJptw=";
+    hash = "sha256-2lJ4lVrGG8jtNymA2lwkJS1DKd0w6TYs5PAnCynBOWM=";
   };
 
   dependencies = [ pymodbus ];

pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix

@@ -12,20 +12,20 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "custom-sidebar";
-  version = "14.0.0";
+  version = "15.0.0";
 
   src = fetchFromGitHub {
     owner = "elchininet";
     repo = "custom-sidebar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2CQcY5/Cb3IPuI7cL28t7iZCH3kD21equBW5BL6w8TU=";
+    hash = "sha256-0bS760GfIO/LdQD6lNEKhiIW5lyCu35cTi0g3GaGQ5M=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-gYNCjCeAt6LP4tZE4ufiQu7OG2ujWydm4etcGQxMxcU=";
+    hash = "sha256-zmWZhOx1Pl7O5T5vNdff/nZC1juwm66YOVIMjuNoBYg=";
   };
 
   nativeBuildInputs = [

pkgs/servers/home-assistant/custom-lovelace-modules/meshcore-card/package.nix

@@ -7,17 +7,17 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "meshcore-card";
-  version = "0.3.5";
+  version = "1.0.0";
   strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "jpettitt";
     repo = "meshcore-card";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XfqtCGSDrfkNIqWuH8Y8DLacJf9x7iaZXDiKDWdqzhw=";
+    hash = "sha256-B2W3B8cd9OrTOxLEWUV8Aercektfwh7/Ik3/U/Lwz48=";
   };
 
-  npmDepsHash = "sha256-KgG6PGSGw9zCOPboZjo/gpAs2OwLg3LRl3rqenIvTG8=";
+  npmDepsHash = "sha256-/CtYdDFo8Sbq3FEm6ND8b/CNcfsUgoT23F6RVfYtYDg=";
 
   installPhase = ''
     runHook preInstall

pkgs/servers/home-assistant/default.nix

@@ -265,7 +265,7 @@ let
   extraBuildInputs = extraPackages python3Packages;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2026.6.0";
+  hassVersion = "2026.6.1";
 
 in
 python3Packages.buildPythonApplication rec {
@@ -286,13 +286,13 @@ python3Packages.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-/7WBiQwr40EFOwL+J/3L4pBoQp7nNPPjcKHxU4tDNcU=";
+    hash = "sha256-gjXhWv64Uu3LHwxDR8HwsTFeAncgY94JeOqfKEnvgJ8=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-Eu5oUGBKCrIZkyyLfmTJbHxOC7TD9QHjjNpjscgPK/I=";
+    hash = "sha256-gtnIsOrJWyLhjEc9dstvRiVd4LrqJ6W48qXNwaV8YlU=";
   };
 
   build-system = with python3Packages; [
@@ -317,6 +317,9 @@ python3Packages.buildPythonApplication rec {
     # No scaring our users about not running in a docker or a venv
     ./patches/pythonpath-is-a-venv.patch
 
+    # No scaring our users about our install method
+    ./patches/nixos-was-never-supported.patch
+
     # Patch path to ffmpeg binary
     (replaceVars ./patches/ffmpeg-path.patch {
       ffmpeg = "${lib.getExe ffmpeg-headless}";

pkgs/servers/home-assistant/patches/nixos-was-never-supported.patch

@@ -0,0 +1,13 @@
+diff --git a/homeassistant/components/homeassistant/__init__.py b/homeassistant/components/homeassistant/__init__.py
+index 54c6454167b..026fda54578 100644
+--- a/homeassistant/components/homeassistant/__init__.py
++++ b/homeassistant/components/homeassistant/__init__.py
+@@ -420,7 +420,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
+ 
+         installation_type = info["installation_type"][15:]
+         if installation_type in {"Core", "Container"}:
+-            deprecated_method = installation_type == "Core"
++            deprecated_method = False
+             bit32 = _is_32_bit()
+             arch = info["arch"]
+             if bit32 and installation_type == "Container":

pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix

@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.336";
+  version = "0.13.337";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MatthewFlamm";
     repo = "pytest-homeassistant-custom-component";
     tag = version;
-    hash = "sha256-TyU9w1bqCJ780AIUgvNa3XO6pYxrGAKuD28WxBvbink=";
+    hash = "sha256-q5k38dN8Dwgvm29Zf8tkFCOt0Tj9J8ZDDyT57oHq5Os=";
   };
 
   build-system = [ setuptools ];

pkgs/servers/home-assistant/stubs.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2026.6.0";
+  version = "2026.6.1";
   pyproject = true;
 
   disabled = python.version != home-assistant.python3Packages.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-JGq+Mwe0dm680lPesSi/SO6wsqM56jY10aTkCNwf/l8=";
+    hash = "sha256-HtDOM/cm8DFn8IKJ5Y8VtPYzRq0vWd8KJB2Dn7Zz4Ws=";
   };
 
   build-system = [

pkgs/servers/home-assistant/tests.nix

@@ -126,11 +126,23 @@ let
       # intent fixture mismatch on aarch64
       "test_error_no_device_on_floor"
     ];
+    homeassistant_connect_zbt2 = [
+      # [2026.6.1] AssertionError: assert <ConfigEntryState.LOADED: 'loaded'> is <ConfigEntryState.SETUP_RETRY: 'setup_retry'>
+      "test_usb_device_reactivity"
+    ];
+    homeassistant = [
+      # disabled via nixos-was-never-supported.patch
+      "test_deprecated_installation_issue_core"
+    ];
     opendisplay = [
       # [2026.6.0] Failed: Description not found for placeholder `reason` in component.opendisplay.exceptions.device_not_found.message
       # https://github.com/home-assistant/core/pull/172909
       "test_upload_image_device_not_in_range"
     ];
+    yardian = [
+      # [2026.6.1] failing snapshot
+      "test_all_entities"
+    ];
     zeroconf = [
       # multicast socket bind, not possible in the sandbox
       "test_subscribe_discovery"