Merge master into staging-next

maintainers/maintainer-list.nix

···
     githubId = 53097078;
     name = "AJ Reifsnyder";
   };
+  arexon = {
+    email = "[e-mail]";
+    github = "arexon";
+    githubId = 65680034;
+    name = "arexon";
+  };
   arezvov = {
     email = "[e-mail]";
     github = "arezvov";

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

···
 
 - [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable).
 
+- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](option.html#opt-services.pds).
+
 - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).
 
 - [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable).

nixos/modules/config/ldap.nix

···
           type = types.lines;
           description = ''
             Extra configuration options that will be added verbatim at
-            the end of the nslcd configuration file (`nslcd.conf(5)`).
+            the end of the nslcd configuration file ({manpage}`nslcd.conf(5)`).
           '';
         };
 
···
         type = types.lines;
         description = ''
           Extra configuration options that will be added verbatim at
-          the end of the ldap configuration file (`ldap.conf(5)`).
+          the end of the ldap configuration file ({manpage}`ldap.conf(5)`).
           If {option}`users.ldap.daemon` is enabled, this
           configuration will not be used. In that case, use
           {option}`users.ldap.daemon.extraConfig` instead.

nixos/modules/config/mysql.nix

···
                 - `0` (or `"plain"`):
                   No encryption. Passwords are stored in plaintext. HIGHLY DISCOURAGED.
                 - `1` (or `"Y"`):
-                  Use crypt(3) function.
+                  Use {manpage}`crypt(3)` function.
                 - `2` (or `"mysql"`):
                   Use the MySQL PASSWORD() function. It is possible that the encryption function used
                   by `pam_mysql` is different from that of the MySQL server, as

nixos/modules/config/swap.nix

···
           If not specified, the amount of data to read from `source` will be
           determined by cryptsetup.
 
-          See `cryptsetup-open(8)` for details.
+          See `{manpage}`cryptsetup-open(8)`` for details.
         '';
       };
 
···
           If not specified, the default sector size is determined from the
           underlying block device.
 
-          See `cryptsetup-open(8)` for details.
+          See `{manpage}`cryptsetup-open(8)`` for details.
         '';
       };
 
···
           whole swap space is discarded at swapon invocation. If "pages",
           asynchronous discard on freed pages is performed, before returning to
           the available pages pool. With "both", both policies are activated.
-          See swapon(8) for more information.
+          See {manpage}`swapon(8)` for more information.
         '';
       };
 

nixos/modules/config/users-groups.nix

···
       homeMode = mkOption {
         type = types.strMatching "[0-7]{1,5}";
         default = "700";
-        description = "The user's home directory mode in numeric format. See chmod(1). The mode is only applied if {option}`users.users.<name>.createHome` is true.";
+        description = "The user's home directory mode in numeric format. See {manpage}`chmod(1)`. The mode is only applied if {option}`users.users.<name>.createHome` is true.";
       };
 
       cryptHomeLuks = mkOption {

nixos/modules/config/xdg/portals/wlr.nix

···
       description = ''
         Configuration for `xdg-desktop-portal-wlr`.
 
-        See `xdg-desktop-portal-wlr(5)` for supported
+        See {manpage}`xdg-desktop-portal-wlr(5)` for supported
         values.
       '';
 

nixos/modules/module-list.nix

···
   ./services/web-apps/mobilizon.nix
   ./services/web-apps/openwebrx.nix
   ./services/web-apps/outline.nix
+  ./services/web-apps/pds.nix
   ./services/web-apps/peering-manager.nix
   ./services/web-apps/peertube.nix
   ./services/web-apps/pgpkeyserver-lite.nix

nixos/modules/programs/gamemode.nix

···
         default = { };
         description = ''
           System-wide configuration for GameMode (/etc/gamemode.ini).
-          See gamemoded(8) man page for available settings.
+          See {manpage}`gamemoded(8)` man page for available settings.
         '';
         example = lib.literalExpression ''
           {

nixos/modules/programs/git.nix

···
           `config` to `[ { foo.x = 42; } { bar.y = 42; }]` will put the `foo`
           section before the `bar` section unlike the default alphabetical
           order, which can be helpful for sections such as `include` and
-          `includeIf`. See the CONFIGURATION FILE section of git-config(1) for
+          `includeIf`. See the CONFIGURATION FILE section of {manpage}`git-config(1)` for
           more information.
         '';
       };

nixos/modules/programs/msmtp.nix

···
         };
         description = ''
           Default values applied to all accounts.
-          See msmtp(1) for the available options.
+          See {manpage}`msmtp(1)` for the available options.
         '';
       };
 
···
         description = ''
           Named accounts and their respective configurations.
           The special name "default" allows a default account to be defined.
-          See msmtp(1) for the available options.
+          See {manpage}`msmtp(1)` for the available options.
 
           Use `programs.msmtp.extraConfig` instead of this attribute set-based
           option if ordered account inheritance is needed.
···
         default = "";
         description = ''
           Extra lines to add to the msmtp configuration verbatim.
-          See msmtp(1) for the syntax and available options.
+          See {manpage}`msmtp(1)` for the syntax and available options.
         '';
       };
     };

nixos/modules/programs/shadow.nix

···
         description = ''
           Config options for the /etc/login.defs file, that defines
           the site-specific configuration for the shadow password suite.
-          See login.defs(5) man page for available options.
+          See {manpage}`login.defs(5)` man page for available options.
         '';
         type = lib.types.submodule {
           freeformType = (pkgs.formats.keyValue { }).type;

nixos/modules/security/pam.nix

···
           the YubiCloud.
 
           Use "challenge-response" for offline validation using YubiKeys with HMAC-SHA-1
-          Challenge-Response configurations. See the man-page ykpamcfg(1) for further
+          Challenge-Response configurations. See the man-page {manpage}`ykpamcfg(1)` for further
           details on how to configure offline Challenge-Response validation.
 
           More information can be found [here](https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html).

nixos/modules/security/wrappers/default.nix

···
       example = "10G";
       type = lib.types.str;
       description = ''
-        Size limit for the /run/wrappers tmpfs. Look at mount(8), tmpfs size option,
+        Size limit for the /run/wrappers tmpfs. Look at {manpage}`mount(8)`, tmpfs size option,
         for the accepted syntax. WARNING: don't set to less than 64MB.
       '';
     };

nixos/modules/services/backup/btrbk.nix

···
         default = 10;
       };
       ioSchedulingClass = mkOption {
-        description = "IO scheduling class for btrbk (see ionice(1) for a quick description). Applies to local instances, and remote ones connecting by ssh if set to idle.";
+        description = "IO scheduling class for btrbk (see {manpage}`ionice(1)` for a quick description). Applies to local instances, and remote ones connecting by ssh if set to idle.";
         type = types.enum [
           "idle"
           "best-effort"
···
                 type = types.nullOr types.str;
                 default = "daily";
                 description = ''
-                  How often this btrbk instance is started. See systemd.time(7) for more information about the format.
+                  How often this btrbk instance is started. See {manpage}`systemd.time(7)` for more information about the format.
                   Setting it to null disables the timer, thus this instance can only be started manually.
                 '';
               };

nixos/modules/services/backup/restic.nix

···
           default = null;
           description = ''
             file containing the credentials to access the repository, in the
-            format of an EnvironmentFile as described by systemd.exec(5)
+            format of an EnvironmentFile as described by {manpage}`systemd.exec(5)`
           '';
         };
 

nixos/modules/services/backup/tarsnap.nix

···
           `"/root/tarsnap.key"`.
 
           It's recommended for backups that you generate a key for every archive
-          using `tarsnap-keygen(1)`, and then generate a
-          write-only tarsnap key using `tarsnap-keymgmt(1)`,
+          using {manpage}`tarsnap-keygen(1)`, and then generate a
+          write-only tarsnap key using {manpage}`tarsnap-keymgmt(1)`,
           and keep your master key(s) for a particular machine off-site.
 
           The keyfile name should be given as a string and not a path, to
···
                     Use this option if you want to run multiple backups
                     concurrently - each archive must have a unique key. You can
                     generate a write-only key derived from your master key (which
-                    is recommended) using `tarsnap-keymgmt(1)`.
+                    is recommended) using {manpage}`tarsnap-keymgmt(1)`.
 
                     Note: every archive must have an individual master key. You
                     must generate multiple keys with
-                    `tarsnap-keygen(1)`, and then generate write
+                    {manpage}`tarsnap-keygen(1)`, and then generate write
                     only keys from those.
 
                     The keyfile name should be given as a string and not a path, to

nixos/modules/services/cluster/k3s/default.nix

···
     environmentFile = lib.mkOption {
       type = lib.types.nullOr lib.types.path;
       description = ''
-        File path containing environment variables for configuring the k3s service in the format of an EnvironmentFile. See systemd.exec(5).
+        File path containing environment variables for configuring the k3s service in the format of an EnvironmentFile. See {manpage}`systemd.exec(5)`.
       '';
       default = null;
     };

nixos/modules/services/hardware/libinput.nix

···
       default = null;
       example = "1 6 3 4 5 0 7";
       description = ''
-        Sets the logical button mapping for this device, see XSetPointerMapping(3). The string  must
+        Sets the logical button mapping for this device, see {manpage}`XSetPointerMapping(3)`. The string  must
         be  a  space-separated  list  of  button mappings in the order of the logical buttons on the
         device, starting with button 1.  The default mapping is "1 2 3 ... 32". A mapping of 0 deac‐
         tivates the button. Multiple buttons can have the same mapping.  Invalid mapping strings are

nixos/modules/services/hardware/thinkfan.nix

···
         ];
         description = ''
           A list of extra command line arguments to pass to thinkfan.
-          Check the thinkfan(1) manpage for available arguments.
+          Check the {manpage}`thinkfan(1)` manpage for available arguments.
         '';
       };
 
···
         description = ''
           Thinkfan settings. Use this option to configure thinkfan
           settings not exposed in a NixOS option or to bypass one.
-          Before changing this, read the `thinkfan.conf(5)`
+          Before changing this, read the `{manpage}`thinkfan.conf(5)``
           manpage and take a look at the example config file at
           <https://github.com/vmatare/thinkfan/blob/master/examples/thinkfan.yaml>
         '';

nixos/modules/services/hardware/upower.nix

···
           on or off. We can't do much to fix these problems, but this is a way
           for users to make the laptop panel vanish, a state that might be used
           by a couple of user-space daemons. On Linux systems, see also
-          logind.conf(5).
+          {manpage}`logind.conf(5)`.
         '';
       };
 

nixos/modules/services/home-automation/esphome.nix

···
       ];
       description = ''
         A list of device nodes to which {command}`esphome` has access to.
-        Refer to DeviceAllow in systemd.resource-control(5) for more information.
+        Refer to DeviceAllow in {manpage}`systemd.resource-control(5)` for more information.
         Beware that if a device is referred to by an absolute path instead of a device category,
         it will only allow devices that already are plugged in when the service is started.
       '';

nixos/modules/services/logging/journalwatch.nix

···
                   this patternBlock's {option}`filters` are applied.
                   If `value` starts and ends with a slash, it is interpreted as
                   an extended python regular expression, if not, it's an exact match.
-                  The journal fields are explained in systemd.journal-fields(7).
+                  The journal fields are explained in {manpage}`systemd.journal-fields(7)`.
                 '';
               };
 
···
         description = ''
           How often to run journalwatch.
 
-          The format is described in systemd.time(7).
+          The format is described in {manpage}`systemd.time(7)`.
         '';
       };
       accuracy = lib.mkOption {
···
         description = ''
           The time window around the interval in which the journalwatch run will be scheduled.
 
-          The format is described in systemd.time(7).
+          The format is described in {manpage}`systemd.time(7)`.
         '';
       };
     };

nixos/modules/services/logging/syslogd.nix

···
         type = lib.types.bool;
         default = false;
         description = ''
-          Accept logging through UDP. Option -r of syslogd(8).
+          Accept logging through UDP. Option -r of {manpage}`syslogd(8)`.
         '';
       };
 

nixos/modules/services/mail/clamsmtp.nix

···
                 default = "";
                 example = "X-Virus-Scanned: ClamAV using ClamSMTP";
                 description = ''
-                  A header to add to scanned messages. See clamsmtpd.conf(5) for
+                  A header to add to scanned messages. See {manpage}`clamsmtpd.conf(5)` for
                   more details. Empty means no header.
                 '';
               };
···
                 example = "127.0.0.1:10025";
                 description = ''
                   Address to wait for incoming SMTP connections on. See
-                  clamsmtpd.conf(5) for more details.
+                  {manpage}`clamsmtpd.conf(5)` for more details.
                 '';
               };
 
···
                 default = null;
                 description = ''
                   Command to run when a virus is found. Please see VIRUS ACTION in
-                  clamsmtpd(8) for a discussion of this option and its safe use.
+                  {manpage}`clamsmtpd(8)` for a discussion of this option and its safe use.
                 '';
               };
 

nixos/modules/services/mail/cyrus-imap.nix

···
       type = int;
       default = 32;
       description = ''
-        Socket listen queue backlog size. See listen(2) for more information about a backlog.
+        Socket listen queue backlog size. See {manpage}`listen(2)` for more information about a backlog.
         Default is 32, which may be increased if you have a very high connection rate.
       '';
     };
···
           DAEMON = mkOption {
             default = { };
             description = ''
-              This section lists long running daemons to start before any SERVICES are spawned. master(8) will ensure that these processes are running, restarting any process which dies or forks. All listed processes will be shutdown when master(8) is exiting.
+              This section lists long running daemons to start before any SERVICES are spawned. {manpage}`master(8)` will ensure that these processes are running, restarting any process which dies or forks. All listed processes will be shutdown when {manpage}`master(8)` is exiting.
             '';
           };
         };
···
             type = path;
             default = "/run/cyrus/lmtp";
             description = ''
-              Unix socket that lmtpd listens on, used by deliver(8). This should match the path specified in cyrus.conf(5).
+              Unix socket that lmtpd listens on, used by {manpage}`deliver(8)`. This should match the path specified in {manpage}`cyrus.conf(5)`.
             '';
           };
           idlesocket = mkOption {

nixos/modules/services/mail/offlineimap.nix

···
     onCalendar = lib.mkOption {
       type = lib.types.str;
       default = "*:0/3"; # every 3 minutes
-      description = "How often is offlineimap started. Default is '*:0/3' meaning every 3 minutes. See systemd.time(7) for more information about the format.";
+      description = "How often is offlineimap started. Default is '*:0/3' meaning every 3 minutes. See {manpage}`systemd.time(7)` for more information about the format.";
     };
 
     timeoutStartSec = lib.mkOption {
       type = lib.types.str;
       default = "120sec"; # Kill if still alive after 2 minutes
-      description = "How long waiting for offlineimap before killing it. Default is '120sec' meaning every 2 minutes. See systemd.time(7) for more information about the format.";
+      description = "How long waiting for offlineimap before killing it. Default is '120sec' meaning every 2 minutes. See {manpage}`systemd.time(7)` for more information about the format.";
     };
   };
   config = lib.mkIf (cfg.enable || cfg.install) {

nixos/modules/services/mail/opendkim.nix

···
         defaultText = lib.literalExpression ''"csl:''${config.networking.hostName}"'';
         example = "csl:example.com,mydomain.net";
         description = ''
-          Local domains set (see `opendkim(8)` for more information on datasets).
+          Local domains set (see {manpage}`opendkim(8)` for more information on datasets).
           Messages from them are signed, not verified.
         '';
       };

nixos/modules/services/mail/postfix.nix

···
         type = lib.types.lines;
         default = "";
         description = ''
-          Additional entries to put verbatim into aliases file, cf. man-page aliases(8).
+          Additional entries to put verbatim into aliases file, cf. man-page {manpage}`aliases(8)`.
         '';
       };
 
···
         type = lib.types.lines;
         default = "";
         description = ''
-          Entries for the virtual alias map, cf. man-page virtual(5).
+          Entries for the virtual alias map, cf. man-page {manpage}`virtual(5)`.
         '';
       };
 
···
           List of accepted local users. Specify a bare username, an
           `"@domain.tld"` wild-card, or a complete
           `"[e-mail]"` address. If set, these names end
-          up in the local recipient map -- see the local(8) man-page -- and
+          up in the local recipient map -- see the {manpage}`local(8)` man-page -- and
           effectively replace the system user database lookup that's otherwise
           used by default.
         '';
···
         default = "";
         type = lib.types.lines;
         description = ''
-          Entries for the transport map, cf. man-page transport(8).
+          Entries for the transport map, cf. man-page {manpage}`transport(8)`.
         '';
       };
 

nixos/modules/services/mail/postgrey.nix

···
       greylistAction = mkOption {
         type = str;
         default = "DEFER_IF_PERMIT";
-        description = "Response status for greylisted messages (see access(5))";
+        description = "Response status for greylisted messages (see {manpage}`access(5)`)";
       };
       greylistHeader = mkOption {
         type = str;
···
       whitelistClients = mkOption {
         type = listOf path;
         default = [ ];
-        description = "Client address whitelist files (see postgrey(8))";
+        description = "Client address whitelist files (see {manpage}`postgrey(8)`)";
       };
       whitelistRecipients = mkOption {
         type = listOf path;
         default = [ ];
-        description = "Recipient address whitelist files (see postgrey(8))";
+        description = "Recipient address whitelist files (see {manpage}`postgrey(8)`)";
       };
     };
   };

nixos/modules/services/misc/autofs.nix

···
           '''
         '';
         description = ''
-          Contents of `/etc/auto.master` file. See {command}`auto.master(5)` and {command}`autofs(5)`.
+          Contents of `/etc/auto.master` file. See {manpage}`auto.master(5)` and {manpage}`autofs(5)`.
         '';
       };
 

nixos/modules/services/misc/gpsd.nix

···
         ];
         description = ''
           A list of extra command line arguments to pass to gpsd.
-          Check gpsd(8) mangpage for possible arguments.
+          Check {manpage}`gpsd(8)` mangpage for possible arguments.
         '';
       };
 

nixos/modules/services/monitoring/prometheus/exporters/restic.nix

···
       default = null;
       description = ''
         File containing the credentials to access the repository, in the
-        format of an EnvironmentFile as described by systemd.exec(5)
+        format of an EnvironmentFile as described by {manpage}`systemd.exec(5)`
       '';
     };
 

nixos/modules/services/network-filesystems/cachefilesd.nix

···
         type = lib.types.lines;
         default = "";
         example = "brun 10%";
-        description = "Additional configuration file entries. See cachefilesd.conf(5) for more information.";
+        description = "Additional configuration file entries. See {manpage}`cachefilesd.conf(5)` for more information.";
       };
 
     };

nixos/modules/services/network-filesystems/openafs/client.nix

···
           });
         description = ''
           This cell's database server records, added to the global
-          CellServDB. See CellServDB(5) man page for syntax. Ignored when
+          CellServDB. See {manpage}`CellServDB(5)` man page for syntax. Ignored when
           `afsdb` is set to `true`.
         '';
         example = [

nixos/modules/services/network-filesystems/openafs/server.nix

···
       advertisedAddresses = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        description = "List of IP addresses this server is advertised under. See NetInfo(5)";
+        description = "List of IP addresses this server is advertised under. See {manpage}`NetInfo(5)`";
       };
 
       cellName = mkOption {

nixos/modules/services/networking/cgit.nix

···
               };
 
               repos = lib.mkOption {
-                description = "cgit repository settings, see cgitrc(5)";
+                description = "cgit repository settings, see {manpage}`cgitrc(5)`";
                 type = with lib.types; attrsOf (attrsOf settingType);
                 default = { };
                 example = {
···
               };
 
               settings = lib.mkOption {
-                description = "cgit configuration, see cgitrc(5)";
+                description = "cgit configuration, see {manpage}`cgitrc(5)`";
                 type = lib.types.attrsOf repeatedSettingType;
                 default = { };
                 example = lib.literalExpression ''

nixos/modules/services/networking/hylafax/options.nix

···
         will be symlinked to the location given here.
         This file must exist and be
         readable only by the `uucp` user.
-        See hosts.hfaxd(5) for details.
+        See {manpage}`hosts.hfaxd(5)` for details.
         This configuration permits access for all users:
         ```
           environment.etc."hosts.hfaxd" = {
···
       description = ''
         purging old files from the spooling area with
         {file}`faxcron` with the given frequency
-        (see systemd.time(7))
+        (see {manpage}`systemd.time(7)`)
       '';
     };
     faxcron.infoDays = mkOption {
···
       description = ''
         Purge old files from the spooling area with
         {file}`faxcron` with the given frequency
-        (see systemd.time(7)).
+        (see {manpage}`systemd.time(7)`).
       '';
     };
     faxqclean.archiving = mkOption {
···
         `as-flagged` archives jobs that
         have been flagged for archiving by sendfax,
         `always` forces archiving of all jobs.
-        See also sendfax(1) and faxqclean(8).
+        See also {manpage}`sendfax(1)` and {manpage}`faxqclean(8)`.
       '';
     };
     faxqclean.doneqMinutes = mkOption {

nixos/modules/services/networking/minidlna.nix

···
 
   options.services.minidlna.settings = lib.mkOption {
     default = {};
-    description = "Configuration for `minidlna.conf(5)`.";
+    description = "Configuration for {manpage}`minidlna.conf(5)`.";
     type = lib.types.submodule {
       freeformType = format.type;
 

nixos/modules/services/networking/ngircd.nix

···
       enable = mkEnableOption "the ngircd IRC server";
 
       config = mkOption {
-        description = "The ngircd configuration (see ngircd.conf(5)).";
+        description = "The ngircd configuration (see {manpage}`ngircd.conf(5)`).";
 
         type = types.lines;
       };

nixos/modules/services/networking/ntopng.nix

···
           interfaces and displays its findings at http://localhost:''${toString
           config.${opt.http-port}}. Default username and password is admin/admin.
 
-          See the ntopng(8) manual page and http://www.ntop.org/products/ntop/
+          See the {manpage}`ntopng(8)` manual page and http://www.ntop.org/products/ntop/
           for more info.
 
           Note that enabling ntopng will also enable redis (key-value

nixos/modules/services/networking/pppd.nix

···
                 config = mkOption {
                   type = types.lines;
                   default = "";
-                  description = "pppd configuration for this peer, see the pppd(8) man page.";
+                  description = "pppd configuration for this peer, see the {manpage}`pppd(8)` man page.";
                 };
               };
             }

nixos/modules/services/networking/privoxy.nix

···
         the disk usage, since Privoxy itself never deletes the certificates.
 
         ::: {.note}
-        The format is that of the `tmpfiles.d(5)`
+        The format is that of the {manpage}`tmpfiles.d(5)`
         Age parameter.
         :::
       '';

nixos/modules/services/networking/r53-ddns.nix

···
         type = types.str;
         description = ''
           File containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
-          in the format of an EnvironmentFile as described by systemd.exec(5)
+          in the format of an EnvironmentFile as described by {manpage}`systemd.exec(5)`
         '';
       };
 

nixos/modules/services/networking/robustirc-bridge.nix

···
       extraFlags = mkOption {
         type = types.listOf types.str;
         default = [];
-        description = ''Extra flags passed to the {command}`robustirc-bridge` command. See [RobustIRC Documentation](https://robustirc.net/docs/adminguide.html#_bridge) or robustirc-bridge(1) for details.'';
+        description = ''Extra flags passed to the {command}`robustirc-bridge` command. See [RobustIRC Documentation](https://robustirc.net/docs/adminguide.html#_bridge) or {manpage}`robustirc-bridge(1)` for details.'';
         example = [
           "-network robustirc.net"
         ];

nixos/modules/services/networking/rpcbind.nix

···
         description = ''
           Whether to enable `rpcbind`, an ONC RPC directory service
           notably used by NFS and NIS, and which can be queried
-          using the rpcinfo(1) command. `rpcbind` is a replacement for
+          using the {manpage}`rpcinfo(1)` command. `rpcbind` is a replacement for
           `portmap`.
         '';
       };

nixos/modules/services/networking/searx.nix

···
         type = types.nullOr types.path;
         default = null;
         description = ''
-          Environment file (see `systemd.exec(5)`
+          Environment file (see {manpage}`systemd.exec(5)`
           "EnvironmentFile=" section for the syntax) to define variables for
           Searx. This option can be used to safely include secret keys into the
           Searx configuration.

nixos/modules/services/networking/spacecookie.nix

···
         description = ''
           Address to listen on. Must be in the
           `ListenStream=` syntax of
-          [systemd.socket(5)](https://www.freedesktop.org/software/systemd/man/systemd.socket.html).
+          {manpage}`systemd.socket(5)`.
         '';
       };
 

nixos/modules/services/networking/ssh/sshd.nix

···
               type = lib.types.nullOr (lib.types.enum [ "QUIET" "FATAL" "ERROR" "INFO" "VERBOSE" "DEBUG" "DEBUG1" "DEBUG2" "DEBUG3" ]);
               default = "INFO"; # upstream default
               description = ''
-                Gives the verbosity level that is used when logging messages from sshd(8). Logging with a DEBUG level
+                Gives the verbosity level that is used when logging messages from {manpage}`sshd(8)`. Logging with a DEBUG level
                 violates the privacy of users and is not recommended.
               '';
             };
···
               # apply if cfg.useDns then "yes" else "no"
               default = false;
               description = ''
-                Specifies whether sshd(8) should look up the remote host name, and to check that the resolved host name for
+                Specifies whether {manpage}`sshd(8)` should look up the remote host name, and to check that the resolved host name for
                 the remote IP address maps back to the very same IP address.
                 If this option is set to no (the default) then only addresses and not host names may be used in
                 ~/.ssh/authorized_keys from and sshd_config Match Host directives.

nixos/modules/services/networking/tinydns.nix

···
       data = mkOption {
         type = types.lines;
         default = "";
-        description = "The DNS data to serve, in the format described by tinydns-data(8)";
+        description = "The DNS data to serve, in the format described by {manpage}`tinydns-data(8)`";
       };
 
       ip = mkOption {

nixos/modules/services/security/clamav.nix

···
           type = lib.types.str;
           default = "hourly";
           description = ''
-            How often freshclam is invoked. See systemd.time(7) for more
+            How often freshclam is invoked. See {manpage}`systemd.time(7)` for more
             information about the format.
           '';
         };
···
           type = lib.types.str;
           default = "hourly";
           description = ''
-            How often freshclam is invoked. See systemd.time(7) for more
+            How often freshclam is invoked. See {manpage}`systemd.time(7)` for more
             information about the format.
           '';
         };
···
           type = lib.types.str;
           default = "*-*-* 04:00:00";
           description = ''
-            How often clamdscan is invoked. See systemd.time(7) for more
+            How often clamdscan is invoked. See {manpage}`systemd.time(7)` for more
             information about the format.
             By default this runs using 10 cores at most, be sure to run it at a time of low traffic.
           '';

nixos/modules/services/torrent/transmission.nix

···
               defaultText = literalExpression "if cfg.package == pkgs.transmission_3 then 18 else \"022\"";
               description = ''
                 Sets transmission's file mode creation mask.
-                See the umask(2) manpage for more information.
+                See the {manpage}`umask(2)` manpage for more information.
                 Users who want their saved torrents to be world-writable
                 may want to set this value to 0/`"000"`.
 

nixos/modules/services/web-apps/cloudlog.nix

···
         type = str;
         default = "daily";
         description = ''
-          Specification (in the format described by systemd.time(7)) of the
+          Specification (in the format described by {manpage}`systemd.time(7)`) of the
           time at which the LoTW upload will occur.
         '';
       };
···
         type = str;
         default = "daily";
         description = ''
-          Specification (in the format described by systemd.time(7)) of the time
+          Specification (in the format described by {manpage}`systemd.time(7)`) of the time
           at which the Clublog upload will occur.
         '';
       };
···
         type = str;
         default = "weekly";
         description = ''
-          Specification (in the format described by systemd.time(7)) of the
+          Specification (in the format described by {manpage}`systemd.time(7)`) of the
           time at which the LoTW user update will occur.
         '';
       };
···
         type = str;
         default = "monthly";
         description = ''
-          Specification (in the format described by systemd.time(7)) of the
+          Specification (in the format described by {manpage}`systemd.time(7)`) of the
           time at which the DOK update will occur.
         '';
       };
···
         type = str;
         default = "monthly";
         description = ''
-          Specification (in the format described by systemd.time(7)) of the time
+          Specification (in the format described by {manpage}`systemd.time(7)`) of the time
           at which the Clublog SCP update will occur.
         '';
       };
···
         type = str;
         default = "monthly";
         description = ''
-          Specification (in the format described by systemd.time(7)) of the time
+          Specification (in the format described by {manpage}`systemd.time(7)`) of the time
           at which the WWFF update will occur.
         '';
       };
···
         type = str;
         default = "daily";
         description = ''
-          Specification (in the format described by systemd.time(7)) of the
+          Specification (in the format described by {manpage}`systemd.time(7)`) of the
           time at which the QRZ upload will occur.
         '';
       };
···
         type = str;
         default = "monthly";
         description = ''
-          Specification (in the format described by systemd.time(7)) of the time
+          Specification (in the format described by {manpage}`systemd.time(7)`) of the time
           at which the SOTA update will occur.
         '';
       };

nixos/modules/services/web-apps/dex.nix

···
       type = types.nullOr types.path;
       default = null;
       description = ''
-        Environment file (see `systemd.exec(5)`
+        Environment file (see {manpage}`systemd.exec(5)`
         "EnvironmentFile=" section for the syntax) to define variables for dex.
         This option can be used to safely include secret keys into the dex configuration.
       '';

nixos/modules/services/web-apps/gotosocial.nix

···
       type = lib.types.nullOr lib.types.path;
       description = ''
         File path containing environment variables for configuring the GoToSocial service
-        in the format of an EnvironmentFile as described by systemd.exec(5).
+        in the format of an EnvironmentFile as described by {manpage}`systemd.exec(5)`.
 
         This option could be used to pass sensitive configuration to the GoToSocial daemon.
 

nixos/modules/services/web-apps/miniflux.nix

···
         description = ''
           File containing the ADMIN_USERNAME and
           ADMIN_PASSWORD (length >= 6) in the format of
-          an EnvironmentFile=, as described by systemd.exec(5).
+          an EnvironmentFile=, as described by {manpage}`systemd.exec(5)`.
         '';
         example = "/etc/nixos/miniflux-admin-credentials";
       };

nixos/modules/services/web-apps/pds.nix

···
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+let
+  cfg = config.services.pds;
+
+  inherit (lib)
+    getExe
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    escapeShellArgs
+    concatMapStringsSep
+    types
+    literalExpression
+    ;
+
+  pdsadminWrapper =
+    let
+      cfgSystemd = config.systemd.services.pds.serviceConfig;
+    in
+    pkgs.writeShellScriptBin "pdsadmin" ''
+      DUMMY_PDS_ENV_FILE="$(mktemp)"
+      trap 'rm -f "$DUMMY_PDS_ENV_FILE"' EXIT
+      env "PDS_ENV_FILE=$DUMMY_PDS_ENV_FILE"                                                   \
+          ${escapeShellArgs cfgSystemd.Environment}                                            \
+          ${concatMapStringsSep " " (envFile: "$(cat ${envFile})") cfgSystemd.EnvironmentFile} \
+          ${getExe pkgs.pdsadmin} "$@"
+    '';
+in
+# All defaults are from https://github.com/bluesky-social/pds/blob/8b9fc24cec5f30066b0d0b86d2b0ba3d66c2b532/installer.sh
+{
+  options.services.pds = {
+    enable = mkEnableOption "pds";
+
+    package = mkPackageOption pkgs "pds" { };
+
+    settings = mkOption {
+      type = types.submodule {
+        freeformType = types.attrsOf (
+          types.oneOf [
+            (types.nullOr types.str)
+            types.port
+          ]
+        );
+        options = {
+          PDS_PORT = mkOption {
+            type = types.port;
+            default = 3000;
+            description = "Port to listen on";
+          };
+
+          PDS_HOSTNAME = mkOption {
+            type = types.str;
+            example = "pds.example.com";
+            description = "Instance hostname (base domain name)";
+          };
+
+          PDS_BLOB_UPLOAD_LIMIT = mkOption {
+            type = types.str;
+            default = "52428800";
+            description = "Size limit of uploaded blobs in bytes";
+          };
+
+          PDS_DID_PLC_URL = mkOption {
+            type = types.str;
+            default = "https://plc.directory";
+            description = "URL of DID PLC directory";
+          };
+
+          PDS_BSKY_APP_VIEW_URL = mkOption {
+            type = types.str;
+            default = "https://api.bsky.app";
+            description = "URL of bsky frontend";
+          };
+
+          PDS_BSKY_APP_VIEW_DID = mkOption {
+            type = types.str;
+            default = "did:web:api.bsky.app";
+            description = "DID of bsky frontend";
+          };
+
+          PDS_REPORT_SERVICE_URL = mkOption {
+            type = types.str;
+            default = "https://mod.bsky.app";
+            description = "URL of mod service";
+          };
+
+          PDS_REPORT_SERVICE_DID = mkOption {
+            type = types.str;
+            default = "did:plc:ar7c4by46qjdydhdevvrndac";
+            description = "DID of mod service";
+          };
+
+          PDS_CRAWLERS = mkOption {
+            type = types.str;
+            default = "https://bsky.network";
+            description = "URL of crawlers";
+          };
+
+          PDS_DATA_DIRECTORY = mkOption {
+            type = types.str;
+            default = "/var/lib/pds";
+            description = "Directory to store state";
+          };
+
+          PDS_BLOBSTORE_DISK_LOCATION = mkOption {
+            type = types.nullOr types.str;
+            default = "/var/lib/pds/blocks";
+            description = "Store blobs at this location, set to null to use e.g. S3";
+          };
+
+          LOG_ENABLED = mkOption {
+            type = types.nullOr types.str;
+            default = "true";
+            description = "Enable logging";
+          };
+        };
+      };
+
+      description = ''
+        Environment variables to set for the service. Secrets should be
+        specified using {option}`environmentFile`.
+
+        Refer to <https://github.com/bluesky-social/atproto/blob/main/packages/pds/src/config/env.ts> for available environment variables.
+      '';
+    };
+
+    environmentFiles = mkOption {
+      type = types.listOf types.path;
+      default = [ ];
+      description = ''
+        File to load environment variables from. Loaded variables override
+        values set in {option}`environment`.
+
+        Use it to set values of `PDS_JWT_SECRET`, `PDS_ADMIN_PASSWORD`,
+        and `PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX` secrets.
+        `PDS_JWT_SECRET` and `PDS_ADMIN_PASSWORD` can be generated with
+        ```
+        openssl rand --hex 16
+        ```
+        `PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX` can be generated with
+        ```
+        openssl ecparam --name secp256k1 --genkey --noout --outform DER | tail --bytes=+8 | head --bytes=32 | xxd --plain --cols 32
+        ```
+      '';
+    };
+
+    pdsadmin = {
+      enable = mkOption {
+        type = types.bool;
+        default = cfg.enable;
+        defaultText = literalExpression "config.services.pds.enable";
+        description = "Add pdsadmin script to PATH";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment = mkIf cfg.pdsadmin.enable {
+      systemPackages = [ pdsadminWrapper ];
+    };
+
+    systemd.services.pds = {
+      description = "pds";
+
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = getExe cfg.package;
+        Environment = lib.mapAttrsToList (k: v: "${k}=${if builtins.isInt v then toString v else v}") (
+          lib.filterAttrs (_: v: v != null) cfg.settings
+        );
+
+        EnvironmentFile = cfg.environmentFiles;
+        User = "pds";
+        Group = "pds";
+        StateDirectory = "pds";
+        StateDirectoryMode = "0755";
+        Restart = "always";
+
+        # Hardening
+        RemoveIPC = true;
+        CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        ProtectClock = true;
+        ProtectKernelLogs = true;
+        ProtectControlGroups = true;
+        ProtectKernelModules = true;
+        PrivateMounts = true;
+        SystemCallArchitectures = [ "native" ];
+        MemoryDenyWriteExecute = false; # required by V8 JIT
+        RestrictNamespaces = true;
+        RestrictSUIDSGID = true;
+        ProtectHostname = true;
+        LockPersonality = true;
+        ProtectKernelTunables = true;
+        RestrictAddressFamilies = [
+          "AF_UNIX"
+          "AF_INET"
+          "AF_INET6"
+        ];
+        RestrictRealtime = true;
+        DeviceAllow = [ "" ];
+        ProtectSystem = "strict";
+        ProtectProc = "invisible";
+        ProcSubset = "pid";
+        ProtectHome = true;
+        PrivateUsers = true;
+        PrivateTmp = true;
+        UMask = "0077";
+      };
+    };
+
+    users = {
+      users.pds = {
+        group = "pds";
+        isSystemUser = true;
+      };
+      groups.pds = { };
+    };
+
+  };
+
+  meta.maintainers = with lib.maintainers; [ t4ccer ];
+}

nixos/modules/services/web-servers/merecat.nix

···
       inherit (format) type;
       default = { };
       description = ''
-        Merecat configuration. Refer to merecat(8) for details on supported values.
+        Merecat configuration. Refer to {manpage}`merecat(8)` for details on supported values.
       '';
       example = {
         hostname = "localhost";

nixos/modules/services/web-servers/minio.nix

···
       description = ''
         File containing the MINIO_ROOT_USER, default is "minioadmin", and
         MINIO_ROOT_PASSWORD (length >= 8), default is "minioadmin"; in the format of
-        an EnvironmentFile=, as described by systemd.exec(5).
+        an EnvironmentFile=, as described by {manpage}`systemd.exec(5)`.
       '';
       example = "/etc/nixos/minio-root-credentials";
     };

nixos/modules/services/web-servers/pomerium.nix

···
       default = null;
       description = ''
         Path to file containing secrets for Pomerium, in systemd
-        EnvironmentFile format. See the systemd.exec(5) man page.
+        EnvironmentFile format. See the {manpage}`systemd.exec(5)` man page.
       '';
     };
   };

nixos/modules/services/web-servers/uwsgi.nix

···
         '';
         description = ''
           Grant capabilities to the uWSGI instance. See the
-          `capabilities(7)` for available values.
+          {manpage}`capabilities(7)` for available values.
 
           ::: {.note}
           uWSGI runs as an unprivileged user (even as Emperor) with the minimal

nixos/modules/services/x11/display-managers/startx.nix

···
           which allows users to start X manually via the "startx" command
           from a vt shell. The X server runs under the user's id, not as root.
           The user must provide a ~/.xinitrc file containing session startup
-          commands, see startx(1). This is not automatically generated
+          commands, see {manpage}`startx(1)`. This is not automatically generated
           from the desktopManager and windowManager settings.
         '';
       };

nixos/modules/services/x11/display-managers/sx.nix

···
           to start manually via the "sx" command from a vt shell. The X server
           runs under the user's id, not as root. The user must provide a
           ~/.config/sx/sxrc file containing session startup commands, see
-          sx(1). This is not automatically generated from the desktopManager
+          {manpage}`sx(1)`. This is not automatically generated from the desktopManager
           and windowManager settings. sx doesn't have a way to directly set
           X server flags, but it can be done by overriding its xorgserver
           dependency.

nixos/modules/services/x11/picom.nix

···
       ];
       description = ''
         List of conditions of windows that should not be faded.
-        See `picom(1)` man page for more examples.
+        See {manpage}`picom(1)` man page for more examples.
       '';
     };
 
···
       ];
       description = ''
         List of conditions of windows that should have no shadow.
-        See `picom(1)` man page for more examples.
+        See {manpage}`picom(1)` man page for more examples.
       '';
     };
 
···
         description = ''
           Picom settings. Use this option to configure Picom settings not exposed
           in a NixOS option or to bypass one.  For the available options see the
-          CONFIGURATION FILES section at `picom(1)`.
+          CONFIGURATION FILES section at {manpage}`picom(1)`.
         '';
       };
   };

nixos/modules/system/activation/activation-script.nix

···
       type = types.nullOr types.path;
       visible = false;
       description = ''
-        The env(1) executable that is linked system-wide to
+        The {manpage}`env(1)` executable that is linked system-wide to
         `/usr/bin/env`.
       '';
     };

nixos/modules/system/boot/systemd/coredump.nix

···
       type = types.lines;
       example = "Storage=journal";
       description = ''
-        Extra config options for systemd-coredump. See coredump.conf(5) man page
+        Extra config options for systemd-coredump. See {manpage}`coredump.conf(5)` man page
         for available options.
       '';
     };

nixos/modules/system/boot/systemd/initrd.nix

···
       type = types.lines;
       example = "DefaultLimitCORE=infinity";
       description = ''
-        Extra config options for systemd. See systemd-system.conf(5) man page
+        Extra config options for systemd. See {manpage}`systemd-system.conf(5)` man page
         for available options.
       '';
     };

nixos/modules/system/boot/systemd/logind.nix

···
       example = "IdleAction=lock";
       description = ''
         Extra config options for systemd-logind.
-        See [logind.conf(5)](https://www.freedesktop.org/software/systemd/man/logind.conf.html)
+        See {manpage}`logind.conf(5)`
         for available options.
       '';
     };

nixos/modules/system/boot/timesyncd.nix

···
           `timesyncd.conf` file as opposed to setting this option to null which
           will remove `NTP=` entirely.
 
-          See man:timesyncd.conf(5) for details.
+          See {manpage}`timesyncd.conf(5)` for details.
         '';
       };
       fallbackServers = mkOption {
···
           `timesyncd.conf` file as opposed to setting this option to null which
           will remove `FallbackNTP=` entirely.
 
-          See man:timesyncd.conf(5) for details.
+          See {manpage}`timesyncd.conf(5)` for details.
         '';
       };
       extraConfig = mkOption {

nixos/modules/tasks/filesystems/nfs.nix

···
         default = { };
         description = ''
           General configuration for NFS daemons and tools.
-          See nfs.conf(5) and related man pages for details.
+          See {manpage}`nfs.conf(5)` and related man pages for details.
         '';
         example = lib.literalExpression ''
           {

nixos/modules/tasks/network-interfaces.nix

···
         default = null;
         description = ''
           Type of the route.  See the `Route types` section
-          in the `ip-route(8)` manual page for the details.
+          in the {manpage}`ip-route(8)` manual page for the details.
 
           Note that `prohibit`, `blackhole`,
           `unreachable`, and `throw` cannot
···
         example = { mtu = "1492"; window = "524288"; };
         description = ''
           Other route options. See the symbol `OPTIONS`
-          in the `ip-route(8)` manual page for the details.
+          in the {manpage}`ip-route(8)` manual page for the details.
           You may also specify `metric`,
           `src`, `protocol`,
           `scope`, `from`

nixos/modules/virtualisation/docker.nix

···
         default = ["/run/docker.sock"];
         description = ''
             A list of unix and tcp docker should listen to. The format follows
-            ListenStream as described in systemd.socket(5).
+            ListenStream as described in {manpage}`systemd.socket(5)`.
           '';
       };
 

nixos/modules/virtualisation/nixos-containers.nix

···
           Device node access modifier. Takes a combination
           `r` (read), `w` (write), and
           `m` (mknod). See the
-          `systemd.resource-control(5)` man page for more
+          {manpage}`systemd.resource-control(5)` man page for more
           information.'';
       };
     };
···
               example = [ "CAP_NET_ADMIN" "CAP_MKNOD" ];
               description = ''
                 Grant additional capabilities to the container.  See the
-                capabilities(7) and systemd-nspawn(1) man pages for more
+                {manpage}`capabilities(7)` and {manpage}`systemd-nspawn(1)` man pages for more
                 information.
               '';
             };
···
                 shall run in. The specified path should refer to a (possibly bind-mounted) network
                 namespace file, as exposed by the kernel below /proc/<PID>/ns/net. This makes the
                 container enter the given network namespace. One of the typical use cases is to give
-                a network namespace under /run/netns created by ip-netns(8).
+                a network namespace under /run/netns created by {manpage}`ip-netns(8)`.
                 Note that this option cannot be used together with other network-related options,
                 such as --private-network or --network-interface=.
               '';
···
                 Mounts a set of tmpfs file systems into the container.
                 Multiple paths can be specified.
                 Valid items must conform to the --tmpfs argument
-                of systemd-nspawn. See systemd-nspawn(1) for details.
+                of systemd-nspawn. See {manpage}`systemd-nspawn(1)` for details.
               '';
             };
 
···
               example = [ "--drop-capability=CAP_SYS_CHROOT" ];
               description = ''
                 Extra flags passed to the systemd-nspawn command.
-                See systemd-nspawn(1) for details.
+                See {manpage}`systemd-nspawn(1)` for details.
               '';
             };
 

nixos/modules/virtualisation/oci-containers.nix

···
             [Docker engine documentation](https://docs.docker.com/engine/logging/configure/)
 
             For Podman:
-            Refer to the docker-run(1) man page.
+            Refer to the {manpage}`docker-run(1)` man page.
           '';
         };
 

nixos/modules/virtualisation/waagent.nix

···
           ];
           description = ''
             This option specifies disk mount options to be passed to the `mount -o` command.
-            For more information, see the `mount(8)` manual page.
+            For more information, see the {manpage}`mount(8)` manual page.
           '';
         };
 

nixos/tests/all-tests.nix

···
   parsedmarc = handleTest ./parsedmarc {};
   password-option-override-ordering = handleTest ./password-option-override-ordering.nix {};
   pdns-recursor = handleTest ./pdns-recursor.nix {};
+  pds = handleTest ./pds.nix {};
   peerflix = handleTest ./peerflix.nix {};
   peering-manager = handleTest ./web-apps/peering-manager.nix {};
   peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {};

nixos/tests/pds.nix

···
+import ./make-test-python.nix (
+  { lib, ... }:
+  {
+    name = "PDS";
+
+    nodes.machine = {
+      services.pds = {
+        enable = true;
+        settings = {
+          PDS_PORT = 3000;
+          PDS_HOSTNAME = "example.com";
+
+          # Snake oil testing credentials
+          PDS_JWT_SECRET = "7b93fee53be046bf59c27a32a0fb2069";
+          PDS_ADMIN_PASSWORD = "3a4077bc0d5f04eca945ef0509f7e809";
+          PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX = "ae4f5028d04c833ba630f29debd5ff80b7700e43e9f4bf70f729a88cd6a6ce35";
+        };
+      };
+    };
+
+    testScript = ''
+      machine.wait_for_unit("pds.service")
+      machine.wait_for_open_port(3000)
+      machine.succeed("curl --fail http://localhost:3000")
+    '';
+
+    meta.maintainers = with lib.maintainers; [ t4ccer ];
+  }
+)

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

···
     meta.homepage = "https://github.com/Saghen/blink.compat/";
   };
 
+  blink-copilot = buildVimPlugin {
+    pname = "blink-copilot";
+    version = "2025-01-27";
+    src = fetchFromGitHub {
+      owner = "fang2hou";
+      repo = "blink-copilot";
+      rev = "7e63f20b8e96191e5c87bf96fc35da3547993be2";
+      sha256 = "10lm90xa7w3ww94acivshnzkp4q2bfrq9zff2z5amrp3cxlga0rf";
+    };
+    meta.homepage = "https://github.com/fang2hou/blink-copilot/";
+  };
+
   blink-emoji-nvim = buildVimPlugin {
     pname = "blink-emoji.nvim";
     version = "2025-01-04";

pkgs/applications/editors/vim/plugins/vim-plugin-names

···
 https://github.com/LunarVim/bigfile.nvim/,,
 https://github.com/APZelos/blamer.nvim/,HEAD,
 https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD,
+https://github.com/fang2hou/blink-copilot/,HEAD,
 https://github.com/moyiz/blink-emoji.nvim/,HEAD,
 https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD,
 https://github.com/Saghen/blink.compat/,HEAD,

pkgs/applications/emulators/cdemu/vhba.nix

···
   stdenv,
   fetchurl,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
     hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg=";
   };
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"
   ];

pkgs/applications/misc/ArchiSteamFarm/default.nix

···
 buildDotnetModule rec {
   pname = "ArchiSteamFarm";
   # nixpkgs-update: no auto update
-  version = "6.1.0.3";
+  version = "6.1.1.3";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
     repo = "ArchiSteamFarm";
     rev = version;
-    hash = "sha256-3NOeKdXb1tz4qx+tCs6QKfze2KLfyodKwt/aNx6tLvI=";
+    hash = "sha256-e0LzM0N5N7BHyQDRQIPziQrAilJN1aUttKyLod/T8rU=";
   };
 
   dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;

pkgs/applications/misc/ArchiSteamFarm/deps.json

···
   },
   {
     "pname": "Markdig.Signed",
-    "version": "0.38.0",
-    "hash": "sha256-yhO/GFoKdE/Z9SZPyGFe7DlnSd8dcAohqJNFqSqKLnk="
+    "version": "0.39.1",
+    "hash": "sha256-jofkP6JUp4xuUjJ6B6+HDfBJ3+V2vgECt2CWmFq62k4="
   },
   {
     "pname": "Microsoft.ApplicationInsights",
···
   },
   {
     "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator",
-    "version": "3.11.0-beta1.24508.2",
-    "hash": "sha256-TpqR8oedeRXdPxwhesXwWU+FimbVcj1+WThE3iQe+zo="
+    "version": "3.11.0-beta1.24527.2",
+    "hash": "sha256-NVqJ5cRa9G+ilWKazOTA8Xfm6ExOPpst8HMIFBC1/BU="
   },
   {
     "pname": "Microsoft.CodeCoverage",
-    "version": "17.11.1",
-    "hash": "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="
+    "version": "17.12.0",
+    "hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE="
   },
   {
     "pname": "Microsoft.Extensions.ApiDescription.Server",
···
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
-    "version": "17.11.1",
-    "hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="
+    "version": "17.12.0",
+    "hash": "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
···
   },
   {
     "pname": "Microsoft.Testing.Extensions.Telemetry",
-    "version": "1.4.3",
-    "hash": "sha256-oZ+AsyGdjWDoYx+nkveuniU4yB1DZ3bjgOgnucEtbnc="
+    "version": "1.5.0",
+    "hash": "sha256-aKKGFpsp88Yy29GLbWRWnEil2M2WEHjRXZ62Q8x5QRQ="
   },
   {
     "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
-    "version": "1.4.3",
-    "hash": "sha256-Q3E2sfTL6VvuK1X2JQsNqUTS9AtpnH9mf2aXMj09bz8="
+    "version": "1.5.0",
+    "hash": "sha256-oiePvWpZMkT2AnEpfzWgvaXJai6crgHdoUSMZct3JB0="
   },
   {
     "pname": "Microsoft.Testing.Extensions.VSTestBridge",
-    "version": "1.4.3",
-    "hash": "sha256-Sjx7GBgLYtX0nmjmViZHWVHwIZnL8aj+ivDK58GbA8k="
+    "version": "1.5.0",
+    "hash": "sha256-XauIF+r05RDgORsnxEp6Cq0WZjLycJ1hPH79QUi/SgM="
   },
   {
     "pname": "Microsoft.Testing.Platform",
-    "version": "1.4.3",
-    "hash": "sha256-KqB3+uBGl0edpaGl6Qykubb3OrVTs6IcPWc59UQ/Iww="
+    "version": "1.5.0",
+    "hash": "sha256-67ZNhvMifCIM7SFnwDN25EanRNKsjAFQWugrrYWAkrM="
   },
   {
     "pname": "Microsoft.Testing.Platform.MSBuild",
-    "version": "1.4.3",
-    "hash": "sha256-289hhblU55kDvzbiSQAFSxOyht1MlXT4e+bEQyQqils="
+    "version": "1.5.0",
+    "hash": "sha256-nJ5fv8MwFw2PeJIZA9qKLfGPWYKmHww1CtVFICz6S00="
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.11.1",
-    "hash": "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="
+    "version": "17.12.0",
+    "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w="
   },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "17.11.1",
-    "hash": "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="
+    "version": "17.12.0",
+    "hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I="
   },
   {
     "pname": "Microsoft.Win32.Registry",
···
   },
   {
     "pname": "MSTest",
-    "version": "3.6.4",
-    "hash": "sha256-G7I371Rq+AQ+QmHbZ9/wOduj0Yfoa6rFxmvygf7Kol4="
+    "version": "3.7.0",
+    "hash": "sha256-z302okYPT36ebQhReEihire5fyig5pLkrx09nLyVuME="
   },
   {
     "pname": "MSTest.Analyzers",
-    "version": "3.6.4",
-    "hash": "sha256-jlr8GVhTw32ErLq6YEMA4+EpWL5UO/q9I/BT9TDixK4="
+    "version": "3.7.0",
+    "hash": "sha256-TVMFle7oE2ZU6U+VkJ0G9iNjJxnRU4rDIJCtZFwDhz0="
   },
   {
     "pname": "MSTest.TestAdapter",
-    "version": "3.6.4",
-    "hash": "sha256-ymaeH9pYE8O1ChlfJ4hvpV9KP9eVJCEm4xhGHngapQY="
+    "version": "3.7.0",
+    "hash": "sha256-b6JCu2yyZmTZwZVd4MHaIwa01eQGWpFd8mNzHUBS6Tg="
   },
   {
     "pname": "MSTest.TestFramework",
-    "version": "3.6.4",
-    "hash": "sha256-paCBVA5XtiAB8OwkbJSbw7v+HvTFLN9qHRgvQaeJKC0="
+    "version": "3.7.0",
+    "hash": "sha256-fIHwuc/zimd8oxvTiA3gmUzmJAj7JsQYh9IOb8NRJ/Y="
   },
   {
     "pname": "Newtonsoft.Json",
···
     "hash": "sha256-ZSpQFnNgkk3dO8Q7yokJ/VSl4wp5PuIv9nduxgC6UxU="
   },
   {
-    "pname": "OpenTelemetry.Api",
-    "version": "1.9.0",
-    "hash": "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="
-  },
-  {
     "pname": "OpenTelemetry.Api.ProviderBuilderExtensions",
     "version": "1.10.0",
     "hash": "sha256-hLw3Sf1fviAlVJYhaMudVJEdG5pjX5JvVrqv9DgYAk8="
···
   },
   {
     "pname": "OpenTelemetry.Instrumentation.AspNetCore",
-    "version": "1.9.0",
-    "hash": "sha256-XYqa7kV4rhHPCgHsjQtMvyKCemW1OvQd/23QhjquYR4="
+    "version": "1.10.1",
+    "hash": "sha256-HqMFDpFsMaPlgyFt1MU3Un+BysEoj5qPc8HVxTlt0mE="
   },
   {
     "pname": "OpenTelemetry.Instrumentation.Http",
···
   },
   {
     "pname": "OpenTelemetry.Instrumentation.Runtime",
-    "version": "1.9.0",
-    "hash": "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="
+    "version": "1.10.0",
+    "hash": "sha256-cCTYKxHh1Qzu8X51B8gGsrxwKhVSqJfiql/+o4TWrwg="
   },
   {
     "pname": "protobuf-net",
···
   },
   {
     "pname": "Swashbuckle.AspNetCore",
-    "version": "7.1.0",
-    "hash": "sha256-4puaFKTRLJtqy/bjcxr5JJuZ/Ko7MDw7MrxISHl002A="
+    "version": "7.2.0",
+    "hash": "sha256-u1eg4GmYjaJAZdstRVvaTfGKnFRFLaxONhbOyiBKn5Y="
   },
   {
     "pname": "Swashbuckle.AspNetCore.Annotations",
-    "version": "7.1.0",
-    "hash": "sha256-4hD7FqfXeVySSRzLhZ2RSGEUdLjJRc4fqZIgAl5xjIA="
+    "version": "7.2.0",
+    "hash": "sha256-zsg29If2aWbFK8tIpu60YBbD1i8vvGPupiAjcXCq0l0="
   },
   {
     "pname": "Swashbuckle.AspNetCore.Swagger",
-    "version": "7.1.0",
-    "hash": "sha256-xxekkBO9brFYO0oId6OQVXdv5nXGjpwR3ZEcGe6rr0Q="
+    "version": "7.2.0",
+    "hash": "sha256-v0wp8/2prWFZhHm+T7onPh2sZNY+YjnLik1b1MLaaos="
   },
   {
     "pname": "Swashbuckle.AspNetCore.SwaggerGen",
-    "version": "7.1.0",
-    "hash": "sha256-4Gm9yxjueSeGFaedV8ncy+jtDwjFBVChpqCCK8E+qfY="
+    "version": "7.2.0",
+    "hash": "sha256-zxxaHyHFPj3T8756QyaH9h+BkuUoV0xxKnbZUxnI8WU="
   },
   {
     "pname": "Swashbuckle.AspNetCore.SwaggerUI",
-    "version": "7.1.0",
-    "hash": "sha256-br975EeG6O2fwyk8cFcjU/JkYrI35ZkqHm94j3qM5Cg="
+    "version": "7.2.0",
+    "hash": "sha256-EwJsqa4JBJhMzq+zgND3STyoZi1+6GaVQqXz3ZVP7p8="
   },
   {
     "pname": "System.Collections.Immutable",
···
     "pname": "System.Diagnostics.DiagnosticSource",
     "version": "5.0.0",
     "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="
-  },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "8.0.0",
-    "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",

pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix

···
 
 buildNpmPackage rec {
   pname = "asf-ui";
-  version = "c316254ddaf7837e7d43145268b53f91f23027dc";
+  version = "6be24065cd4904389d94140f4ed1f6738b1f7fbb";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
···
     # updated by the update script
     # this is always the commit that should be used with asf-ui from the latest asf version
     rev = version;
-    hash = "sha256-teM8x1/O5QFO7bMGc474Dp9ssOLfdmYkDt7PIuvJ4Ss=";
+    hash = "sha256-DFl+DCNj4JFKZG1awX5rlsHzj+67OFyBj9d16zDiKRA=";
   };
 
-  npmDepsHash = "sha256-8KqIUSWaeu5Tk8lw8F1O6KkXUfNqvjgxRNCePEMeLDo=";
+  npmDepsHash = "sha256-jZSiWZDckfGfgrBMHTX/sm7Pcl5ap3lfmwGi8SHXqu8=";
 
   installPhase = ''
     runHook preInstall

pkgs/applications/misc/golden-cheetah/default.nix

···
-{
-  lib,
-  fetchFromGitHub,
-  nix-update-script,
-  mkDerivation,
-  qtbase,
-  qtsvg,
-  qtserialport,
-  qtwebengine,
-  qtmultimedia,
-  qttools,
-  qtconnectivity,
-  qtcharts,
-  libusb-compat-0_1,
-  gsl,
-  blas,
-  bison,
-  flex,
-  zlib,
-  qmake,
-  makeDesktopItem,
-  wrapQtAppsHook,
-}:
-
-let
-  desktopItem = makeDesktopItem {
-    name = "goldencheetah";
-    exec = "GoldenCheetah";
-    icon = "goldencheetah";
-    desktopName = "GoldenCheetah";
-    genericName = "GoldenCheetah";
-    comment = "Performance software for cyclists, runners and triathletes";
-    categories = [ "Utility" ];
-  };
-in
-mkDerivation rec {
-  pname = "golden-cheetah";
-  version = "3.7-DEV2408";
-
-  src = fetchFromGitHub {
-    owner = "GoldenCheetah";
-    repo = "GoldenCheetah";
-    tag = "v${version}";
-    hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c=";
-  };
-
-  buildInputs = [
-    qtbase
-    qtsvg
-    qtserialport
-    qtwebengine
-    qtmultimedia
-    qttools
-    zlib
-    qtconnectivity
-    qtcharts
-    libusb-compat-0_1
-    gsl
-    blas
-  ];
-  nativeBuildInputs = [
-    flex
-    wrapQtAppsHook
-    qmake
-    bison
-  ];
-
-  patches = [
-    # allow building with bison 3.7
-    # Included in https://github.com/GoldenCheetah/GoldenCheetah/pull/3590,
-    # which is periodically rebased but pre 3.6 release, as it'll break other CI systems
-    ./0001-Fix-building-with-bison-3.7.patch
-  ];
-
-  NIX_LDFLAGS = "-lz -lgsl -lblas";
-
-  qtWrapperArgs = [
-    "--prefix"
-    "LD_LIBRARY_PATH"
-    ":"
-    "${zlib.out}/lib"
-  ];
-
-  preConfigure = ''
-    cp src/gcconfig.pri.in src/gcconfig.pri
-    cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
-    sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease,' src/gcconfig.pri
-    sed -i 's,^#LIBUSB_INSTALL.*,LIBUSB_INSTALL = ${libusb-compat-0_1},' src/gcconfig.pri
-    sed -i 's,^#LIBUSB_INCLUDE.*,LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include,' src/gcconfig.pri
-    sed -i 's,^#LIBUSB_LIBS.*,LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb,' src/gcconfig.pri
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp src/GoldenCheetah $out/bin
-    install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/
-    install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens";
-    mainProgram = "GoldenCheetah";
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ adamcstephens ];
-    license = lib.licenses.gpl2Plus;
-  };
-}

pkgs/build-support/fetchurl/builder.sh

···
     --location
     --max-redirs 20
     --retry 3
+    --retry-all-errors
+    --continue-at -
     --disable-epsv
     --cookie-jar cookies
     --user-agent "curl/$curlVersion Nixpkgs/$nixpkgsVersion"

pkgs/by-name/ch/checkstyle/package.nix

···
 { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "10.21.1";
+  version = "10.21.2";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-u8248qMMHRBxWk7VpFripdLQSbcAL3ApLtCQa6TyMJ4=";
+    sha256 = "sha256-r8uiXoaQFkQpcuxFE6jAbIEu32j1EciO9JfeAMM4ORc=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

pkgs/by-name/da/davinci-resolve/package.nix

···
   davinci = (
     stdenv.mkDerivation rec {
       pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
-      version = "19.1.2";
+      version = "19.1.3";
 
       nativeBuildInputs = [
         (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; })
···
             outputHashAlgo = "sha256";
             outputHash =
               if studioVariant then
-                "sha256-yLlvl/zm/epNs1e4sSDrfHNApcpPQV2fMF3Y09ml7is="
+                "sha256-aAKE+AY/a2XjVzdU0VXT3ekFrTp3rO6zUd7pRTTDc9E="
               else
-                "sha256-ssX1ffB7ZSJObETQa2r5R4oHddAccC4GB14jaLs8bGg=";
+                "sha256-CCr4/h0W1fhzUT4o6WyX2hBodzy9iqVLZwzdplzq9SI=";
 
             impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 

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

···
 }:
 buildNpmPackage rec {
   pname = "factoriolab";
-  version = "3.9.2";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "factoriolab";
     repo = "factoriolab";
     tag = "v${version}";
-    hash = "sha256-ogmez21QwFdRYVsMxeFmNnEerXbH4rQXmOwKuKbpuGs=";
+    hash = "sha256-MSiwtFd9u8IFrHDy++jO//P7Yn4Arip1DwBufR8KIRU=";
   };
   buildInputs = [ vips ];
   nativeBuildInputs = [

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

···
   doInstallCheck = true;
 
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=v(8\..*)" ]; };
   };
 
   meta = {

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

···
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+  qt6,
+  libusb-compat-0_1,
+  gsl,
+  blas,
+  bison,
+  flex,
+  zlib,
+  makeDesktopItem,
+}:
+
+let
+  desktopItem = makeDesktopItem {
+    name = "goldencheetah";
+    exec = "GoldenCheetah";
+    icon = "goldencheetah";
+    desktopName = "GoldenCheetah";
+    genericName = "GoldenCheetah";
+    comment = "Performance software for cyclists, runners and triathletes";
+    categories = [ "Utility" ];
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "golden-cheetah";
+  version = "3.7-DEV2408";
+
+  src = fetchFromGitHub {
+    owner = "GoldenCheetah";
+    repo = "GoldenCheetah";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c=";
+  };
+
+  buildInputs =
+    with qt6;
+    [
+      qt5compat
+      qtbase
+      qtcharts
+      qtconnectivity
+      qtmultimedia
+      qtserialport
+      qtsvg
+      qttools
+      qtwebengine
+    ]
+    ++ [
+      blas
+      gsl
+      libusb-compat-0_1
+      zlib
+    ];
+  nativeBuildInputs =
+    [
+      bison
+      flex
+    ]
+    ++ (with qt6; [
+      qmake
+      wrapQtAppsHook
+    ]);
+
+  patches = [
+    # allow building with bison 3.7
+    # Included in https://github.com/GoldenCheetah/GoldenCheetah/pull/3590,
+    # which is periodically rebased but pre 3.6 release, as it'll break other CI systems
+    ./0001-Fix-building-with-bison-3.7.patch
+  ];
+
+  NIX_LDFLAGS = "-lz -lgsl -lblas";
+
+  qtWrapperArgs = [
+    "--prefix"
+    "LD_LIBRARY_PATH"
+    ":"
+    "${zlib.out}/lib"
+  ];
+
+  preConfigure = ''
+    cp src/gcconfig.pri.in src/gcconfig.pri
+    cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
+    sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qt6.qttools.dev}/bin/lrelease,' src/gcconfig.pri
+    sed -i 's,^#LIBUSB_INSTALL.*,LIBUSB_INSTALL = ${libusb-compat-0_1},' src/gcconfig.pri
+    sed -i 's,^#LIBUSB_INCLUDE.*,LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include,' src/gcconfig.pri
+    sed -i 's,^#LIBUSB_LIBS.*,LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb,' src/gcconfig.pri
+  '';
+
+  installPhase =
+    if stdenv.isLinux then
+      ''
+        runHook preInstall
+
+        mkdir -p $out/bin
+        cp src/GoldenCheetah $out/bin
+        install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/
+        install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png
+
+        runHook postInstall
+      ''
+    else if stdenv.isDarwin then
+      ''
+        runHook preInstall
+        mkdir -p $out/Applications
+        cp -r src/GoldenCheetah.app $out/Applications
+        runHook postInstall
+      ''
+    else
+      abort "unsupported platform";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens";
+    mainProgram = "GoldenCheetah";
+    platforms = with lib.platforms; darwin ++ linux;
+    maintainers = with lib.maintainers; [ adamcstephens ];
+    license = lib.licenses.gpl2Plus;
+  };
+})

pkgs/by-name/na/narsil/package.nix

···
 }:
 stdenv.mkDerivation rec {
   pname = "narsil";
-  version = "bbc8fc5efd779ec885045f9b8d903d0df1bec1b2";
+  version = "f5ec6bd6b8013f2a2b74fc45b6f4c53744590ec5";
 
   src = fetchFromGitHub {
     owner = "NickMcConnell";
     repo = "NarSil";
     rev = version;
-    hash = "sha256-keN1IJao80Pr8SpHe0tYXg14l9rBfboyNoDaivzWsyM=";
+    hash = "sha256-xMY9XmFsjcucLPfwTXiC0oQ2UkWIkWCehvycesqbWn0=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };

pkgs/by-name/ne/netrw/package.nix

···
   version = "1.3.2";
 
   configureFlags = [
+    # This is to add "#include" directives for stdlib.h, stdio.h and string.h.
+    "ac_cv_header_stdc=yes"
+
     "--with-checksum=${checksumType}"
   ];
 

pkgs/by-name/pd/pds/package.nix

···
+{
+  stdenv,
+  makeBinaryWrapper,
+  removeReferencesTo,
+  srcOnly,
+  python3,
+  pnpm_9,
+  fetchFromGitHub,
+  nodejs,
+  vips,
+  pkg-config,
+  nixosTests,
+  lib,
+}:
+
+let
+  nodeSources = srcOnly nodejs;
+  pythonEnv = python3.withPackages (p: [ p.setuptools ]);
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pds";
+  version = "0.4.74";
+
+  src = fetchFromGitHub {
+    owner = "bluesky-social";
+    repo = "pds";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-kNHsQ6funmo8bnkFBNWHQ0Fmd5nf/uh+x9buaRJMZnM=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/service";
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    nodejs
+    pythonEnv
+    pkg-config
+    pnpm_9.configHook
+    removeReferencesTo
+  ];
+
+  # Required for `sharp` NPM dependency
+  buildInputs = [ vips ];
+
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      sourceRoot
+      ;
+    hash = "sha256-oU4dwlBdsMmgAUv1ICaOqaqucmg/TjKOZxjnxpm0qL8=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    pushd ./node_modules/.pnpm/better-sqlite3@*/node_modules/better-sqlite3
+    npm run build-release --offline --nodedir="${nodeSources}"
+    find build -type f -exec remove-references-to -t "${nodeSources}" {} \;
+    popd
+
+    makeWrapper "${lib.getExe nodejs}" "$out/bin/pds" \
+      --add-flags --enable-source-maps \
+      --add-flags "$out/lib/pds/index.js" \
+      --set-default NODE_ENV production
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib/pds}
+    mv node_modules $out/lib/pds
+    mv index.js $out/lib/pds
+
+    runHook postInstall
+  '';
+
+  passthru.tests = {
+    inherit (nixosTests) pds;
+  };
+
+  meta = {
+    description = "Bluesky Personal Data Server (PDS)";
+    homepage = "https://github.com/bluesky-social/pds";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ t4ccer ];
+    platforms = lib.platforms.unix;
+    mainProgram = "pds";
+  };
+})

pkgs/by-name/pd/pdsadmin/package.nix

···
+{
+  stdenvNoCC,
+  fetchFromGitHub,
+  bash,
+  pds,
+  makeBinaryWrapper,
+  jq,
+  curl,
+  openssl,
+  lib,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "pdsadmin";
+  inherit (pds) version src;
+
+  patches = [ ./pdsadmin-offline.patch ];
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  buildInputs = [ bash ];
+
+  strictDeps = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    substituteInPlace pdsadmin.sh \
+      --replace-fail NIXPKGS_PDSADMIN_ROOT $out
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 pdsadmin.sh $out/lib/pds/pdsadmin.sh
+    install -Dm755 pdsadmin/*.sh $out/lib/pds
+    makeWrapper "$out/lib/pds/pdsadmin.sh" "$out/bin/pdsadmin" \
+      --prefix PATH : "${
+        lib.makeBinPath [
+          jq
+          curl
+          openssl
+        ]
+      }"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Admin scripts for Bluesky Personal Data Server (PDS)";
+    inherit (pds.meta) homepage license;
+    maintainers = with lib.maintainers; [ t4ccer ];
+    platforms = lib.platforms.unix;
+    mainProgram = "pdsadmin";
+  };
+})

pkgs/by-name/pd/pdsadmin/pdsadmin-offline.patch

···
+diff --git a/pdsadmin.sh b/pdsadmin.sh
+index 913d2b4..b09c20c 100644
+--- a/pdsadmin.sh
++++ b/pdsadmin.sh
+@@ -15,16 +15,11 @@ if [[ "${EUID}" -ne 0 ]]; then
+   exit 1
+ fi
+ 
+-# Download the script, if it exists.
+-SCRIPT_URL="${PDSADMIN_BASE_URL}/${COMMAND}.sh"
+-SCRIPT_FILE="$(mktemp /tmp/pdsadmin.${COMMAND}.XXXXXX)"
++SCRIPT_FILE="NIXPKGS_PDSADMIN_ROOT/lib/pds/${COMMAND}.sh"
+ 
+-if ! curl --fail --silent --show-error --location --output "${SCRIPT_FILE}" "${SCRIPT_URL}"; then
++if ! [ -f "${SCRIPT_FILE}" ]; then
+   echo "ERROR: ${COMMAND} not found"
+   exit 2
+ fi
+ 
+-chmod +x "${SCRIPT_FILE}"
+-if "${SCRIPT_FILE}" "$@"; then
+-  rm --force "${SCRIPT_FILE}"
+-fi
++"${SCRIPT_FILE}" "$@"

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

···
 
 stdenv.mkDerivation rec {
   pname = "photoqt";
-  version = "4.7";
+  version = "4.8";
 
   src = fetchurl {
     url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    hash = "sha256-uZCeJJsQoIDZ6nf+JbFhbXE4ZHL8pCY0pJOG5w6v4vs=";
+    hash = "sha256-ccSbG5MTIyVJFqNHstaW53BfsGmN/I4ObCZfY0h22QE=";
   };
 
   nativeBuildInputs = [

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

···
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-colorizer";
-  version = "1.2.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-colorizer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yeUicFoafKqj6suVJSaaNjmT+g+ZYb8QsguYyKNBYFA=";
+    hash = "sha256-Xv1yGIGIWqfxukJub0X2sH0XwtRTr13p+vDi+Wdgnkg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ra/rastertoezpl/package.nix

···
+{
+  stdenv,
+  lib,
+  fetchurl,
+  cups,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rastertoezpl";
+  version = "1.1.12";
+
+  src = fetchurl {
+    url = "https://godex.s3-accelerate.amazonaws.com/tWHDYruxWFM98frjWNTE,g.file?v01";
+    name = "${finalAttrs.pname}-${finalAttrs.version}-source.tar.gz";
+    hash = "sha256-iBhM8Mht/XncWU75cd485WK5GZtJNv78yMsFsD0eKWQ=";
+  };
+
+  buildInputs = [ cups ];
+
+  configureFlags = [
+    "--datarootdir=${placeholder "out"}/share"
+    "PPDDIR=${placeholder "out"}/share/cups/model"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/lib/cups/filter
+    ln -s $out/libexec/rastertoezpl/rastertoezpl $out/lib/cups/filter/rastertoezpl
+    gzip -9n $out/share/cups/model/godex/*.ppd
+  '';
+
+  meta = {
+    description = "CUPS driver for GODEX printers";
+    homepage = "https://www.godexintl.com/downloads";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ stargate01 ];
+    platforms = lib.platforms.linux;
+  };
+})

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

···
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+buildGoModule rec {
+  pname = "regolith";
+  version = "1.5.1";
+
+  src = fetchFromGitHub {
+    owner = "Bedrock-OSS";
+    repo = "regolith";
+    tag = version;
+    hash = "sha256-gTEQ2hu581tD1I/3iLHzE/2nekAG49/M6V6QeqPhYsA=";
+  };
+
+  # Requires network access.
+  doCheck = false;
+
+  vendorHash = "sha256-+4J4Z7lhbAphi6WUEJN9pzNXf6ROUKqN4NdKI2sQSW0=";
+
+  ldflags = [
+    "-X main.buildSource=nix"
+    "-X main.version=${version}"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Add-on Compiler for the Bedrock Edition of Minecraft";
+    homepage = "https://github.com/Bedrock-OSS/regolith";
+    changelog = "https://github.com/Bedrock-OSS/regolith/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ arexon ];
+    mainProgram = "regolith";
+  };
+}

pkgs/by-name/ut/ut1999/package.nix

···
   fetchurl,
   makeDesktopItem,
   copyDesktopItems,
+  libarchive,
   imagemagick,
   runCommand,
   libgcc,
   wxGTK32,
-  innoextract,
   libGL,
   SDL2,
   openal,
···
       hash = "sha256-TbhJbOH4E5WOb6XR9dmqLkXziK3/CzhNjd1ypBkkmvw=";
     };
   };
-  unpackGog =
-    runCommand "ut1999-gog"
+  unpackIso =
+    runCommand "ut1999-iso"
       {
-        src = requireFile rec {
-          name = "setup_ut_goty_2.0.0.5.exe";
-          hash = "sha256-TMJX1U2XZZxQYvK/GG0KjGlZVh0R5C2Pzy6sB/GSaAM=";
-          message = ''
-            Unreal Tournament 1999 requires the official GOG package, version 2.0.0.5.
-
-            Once you download the file, run the following command:
-
-            nix-prefetch-url file://\$PWD/${name}
-          '';
+        # This upload of the game is officially sanctioned by OldUnreal (who has received permission from Epic Games to link to archive.org) and the UT99.org community
+        # This is a copy of the original Unreal Tournament: Game of the Year Edition (also known as UT or UT99).
+        src = fetchurl {
+          url = "https://archive.org/download/ut-goty/UT_GOTY_CD1.iso";
+          hash = "sha256-4YSYTKiPABxd3VIDXXbNZOJm4mx0l1Fhte1yNmx0cE8=";
         };
-
-        nativeBuildInputs = [ innoextract ];
+        nativeBuildInputs = [ libarchive ];
       }
       ''
-        innoextract --extract --exclude-temp "$src"
+        bsdtar -xvf "$src"
         mkdir $out
-        cp -r app/* $out
+        cp -r Music Sounds Textures Maps $out
       '';
   systemDir =
     {
···
     lib.optionals stdenv.hostPlatform.isLinux [
       copyDesktopItems
       autoPatchelfHook
-      imagemagick
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       undmg
···
       chmod -R 755 $out
       cd ${outPrefix}
 
+      # NOTE: OldUnreal patch doesn't include these folders but could in the future
       rm -rf ./{Music,Sounds,Maps}
-      ln -s ${unpackGog}/{Music,Sounds,Maps} .
+      ln -s ${unpackIso}/{Music,Sounds,Maps} .
 
-      cp -n ${unpackGog}/Textures/* ./Textures || true
-      cp -n ${unpackGog}/System/*.{u,int} ./System || true
+      # TODO: unpack compressed maps with ucc
+
+      cp -n ${unpackIso}/Textures/* ./Textures || true
+      cp -n ${unpackIso}/System/*.{u,int} ./System || true
     ''
     + lib.optionalString (stdenv.hostPlatform.isLinux) ''
       ln -s "$out/${systemDir}/ut-bin" "$out/bin/ut1999"
       ln -s "$out/${systemDir}/ucc-bin" "$out/bin/ut1999-ucc"
 
-      convert "${unpackGog}/gfw_high.ico" "ut1999.png"
-      install -D ut1999-5.png "$out/share/icons/hicolor/256x256/apps/ut1999.png"
+      install -D "${./ut1999.svg}" "$out/share/pixmaps/ut1999.svg"
+      ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 16x16 ut1999_16x16.png
+      ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 24x24 ut1999_24x24.png
+      ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 32x32 ut1999_32x32.png
+      ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 48x48 ut1999_48x48.png
+      ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 64x64 ut1999_64x64.png
+      ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 128x128 ut1999_128x128.png
+      ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 192x192 ut1999_192x192.png
+      ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 256x256 ut1999_256x256.png
+      install -D "ut1999_16x16.png" "$out/share/icons/hicolor/16x16/apps/ut1999.png"
+      install -D "ut1999_24x24.png" "$out/share/icons/hicolor/24x24/apps/ut1999.png"
+      install -D "ut1999_32x32.png" "$out/share/icons/hicolor/32x32/apps/ut1999.png"
+      install -D "ut1999_48x48.png" "$out/share/icons/hicolor/48x48/apps/ut1999.png"
+      install -D "ut1999_64x64.png" "$out/share/icons/hicolor/64x64/apps/ut1999.png"
+      install -D "ut1999_128x128.png" "$out/share/icons/hicolor/128x128/apps/ut1999.png"
+      install -D "ut1999_192x192.png" "$out/share/icons/hicolor/192x192/apps/ut1999.png"
+      install -D "ut1999_256x256.png" "$out/share/icons/hicolor/256x256/apps/ut1999.png"
 
       # Remove bundled libraries to use native versions instead
       rm $out/${systemDir}/libmpg123.so* \
         $out/${systemDir}/libopenal.so* \
         $out/${systemDir}/libSDL2* \
         $out/${systemDir}/libxmp.so*
+        # NOTE: what about fmod?
+        #$out/${systemDir}/libfmod.so*
     ''
     + ''
       runHook postInstall

pkgs/by-name/ut/ut1999/ut1999.svg

···
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   viewBox="0 0 39.476429 39.476429"
+   version="1.1"
+   id="svg109"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs113">
+    <linearGradient
+       id="linearGradient28292">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop28288" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop28290" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1749">
+      <stop
+         style="stop-color:#f5be39;stop-opacity:1;"
+         offset="0"
+         id="stop1745" />
+      <stop
+         style="stop-color:#ffd699;stop-opacity:1;"
+         offset="0.44286996"
+         id="stop5511" />
+      <stop
+         style="stop-color:#9a5f00;stop-opacity:1;"
+         offset="0.58172649"
+         id="stop5507" />
+      <stop
+         style="stop-color:#cfa344;stop-opacity:1;"
+         offset="0.85889333"
+         id="stop5509" />
+      <stop
+         style="stop-color:#ffd587;stop-opacity:1;"
+         offset="1"
+         id="stop1747" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1749"
+       id="linearGradient1751"
+       x1="-45.682671"
+       y1="18.414253"
+       x2="-45.682671"
+       y2="-21.00696"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient1749"
+       id="linearGradient18718"
+       x1="-6.2713218"
+       y1="-20.88386"
+       x2="-6.2713218"
+       y2="18.420364"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient28292"
+       id="linearGradient28294"
+       x1="-24.591709"
+       y1="0.21153279"
+       x2="-24.591709"
+       y2="-18.75918"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient1749"
+       id="linearGradient37018"
+       gradientUnits="userSpaceOnUse"
+       x1="-45.682671"
+       y1="18.414253"
+       x2="-45.682671"
+       y2="-21.00696" />
+    <linearGradient
+       xlink:href="#linearGradient1749"
+       id="linearGradient37020"
+       gradientUnits="userSpaceOnUse"
+       x1="-6.2713218"
+       y1="-20.88386"
+       x2="-6.2713218"
+       y2="18.420364" />
+    <linearGradient
+       xlink:href="#linearGradient1749"
+       id="linearGradient37022"
+       gradientUnits="userSpaceOnUse"
+       x1="-45.682671"
+       y1="18.414253"
+       x2="-45.682671"
+       y2="-21.00696" />
+    <linearGradient
+       xlink:href="#linearGradient1749"
+       id="linearGradient37024"
+       gradientUnits="userSpaceOnUse"
+       x1="-45.682671"
+       y1="18.414253"
+       x2="-45.682671"
+       y2="-21.00696" />
+  </defs>
+  <g
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     id="g107"
+     transform="matrix(0.99032725,0,0,0.99032725,45.431715,21.024607)">
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:0.305415"
+       id="path9973"
+       cx="-25.944456"
+       cy="-1.2989572"
+       r="19.738214" />
+    <path
+       d="m -21.940063,-5.9119705 c 0.753568,-0.8721626 1.606864,-1.6598716 2.511595,-2.3757053 0.910795,-0.7205505 1.873251,-1.3685518 2.986646,-1.8325972 1.177857,-0.490774 2.524622,-0.775805 3.829832,-0.839819 3.8350002,5.2922731 4.1768574,12.3520059 0.870366,17.9899535 0.09748,-2.605032 -0.06491,-4.8394573 -0.51009,-6.72214252 -0.382512,-1.61921708 -0.97436,-2.97833528 -1.921093,-4.31184788 l 2.645686,-2.3489766 a 15.141443,15.141443 0 0 0 -1.522184,-3.138258 c -0.764574,0.2003526 -1.469178,0.4638207 -2.131554,1.0394974 -0.812416,0.7057262 -1.562615,1.8804392 -1.881562,3.0239313 v 9.542128 c 0,1.0543217 0.192042,2.0895508 0.665521,3.0910891 0.512786,1.0857671 1.355524,2.1317783 2.322922,2.9057857 -5.433104,5.652324 -14.098802,6.689575 -20.712458,2.479026 -6.613881,-4.2103234 -9.341326,-12.50047182 -6.51932,-19.8153621 -0.07749,1.9550098 0.210011,3.9646 0.949653,5.7922557 0.740317,1.82855408 1.933672,3.4751737 3.350964,4.8266551 l -2.183887,2.9217327 a 15.277108,15.277108 0 0 0 23.293007,3.8931736 l -6.743032,-2.8426702 -0.03504,-1.6459451 -3.957637,3.7474009 -5.708925,-1.9262596 h -2.311916 c 0.780746,-0.6693393 1.494109,-1.7618442 1.523084,-2.6492803 0.02628,-0.8027579 -0.507845,-1.4379564 -1.249958,-1.9424316 -0.821625,-0.5588309 -1.898408,-0.9577392 -3.074693,-1.261188 0.937973,-0.047617 1.905146,-0.087598 2.735307,-0.1655379 0.547151,-0.051436 1.03478,-0.1194928 1.198297,-0.3434295 0.135665,-0.18552825 0.04829,-0.47842034 -0.192267,-0.74548223 -0.410812,-0.45573471 -1.268375,-0.83757257 -2.01251,-1.171793 -0.72931,-0.32748207 -1.349235,-0.60936827 -2.146153,-1.10261297 1.631795,-0.075918 3.359274,-0.1282526 4.078926,-0.454387 0.323664,-0.1466707 0.443382,-0.3488202 0.532552,-0.6538412 0.16464,-0.5633232 0.224835,-1.4777125 -0.06693,-2.244982 -0.318722,-0.8377972 -1.057242,-1.4999489 -2.004649,-2.1508702 -1.227496,-0.8434124 -2.805609,-1.6679576 -4.682455,-2.5068778 4.576664,-7.5284953 14.268832,-10.1200513 21.992513,-5.8800783 -2.321574,-0.05548 -4.092179,-8.99e-4 -5.873115,0.375324 -1.80789,0.381838 -3.625663,1.094976 -5.359432,2.551126 l -2.321798,-2.695551 a 15.276883,15.276883 0 0 0 -6.531898,4.957379 l 9.273044,4.7673579 2.757993,-1.769257 -0.988736,2.9662063 v 7.3896856 c 0.209112,1.1852696 0.956392,2.0455279 1.809238,2.0677643 0.969868,0.024932 2.076299,-1.0332083 2.705433,-2.1021297 v -5.7017376 l -2.37548,-3.3258078 z m 13.9851477,4.6128259 c 0,-9.9351964 -8.0543067,-17.9895044 -17.9897277,-17.9895044 -9.935422,0 -17.989505,8.054083 -17.989505,17.9895044 0,9.9354204 8.054083,17.9895036 17.989505,17.9895036 9.935196,0 17.9897277,-8.0543078 17.9897277,-17.9895036 z M -43.051653,-11.140903 a 19.708898,19.708898 0 0 1 11.964327,-9.2124 19.708673,19.708673 0 0 1 14.984666,1.947149 19.709347,19.709347 0 0 1 9.2126231,11.9643273 A 19.708673,19.708673 0 0 1 -8.83741,8.5428378 19.709122,19.709122 0 0 1 -20.801512,17.755462 19.708673,19.708673 0 0 1 -35.786177,15.808089 19.709572,19.709572 0 0 1 -44.998802,3.8437621 19.708673,19.708673 0 0 1 -43.051653,-11.140903 Z"
+       id="path12879"
+       style="fill:url(#linearGradient37024);fill-opacity:1;stroke:url(#linearGradient18718);stroke-width:0.385512;stroke-dasharray:none" />
+    <path
+       d="m -21.940063,-5.9119705 c 0.753568,-0.8721626 1.606864,-1.6598716 2.511595,-2.3757053 0.910795,-0.7205505 1.873251,-1.3685518 2.986646,-1.8325972 1.177857,-0.490774 2.524622,-0.775805 3.829832,-0.839819 3.8350002,5.2922731 4.1768574,12.3520059 0.870366,17.9899535 0.09748,-2.605032 -0.06491,-4.8394573 -0.51009,-6.72214252 -0.382512,-1.61921708 -0.97436,-2.97833528 -1.921093,-4.31184788 l 2.645686,-2.3489766 a 15.141443,15.141443 0 0 0 -1.522184,-3.138258 c -0.764574,0.2003526 -1.469178,0.4638207 -2.131554,1.0394974 -0.812416,0.7057262 -1.562615,1.8804392 -1.881562,3.0239313 v 9.542128 c 0,1.0543217 0.192042,2.0895508 0.665521,3.0910891 0.512786,1.0857671 1.355524,2.1317783 2.322922,2.9057857 -5.433104,5.652324 -14.098802,6.689575 -20.712458,2.479026 -6.613881,-4.2103234 -9.341326,-12.50047182 -6.51932,-19.8153621 -0.07749,1.9550098 0.210011,3.9646 0.949653,5.7922557 0.740317,1.82855408 1.933672,3.4751737 3.350964,4.8266551 l -2.183887,2.9217327 a 15.277108,15.277108 0 0 0 23.293007,3.8931736 l -6.743032,-2.8426702 -0.03504,-1.6459451 -3.957637,3.7474009 -5.708925,-1.9262596 h -2.311916 c 0.780746,-0.6693393 1.494109,-1.7618442 1.523084,-2.6492803 0.02628,-0.8027579 -0.507845,-1.4379564 -1.249958,-1.9424316 -0.821625,-0.5588309 -1.898408,-0.9577392 -3.074693,-1.261188 0.937973,-0.047617 1.905146,-0.087598 2.735307,-0.1655379 0.547151,-0.051436 1.03478,-0.1194928 1.198297,-0.3434295 0.135665,-0.18552825 0.04829,-0.47842034 -0.192267,-0.74548223 -0.410812,-0.45573471 -1.268375,-0.83757257 -2.01251,-1.171793 -0.72931,-0.32748207 -1.349235,-0.60936827 -2.146153,-1.10261297 1.631795,-0.075918 3.359274,-0.1282526 4.078926,-0.454387 0.323664,-0.1466707 0.443382,-0.3488202 0.532552,-0.6538412 0.16464,-0.5633232 0.224835,-1.4777125 -0.06693,-2.244982 -0.318722,-0.8377972 -1.057242,-1.4999489 -2.004649,-2.1508702 -1.227496,-0.8434124 -2.805609,-1.6679576 -4.682455,-2.5068778 4.576664,-7.5284953 14.268832,-10.1200513 21.992513,-5.8800783 -2.321574,-0.05548 -4.092179,-8.99e-4 -5.873115,0.375324 -1.80789,0.381838 -3.625663,1.094976 -5.359432,2.551126 l -2.321798,-2.695551 a 15.276883,15.276883 0 0 0 -6.531898,4.957379 l 9.273044,4.7673579 2.757993,-1.769257 -0.988736,2.9662063 v 7.3896856 c 0.209112,1.1852696 0.956392,2.0455279 1.809238,2.0677643 0.969868,0.024932 2.076299,-1.0332083 2.705433,-2.1021297 v -5.7017376 l -2.37548,-3.3258078 z m 13.9851477,4.6128259 c 0,-9.9351964 -8.0543067,-17.9895044 -17.9897277,-17.9895044 -9.935422,0 -17.989505,8.054083 -17.989505,17.9895044 0,9.9354204 8.054083,17.9895036 17.989505,17.9895036 9.935196,0 17.9897277,-8.0543078 17.9897277,-17.9895036 z M -43.051653,-11.140903 a 19.708898,19.708898 0 0 1 11.964327,-9.2124 19.708673,19.708673 0 0 1 14.984666,1.947149 19.709347,19.709347 0 0 1 9.2126231,11.9643273 A 19.708673,19.708673 0 0 1 -8.83741,8.5428378 19.709122,19.709122 0 0 1 -20.801512,17.755462 19.708673,19.708673 0 0 1 -35.786177,15.808089 19.709572,19.709572 0 0 1 -44.998802,3.8437621 19.708673,19.708673 0 0 1 -43.051653,-11.140903 Z"
+       id="path105"
+       style="fill:url(#linearGradient1751);fill-opacity:1;stroke-width:0.224611" />
+  </g>
+  <g
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     id="g21630"
+     transform="matrix(0.99032725,0,0,0.99032725,45.431715,21.024607)">
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:0.305415"
+       id="circle21624"
+       cx="-25.944456"
+       cy="-1.2989572"
+       r="19.738214" />
+    <path
+       d="m -21.940063,-5.9119705 c 0.753568,-0.8721626 1.606864,-1.6598716 2.511595,-2.3757053 0.910795,-0.7205505 1.873251,-1.3685518 2.986646,-1.8325972 1.177857,-0.490774 2.524622,-0.775805 3.829832,-0.839819 3.8350002,5.2922731 4.1768574,12.3520059 0.870366,17.9899535 0.09748,-2.605032 -0.06491,-4.8394573 -0.51009,-6.72214252 -0.382512,-1.61921708 -0.97436,-2.97833528 -1.921093,-4.31184788 l 2.645686,-2.3489766 a 15.141443,15.141443 0 0 0 -1.522184,-3.138258 c -0.764574,0.2003526 -1.469178,0.4638207 -2.131554,1.0394974 -0.812416,0.7057262 -1.562615,1.8804392 -1.881562,3.0239313 v 9.542128 c 0,1.0543217 0.192042,2.0895508 0.665521,3.0910891 0.512786,1.0857671 1.355524,2.1317783 2.322922,2.9057857 -5.433104,5.652324 -14.098802,6.689575 -20.712458,2.479026 -6.613881,-4.2103234 -9.341326,-12.50047182 -6.51932,-19.8153621 -0.07749,1.9550098 0.210011,3.9646 0.949653,5.7922557 0.740317,1.82855408 1.933672,3.4751737 3.350964,4.8266551 l -2.183887,2.9217327 a 15.277108,15.277108 0 0 0 23.293007,3.8931736 l -6.743032,-2.8426702 -0.03504,-1.6459451 -3.957637,3.7474009 -5.708925,-1.9262596 h -2.311916 c 0.780746,-0.6693393 1.494109,-1.7618442 1.523084,-2.6492803 0.02628,-0.8027579 -0.507845,-1.4379564 -1.249958,-1.9424316 -0.821625,-0.5588309 -1.898408,-0.9577392 -3.074693,-1.261188 0.937973,-0.047617 1.905146,-0.087598 2.735307,-0.1655379 0.547151,-0.051436 1.03478,-0.1194928 1.198297,-0.3434295 0.135665,-0.18552825 0.04829,-0.47842034 -0.192267,-0.74548223 -0.410812,-0.45573471 -1.268375,-0.83757257 -2.01251,-1.171793 -0.72931,-0.32748207 -1.349235,-0.60936827 -2.146153,-1.10261297 1.631795,-0.075918 3.359274,-0.1282526 4.078926,-0.454387 0.323664,-0.1466707 0.443382,-0.3488202 0.532552,-0.6538412 0.16464,-0.5633232 0.224835,-1.4777125 -0.06693,-2.244982 -0.318722,-0.8377972 -1.057242,-1.4999489 -2.004649,-2.1508702 -1.227496,-0.8434124 -2.805609,-1.6679576 -4.682455,-2.5068778 4.576664,-7.5284953 14.268832,-10.1200513 21.992513,-5.8800783 -2.321574,-0.05548 -4.092179,-8.99e-4 -5.873115,0.375324 -1.80789,0.381838 -3.625663,1.094976 -5.359432,2.551126 l -2.321798,-2.695551 a 15.276883,15.276883 0 0 0 -6.531898,4.957379 l 9.273044,4.7673579 2.757993,-1.769257 -0.988736,2.9662063 v 7.3896856 c 0.209112,1.1852696 0.956392,2.0455279 1.809238,2.0677643 0.969868,0.024932 2.076299,-1.0332083 2.705433,-2.1021297 v -5.7017376 l -2.37548,-3.3258078 z m 13.9851477,4.6128259 c 0,-9.9351964 -8.0543067,-17.9895044 -17.9897277,-17.9895044 -9.935422,0 -17.989505,8.054083 -17.989505,17.9895044 0,9.9354204 8.054083,17.9895036 17.989505,17.9895036 9.935196,0 17.9897277,-8.0543078 17.9897277,-17.9895036 z M -43.051653,-11.140903 a 19.708898,19.708898 0 0 1 11.964327,-9.2124 19.708673,19.708673 0 0 1 14.984666,1.947149 19.709347,19.709347 0 0 1 9.2126231,11.9643273 A 19.708673,19.708673 0 0 1 -8.83741,8.5428378 19.709122,19.709122 0 0 1 -20.801512,17.755462 19.708673,19.708673 0 0 1 -35.786177,15.808089 19.709572,19.709572 0 0 1 -44.998802,3.8437621 19.708673,19.708673 0 0 1 -43.051653,-11.140903 Z"
+       id="path21626"
+       style="fill:url(#linearGradient37018);fill-opacity:1;stroke:url(#linearGradient37020);stroke-width:0.385512;stroke-dasharray:none" />
+    <path
+       d="m -21.940063,-5.9119705 c 0.753568,-0.8721626 1.606864,-1.6598716 2.511595,-2.3757053 0.910795,-0.7205505 1.873251,-1.3685518 2.986646,-1.8325972 1.177857,-0.490774 2.524622,-0.775805 3.829832,-0.839819 3.8350002,5.2922731 4.1768574,12.3520059 0.870366,17.9899535 0.09748,-2.605032 -0.06491,-4.8394573 -0.51009,-6.72214252 -0.382512,-1.61921708 -0.97436,-2.97833528 -1.921093,-4.31184788 l 2.645686,-2.3489766 a 15.141443,15.141443 0 0 0 -1.522184,-3.138258 c -0.764574,0.2003526 -1.469178,0.4638207 -2.131554,1.0394974 -0.812416,0.7057262 -1.562615,1.8804392 -1.881562,3.0239313 v 9.542128 c 0,1.0543217 0.192042,2.0895508 0.665521,3.0910891 0.512786,1.0857671 1.355524,2.1317783 2.322922,2.9057857 -5.433104,5.652324 -14.098802,6.689575 -20.712458,2.479026 -6.613881,-4.2103234 -9.341326,-12.50047182 -6.51932,-19.8153621 -0.07749,1.9550098 0.210011,3.9646 0.949653,5.7922557 0.740317,1.82855408 1.933672,3.4751737 3.350964,4.8266551 l -2.183887,2.9217327 a 15.277108,15.277108 0 0 0 23.293007,3.8931736 l -6.743032,-2.8426702 -0.03504,-1.6459451 -3.957637,3.7474009 -5.708925,-1.9262596 h -2.311916 c 0.780746,-0.6693393 1.494109,-1.7618442 1.523084,-2.6492803 0.02628,-0.8027579 -0.507845,-1.4379564 -1.249958,-1.9424316 -0.821625,-0.5588309 -1.898408,-0.9577392 -3.074693,-1.261188 0.937973,-0.047617 1.905146,-0.087598 2.735307,-0.1655379 0.547151,-0.051436 1.03478,-0.1194928 1.198297,-0.3434295 0.135665,-0.18552825 0.04829,-0.47842034 -0.192267,-0.74548223 -0.410812,-0.45573471 -1.268375,-0.83757257 -2.01251,-1.171793 -0.72931,-0.32748207 -1.349235,-0.60936827 -2.146153,-1.10261297 1.631795,-0.075918 3.359274,-0.1282526 4.078926,-0.454387 0.323664,-0.1466707 0.443382,-0.3488202 0.532552,-0.6538412 0.16464,-0.5633232 0.224835,-1.4777125 -0.06693,-2.244982 -0.318722,-0.8377972 -1.057242,-1.4999489 -2.004649,-2.1508702 -1.227496,-0.8434124 -2.805609,-1.6679576 -4.682455,-2.5068778 4.576664,-7.5284953 14.268832,-10.1200513 21.992513,-5.8800783 -2.321574,-0.05548 -4.092179,-8.99e-4 -5.873115,0.375324 -1.80789,0.381838 -3.625663,1.094976 -5.359432,2.551126 l -2.321798,-2.695551 a 15.276883,15.276883 0 0 0 -6.531898,4.957379 l 9.273044,4.7673579 2.757993,-1.769257 -0.988736,2.9662063 v 7.3896856 c 0.209112,1.1852696 0.956392,2.0455279 1.809238,2.0677643 0.969868,0.024932 2.076299,-1.0332083 2.705433,-2.1021297 v -5.7017376 l -2.37548,-3.3258078 z m 13.9851477,4.6128259 c 0,-9.9351964 -8.0543067,-17.9895044 -17.9897277,-17.9895044 -9.935422,0 -17.989505,8.054083 -17.989505,17.9895044 0,9.9354204 8.054083,17.9895036 17.989505,17.9895036 9.935196,0 17.9897277,-8.0543078 17.9897277,-17.9895036 z M -43.051653,-11.140903 a 19.708898,19.708898 0 0 1 11.964327,-9.2124 19.708673,19.708673 0 0 1 14.984666,1.947149 19.709347,19.709347 0 0 1 9.2126231,11.9643273 A 19.708673,19.708673 0 0 1 -8.83741,8.5428378 19.709122,19.709122 0 0 1 -20.801512,17.755462 19.708673,19.708673 0 0 1 -35.786177,15.808089 19.709572,19.709572 0 0 1 -44.998802,3.8437621 19.708673,19.708673 0 0 1 -43.051653,-11.140903 Z"
+       id="path21628"
+       style="fill:url(#linearGradient37022);fill-opacity:1;stroke-width:0.224611" />
+    <path
+       id="path23092"
+       style="fill:url(#linearGradient28294);fill-opacity:1;stroke-width:0.224611"
+       d="m -25.805762,-20.69277 c -0.473953,-0.0033 -0.948507,0.01071 -1.42278,0.04232 -1.26469,0.08428 -2.527642,0.29308 -3.769434,0.629017 -4.964981,1.336993 -9.192635,4.59465 -11.75405,9.052755 -0.818765,1.4212894 -1.446154,2.9278069 -1.878016,4.4815773 a 32.997555,12.991727 0 0 0 1.016337,0.282508 c 2.144166,-7.7443653 9.240277,-13.4281663 17.668346,-13.4281663 8.575261,-2e-6 15.773207,5.884158 17.7781269,13.8358151 a 32.997555,12.991727 0 0 0 1.023715,-0.2510346 c -0.025651,-0.1013013 -0.051879,-0.2025527 -0.079211,-0.3035907 -1.3370968,-4.9650198 -4.5945139,-9.1944868 -9.0526049,-11.7558568 -2.926257,-1.685736 -6.212755,-2.562011 -9.530429,-2.58534 z m -0.392439,3.281068 c -0.315168,10e-4 -0.629998,0.01309 -0.944354,0.03674 -4.901415,0.368776 -9.523879,3.000923 -12.347678,7.4140287 1.69084,0.7738331 3.203378,1.5417462 4.353575,2.3320464 0.965845,0.6635889 1.777805,1.379284 2.132815,2.3124697 0.121158,0.3186123 0.186893,0.6600124 0.212333,0.9949523 a 32.997555,12.991727 0 0 0 5.381356,0.3290405 v -0.6443773 l 0.699192,-2.0917038 -2.10345,1.3495932 -9.8164,-5.0449367 0.24998,-0.328137 c 1.722821,-2.266828 4.030876,-4.01882 6.67764,-5.068278 l 0.228597,-0.0899 2.290935,2.658226 c 1.700941,-1.345359 3.465567,-2.071066 5.218869,-2.441375 1.321534,-0.279144 2.809888,-0.261758 4.322252,-0.277388 -2.130497,-0.912593 -4.349481,-1.448123 -6.555662,-1.441002 z m 13.405277,6.837417 c -1.204493,0.08068 -2.438519,0.322655 -3.515689,0.7714759 -1.073715,0.4475077 -2.008833,1.0752856 -2.906249,1.7852518 -0.891251,0.7051681 -1.728121,1.4773958 -2.464867,2.3300888 l -0.117159,0.138694 -2.400415,-0.2734726 1.308783,1.8328385 a 32.997555,12.991727 0 0 0 5.482252,-0.3287394 v -1.156536 l 0.01175,-0.044876 c 0.334785,-1.2002751 1.126171,-2.4441515 1.98629,-3.1913165 0.720737,-0.6263985 1.48247,-0.9085104 2.271509,-1.1152742 l 0.244108,-0.062495 0.134778,0.2109775 c 0.640923,1.0064672 1.161188,2.0847697 1.554698,3.2108933 l 0.0762,0.2166999 -1.493408,1.3273058 a 32.997555,12.991727 0 0 0 2.231001,-0.3965051 c -0.460072,-1.8497566 -1.259524,-3.6315218 -2.403577,-5.2550107 z" />
+  </g>
+</svg>

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

···
 
 buildGoModule rec {
   pname = "VictoriaMetrics";
-  version = "1.109.0";
+  version = "1.110.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     rev = "v${version}";
-    hash = "sha256-ZeHQxJtUZSFwWeQgHcEXdq9GR26HH4NOuLnO8S4u21o=";
+    hash = "sha256-TrM2YyxZZZw+wGMIFACJExtQb6aJwDe1xe63OQqCjDo=";
   };
 
   vendorHash = null;

pkgs/by-name/wo/wownero/package.nix

···
   fetchFromGitea,
   cmake,
   python3,
-  boost,
+  boost186,
   libsodium,
   openssl,
   rapidjson,
···
 
   buildInputs =
     [
-      boost
+      boost186
       libsodium
       openssl
       rapidjson

pkgs/development/php-packages/box/default.nix

···
   lib,
   php82,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
-php82.buildComposerProject (finalAttrs: {
+php82.buildComposerProject2 (finalAttrs: {
   pname = "box";
   version = "4.6.2";
 
   src = fetchFromGitHub {
     owner = "box-project";
     repo = "box";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-gYIAP9pTjahNkpNNXx0c8sQm+9Kaq6/IAo/xI5bNy7Y=";
   };
 
-  vendorHash = "sha256-HCbjW4HdyQNWDEHXj9U1t3S3EKcrPV1z/9I1ClFsMsc=";
+  vendorHash = "sha256-TAubvl+rsdQdqKz+lRg1oX/ENuRyHoJQVmL1ELz24fg=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
 
   meta = {
     changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}";

pkgs/development/php-packages/phpmd/default.nix

···
   lib,
   fetchFromGitHub,
   php,
+  versionCheckHook,
 }:
 
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
   pname = "phpmd";
   version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "phpmd";
     repo = "phpmd";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-nTuJGzOZnkqrfE9R9Vujz/zGJRLlj8+yRZmmnxWrieQ=";
   };
 
   # Missing `composer.lock` from the repository.
   # Issue open at https://github.com/phpmd/phpmd/issues/1056
   composerLock = ./composer.lock;
-  vendorHash = "sha256-vr0wQkfhXHLEz8Q5nEq5Bocu1U1nDhXUlaHBsysvuRQ=";
+  vendorHash = "sha256-AahAs3Gq1OQ+CW3+rU8NnWcR3hKzVNq7s3llsO4mQ38=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
 
   meta = {
     changelog = "https://github.com/phpmd/phpmd/releases/tag/${finalAttrs.version}";

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

···
   version = "5.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "altair-viz";
···
   disabledTests = [
     # ValueError: Saving charts in 'svg' format requires the vl-convert-python or altair_saver package: see http://github.com/altair-viz/altair_saver/
     "test_renderer_with_none_embed_options"
+    # Sometimes conflict due to parallelism
+    "test_dataframe_to_csv[polars]"
+    "test_dataframe_to_csv[pandas]"
+    # Network access
+    "test_theme_remote_lambda"
   ];
 
   disabledTestPaths = [

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

···
 
 buildPythonPackage rec {
   pname = "databricks-sdk";
-  version = "0.40.0";
+  version = "0.41.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "databricks-sdk-py";
     tag = "v${version}";
-    hash = "sha256-x8CbjWdholuIGVr3TxbFjEszu0owjSIm7+G3Sh+cHEk=";
+    hash = "sha256-mKytUMPipee/sg5VWBTfCg0sZwNg69pI+Uuqu1EhNIc=";
   };
 
   build-system = [

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

···
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
+      # reported at: https://github.com/jax-ml/jax/issues/26106
+      "--deselect tests/pjit_test.py::PJitErrorTest::testAxisResourcesMismatch"
       "--deselect tests/shape_poly_test.py::ShapePolyTest"
       "--deselect tests/tree_util_test.py::TreeTest"
     ];
···
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
+      # reported at: https://github.com/jax-ml/jax/issues/26106
       "testInAxesPyTreePrefixMismatchError"
       "testInAxesPyTreePrefixMismatchErrorKwargs"
       "testOutAxesPyTreePrefixMismatchError"

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

···
     "test_binary_logit_log_likelihood"
 
     # AssertionError (flaky numerical tests)
+    "test_Rosenbrock2"
+    "test_Rosenbrock5"
+    "test_gradient1"
+    "test_inv_hessian_product_pytree3"
     "test_logreg_with_intercept_manual_loop3"
-    "test_inv_hessian_product_pytree3"
     "test_multiclass_logreg6"
-    "test_Rosenbrock2"
-    "test_Rosenbrock5"
   ];
 
   meta = {

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

···
 
 buildPythonPackage rec {
   pname = "pyedflib";
-  version = "0.1.38";
+  version = "0.1.39";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "holgern";
     repo = "pyedflib";
     tag = "v${version}";
-    hash = "sha256-sj2O5ISAy12u4GdtucLaRfOeSA6o6FJpZWTyiLq5B3U=";
+    hash = "sha256-NHjeaNLbOxTPzTbQ9owFkessQY/QnxBSC8G93JahMGg=";
   };
 
   build-system = [

pkgs/development/tools/analysis/checkov/default.nix

···
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.355";
+  version = "3.2.357";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-yBm4v7YczngDFf7jSSVrlMbwIWYFMt6xdJe5qG6i4+I=";
+    hash = "sha256-hWCYkzFKL60r1k2u9TUwuSRA2R+hHr4ooKGtctko41o=";
   };
 
   patches = [ ./flake8-compat-5.x.patch ];

pkgs/os-specific/linux/acpi-call/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/akvcam/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
   sourceRoot = "${src.name}/src";
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/amneziawg/default.nix

···
   fetchFromGitHub,
   srcOnly,
   kernel,
+  kernelModuleMakeFlags,
   nix-update-script,
 }:
 
···
   ];
 
   makeFlags =
-    kernel.moduleMakeFlags
+    kernelModuleMakeFlags
     ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]
     ++ lib.optional (lib.versionAtLeast kernel.version "5.6") "KERNEL_SOURCE_DIR=${srcOnly kernel}";
 

pkgs/os-specific/linux/apfs/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   nixosTests,
 }:
 
···
   hardeningDisable = [ "pic" ];
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELRELEASE=${kernel.modDirVersion}"
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"

pkgs/os-specific/linux/batman-adv/default.nix

···
   stdenv,
   fetchurl,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 let
···
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/bbswitch/default.nix

···
   fetchFromGitHub,
   fetchpatch,
   kernel,
+  kernelModuleMakeFlags,
   runtimeShell,
 }:
 
···
       --replace "/lib/modules" "${kernel.dev}/lib/modules"
   '';
 
-  makeFlags = kernel.moduleMakeFlags;
+  makeFlags = kernelModuleMakeFlags;
 
   installPhase = ''
     mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc

pkgs/os-specific/linux/can-isotp/default.nix

···
   lib,
   stdenv,
   kernel,
+  kernelModuleMakeFlags,
   fetchFromGitHub,
 }:
 
···
     sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq";
   };
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=${placeholder "out"}"
   ];

pkgs/os-specific/linux/cryptodev/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel ? false,
+  kernelModuleMakeFlags ? [],
 }:
 
 stdenv.mkDerivation (finalAttrs: {
···
   nativeBuildInputs = kernel.moduleBuildDependencies;
   hardeningDisable = [ "pic" ];
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"
     "prefix=$(out)"

pkgs/os-specific/linux/ddcci/default.nix

···
   stdenv,
   fetchFromGitLab,
   kernel,
+  kernelModuleMakeFlags,
   fetchpatch,
 }:
 
···
       --replace depmod \#
   '';
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "KVER=${kernel.modDirVersion}"
     "KERNEL_MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"

pkgs/os-specific/linux/digimend/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
     rm -r $out/lib/udev
   '';
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KVERSION=${kernel.modDirVersion}"
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "DESTDIR=${placeholder "out"}"

pkgs/os-specific/linux/dpdk-kmods/default.nix

···
   stdenv,
   fetchzip,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
 
   hardeningDisable = [ "pic" ];
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "INSTALL_MOD_PATH=${placeholder "out"}"
   ];
   KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

pkgs/os-specific/linux/drbd/driver.nix

···
   lib,
   fetchurl,
   kernel,
+  kernelModuleMakeFlags,
   nixosTests,
   flex,
   coccinelle,
···
 
   enableParallelBuilding = true;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "KVER=${kernel.version}"
     "INSTALL_MOD_PATH=${placeholder "out"}"

pkgs/os-specific/linux/ena/default.nix

···
   fetchFromGitHub,
   gitUpdater,
   kernel,
+  kernelModuleMakeFlags,
 }:
 let
   rev-prefix = "ena_linux_";
···
   hardeningDisable = [ "pic" ];
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags;
+  makeFlags = kernelModuleMakeFlags;
 
   env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
 

pkgs/os-specific/linux/evdi/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   libdrm,
   python3,
 }:
···
     python3WithLibs
   ];
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KVER=${kernel.modDirVersion}"
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];

pkgs/os-specific/linux/fanout/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   kmod,
   nixosTests,
 }:
···
 
   nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/framework-laptop-kmod/default.nix

···
   lib,
   stdenv,
   kernel,
+  kernelModuleMakeFlags,
   fetchFromGitHub,
   unstableGitUpdater,
 }:
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/fwts/module.nix

···
   stdenv,
   fwts,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
 
   hardeningDisable = [ "pic" ];
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "INSTALL_MOD_PATH=${placeholder "out"}"
   ];
 

pkgs/os-specific/linux/gasket/default.nix

···
   fetchFromGitHub,
   fetchpatch2,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
     cd src
   '';
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "-C"
     "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "M=$(PWD)"

pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   kmod,
 }:
 
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build"
     "INSTALL_MOD_PATH=$(out)"
   ];

pkgs/os-specific/linux/hid-ite8291r3/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "VERSION=${version}"
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];

pkgs/os-specific/linux/hid-t150/default.nix

···
   lib,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
 
   sourceRoot = "${src.name}/hid-t150";
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=${placeholder "out"}"
   ];

pkgs/os-specific/linux/hid-tmff2/default.nix

···
-{ stdenv, lib, fetchFromGitHub, kernel }:
+{ stdenv, lib, fetchFromGitHub, kernel, kernelModuleMakeFlags }:
 
 stdenv.mkDerivation {
   pname = "hid-tmff2";
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/ipu6-drivers/default.nix

···
   fetchFromGitHub,
   ivsc-driver,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELRELEASE=${kernel.modDirVersion}"
     "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];

pkgs/os-specific/linux/ithc/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "VERSION=${version}"
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];

pkgs/os-specific/linux/ivsc-driver/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation {
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELRELEASE=${kernel.modDirVersion}"
     "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];

pkgs/os-specific/linux/jool/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   nixosTests,
 }:
 
···
     sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile
   '';
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "-C src/mod"
     "INSTALL_MOD_PATH=${placeholder "out"}"
   ];

pkgs/os-specific/linux/kernel/manual-config.nix

···
     "LD=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ld"
   ] ++ (stdenv.hostPlatform.linux-kernel.makeFlags or [])
     ++ extraMakeFlags;
+in
 
-  finalKernel = stdenv.mkDerivation (
-    builtins.foldl' lib.recursiveUpdate {} [
-      (drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile)
-      {
-        inherit pname version;
+stdenv.mkDerivation (
+  builtins.foldl' lib.recursiveUpdate {} [
+    (drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile)
+    {
+      inherit pname version;
 
-        enableParallelBuilding = true;
+      enableParallelBuilding = true;
 
-        hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];
+      hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];
 
-        makeFlags = [
-          "O=$(buildRoot)"
-        ] ++ commonMakeFlags;
+      makeFlags = [
+        "O=$(buildRoot)"
+      ] ++ commonMakeFlags;
 
-        passthru.moduleMakeFlags = [
-          "KBUILD_OUTPUT=${finalKernel.dev}/lib/modules/${finalKernel.modDirVersion}/build"
-        ] ++ commonMakeFlags;
+      passthru = { inherit commonMakeFlags; };
 
-        karch = stdenv.hostPlatform.linuxArch;
-      }
-      (optionalAttrs (pos != null) { inherit pos; })
-    ]
-  );
-in finalKernel)
+      karch = stdenv.hostPlatform.linuxArch;
+    }
+    (optionalAttrs (pos != null) { inherit pos; })
+  ]
+))

pkgs/os-specific/linux/kernel/perf/default.nix

···
   fetchurl,
   fetchpatch,
   kernel,
+  kernelModuleMakeFlags,
   elfutils,
   python3,
   perl,
···
       "WERROR=0"
       "ASCIIDOC8=1"
     ]
-    ++ kernel.moduleMakeFlags
+    ++ kernelModuleMakeFlags
     ++ lib.optional (!withGtk) "NO_GTK2=1"
     ++ lib.optional (!withZstd) "NO_LIBZSTD=1"
     ++ lib.optional (!withLibcap) "NO_LIBCAP=1";

pkgs/os-specific/linux/lenovo-legion/default.nix

···
   lib,
   stdenv,
   kernel,
+  kernelModuleMakeFlags,
   bash,
   lenovo-legion,
 }:
···
     sed -i -e '/depmod/d' ./Makefile
   '';
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "SHELL=bash"
     "KERNELVERSION=${kernel.modDirVersion}"
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

pkgs/os-specific/linux/lkrg/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 let
   isKernelRT =
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNEL=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/lttng-modules/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=${placeholder "out"}"
   ];

pkgs/os-specific/linux/mba6x_bl/default.nix

···
 {
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   lib,
   stdenv,
 }:
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"
   ];

pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix

···
   lib,
   stdenv,
   kernel,
+  kernelModuleMakeFlags,
   fetchFromGitHub,
 }:
 
···
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags;
+  makeFlags = kernelModuleMakeFlags;
 
   buildPhase = ''
     make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \

pkgs/os-specific/linux/msi-ec/default.nix

···
   linuxPackages,
   git,
   kernel ? linuxPackages.kernel,
+  kernelModuleMakeFlags,
 }:
 stdenv.mkDerivation {
   pname = "msi-ec-kmods";
···
 
   hardeningDisable = [ "pic" ];
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"
   ];

pkgs/os-specific/linux/mstflint_access/default.nix

···
-{ lib, stdenv, fetchurl, kernel, kmod, mstflint }:
+{ lib, stdenv, fetchurl, kernel, kmod, mstflint, kernelModuleMakeFlags }:
 
 stdenv.mkDerivation rec {
   pname = "mstflint_access";
···
 
   nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KVER=${kernel.modDirVersion}"
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];

pkgs/os-specific/linux/nct6687d/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   nix-update-script,
 }:
 
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "-C"
     "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "M=$(sourceRoot)"

pkgs/os-specific/linux/netatop/default.nix

···
   stdenv,
   fetchurl,
   kernel,
+  kernelModuleMakeFlags,
   kmod,
   zlib,
 }:
···
     kmod=${kmod} substituteAllInPlace netatop.service
   '';
 
-  makeFlags = kernel.moduleMakeFlags;
+  makeFlags = kernelModuleMakeFlags;
 
   preInstall = ''
     mkdir -p $out/lib/systemd/system $out/bin $out/sbin $out/share/man/man{4,8}

pkgs/os-specific/linux/nullfs/default.nix

···
   lib,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 stdenv.mkDerivation rec {
   pname = "nullfs";
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/nvidia-x11/generic.nix

···
   fetchurl,
   fetchzip,
   kernel ? null,
+  kernelModuleMakeFlags ? [],
   perl,
   nukeReferences,
   which,
···
     kernelVersion = if libsOnly then null else kernel.modDirVersion;
 
     makeFlags = lib.optionals (!libsOnly) (
-      kernel.moduleMakeFlags
+      kernelModuleMakeFlags
       ++ [
         "IGNORE_PREEMPT_RT_PRESENCE=1"
         "NV_BUILD_SUPPORTS_HMM=1"

pkgs/os-specific/linux/nvidia-x11/open.nix

···
   lib,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   nvidia_x11,
   hash,
   patches ? [ ],
···
 
     nativeBuildInputs = kernel.moduleBuildDependencies;
 
-    makeFlags = kernel.moduleMakeFlags ++ [
+    makeFlags = kernelModuleMakeFlags ++ [
       "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
       "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
       "MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"

pkgs/os-specific/linux/openrazer/driver.nix

···
   coreutils,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   stdenv,
   lib,
   util-linux,
···
 
     nativeBuildInputs = kernel.moduleBuildDependencies;
 
-    makeFlags = kernel.moduleMakeFlags ++ [
+    makeFlags = kernelModuleMakeFlags ++ [
       "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     ];
 

pkgs/os-specific/linux/qc71_laptop/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "VERSION=${version}"
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];

pkgs/os-specific/linux/r8168/default.nix

···
-{ stdenv, lib, fetchFromGitHub, kernel }:
+{ stdenv, lib, fetchFromGitHub, kernel, kernelModuleMakeFlags }:
 
 
 let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/r8168";
···
   # avoid using the Makefile directly -- it doesn't understand
   # any kernel but the current.
   # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "M=$(PWD)/src"
     "modules"

pkgs/os-specific/linux/rtl8189es/default.nix

···
   lib,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   bc,
   nukeReferences,
 }:
···
     substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     (
       "CONFIG_PLATFORM_I386_PC="

pkgs/os-specific/linux/rtl8192eu/default.nix

···
   lib,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   bc,
 }:
 
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ];
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/rtl8814au/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation {
···
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags;
+  makeFlags = kernelModuleMakeFlags;
 
   hardeningDisable = [ "pic" ];
 

pkgs/os-specific/linux/rtl8821ce/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   bc,
 }:
 
···
   hardeningDisable = [ "pic" ];
 
   nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags;
+  makeFlags = kernelModuleMakeFlags;
 
   prePatch = ''
     substituteInPlace ./Makefile \

pkgs/os-specific/linux/rtl8821cu/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   bc,
 }:
 
···
   hardeningDisable = [ "pic" ];
 
   nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags;
+  makeFlags = kernelModuleMakeFlags;
 
   prePatch = ''
     substituteInPlace ./Makefile \

pkgs/os-specific/linux/rtl88x2bu/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   bc,
 }:
 
···
   hardeningDisable = [ "pic" ];
 
   nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags;
+  makeFlags = kernelModuleMakeFlags;
 
   prePatch = ''
     substituteInPlace ./Makefile \

pkgs/os-specific/linux/rtw88/default.nix

···
   lib,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 let
···
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/rtw89/default.nix

···
   lib,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 let
···
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/rust-out-of-tree-module/default.nix

···
   lib,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   unstableGitUpdater,
 }:
 kernel.stdenv.mkDerivation {
···
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/shufflecake/default.nix

···
 {
   lib,
   kernel,
+  kernelModuleMakeFlags,
   stdenv,
   fetchFromGitea,
   libgcrypt,
···
     libgcrypt
     lvm2
   ];
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/tmon/default.nix

···
   lib,
   stdenv,
   kernel,
+  kernelModuleMakeFlags,
   ncurses,
 }:
 
···
     cd tools/thermal/tmon
   '';
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "INSTALL_ROOT=\"$(out)\""
     "BINDIR=bin"
   ];

pkgs/os-specific/linux/trelay/default.nix

···
   lib,
   fetchgit,
   kernel,
+  kernelModuleMakeFlags,
   kmod,
 }:
 let
···
     cp '${./Makefile}' Makefile
   '';
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELRELEASE=${kernel.modDirVersion}"
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=$(out)"

pkgs/os-specific/linux/tsme-test/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation {
···
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/tuxedo-drivers/default.nix

···
   stdenv,
   fetchFromGitLab,
   kernel,
+  kernelModuleMakeFlags,
   kmod,
   pahole,
 }:
···
   buildInputs = [ pahole ];
   nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELRELEASE=${kernel.modDirVersion}"
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "INSTALL_MOD_PATH=${placeholder "out"}"

pkgs/os-specific/linux/v4l2loopback/default.nix

···
-{ lib, stdenv, fetchFromGitHub, kernel, kmod }:
+{ lib, stdenv, fetchFromGitHub, kernel, kmod, kernelModuleMakeFlags }:
 
 let version = "0.13.2";
 
···
 
   outputs = [ "out" "bin" ];
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "KERNELRELEASE=${kernel.modDirVersion}"
     "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];

pkgs/os-specific/linux/veikk-linux-driver/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
 
   buildInputs = [ kernel ];
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 

pkgs/os-specific/linux/virtio_vmmci/default.nix

···
-{ stdenv, lib, fetchFromGitHub, kernel }:
+{ stdenv, lib, fetchFromGitHub, kernel, kernelModuleMakeFlags }:
 
 stdenv.mkDerivation rec {
   name = "virtio_vmmci";
···
     CONFIG_RTC_HCTOSYS yes
   '';
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "DEPMOD=echo"
     "INSTALL_MOD_PATH=$(out)"
     "KERNELRELEASE=${kernel.modDirVersion}"

pkgs/os-specific/linux/vmm_clock/default.nix

···
   lib,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
 }:
 
 stdenv.mkDerivation rec {
···
     CONFIG_RTC_HCTOSYS yes
   '';
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "DEPMOD=echo"
     "INSTALL_MOD_PATH=$(out)"
     "KERNELRELEASE=${kernel.modDirVersion}"

pkgs/os-specific/linux/xpadneo/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   bluez,
   nixosTests,
   nix-update-script,
···
   nativeBuildInputs = kernel.moduleBuildDependencies;
   buildInputs = [ bluez ];
 
-  makeFlags = kernel.moduleMakeFlags ++ [
+  makeFlags = kernelModuleMakeFlags ++ [
     "-C"
     "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     "M=$(sourceRoot)"

pkgs/os-specific/linux/zenergy/default.nix

···
   stdenv,
   fetchFromGitHub,
   kernel,
+  kernelModuleMakeFlags,
   kmod,
 }:
 
···
     "pic"
   ];
 
-  makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernelDirectory}" ];
+  makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernelDirectory}" ];
 
   installTargets = [ "modules_install" ];
 

pkgs/os-specific/linux/zfs/generic.nix

···
 
       # Kernel dependencies
       kernel ? null,
+      kernelModuleMakeFlags ? [ ],
       enablePython ? true,
       ...
     }@outerArgs:
···
             "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
             "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
           ]
-          ++ kernel.moduleMakeFlags
+          ++ kernelModuleMakeFlags
         );
 
-      makeFlags = optionals buildKernel kernel.moduleMakeFlags;
+      makeFlags = optionals buildKernel kernelModuleMakeFlags;
 
       enableParallelBuilding = true;
 
···
       outputs = [ "out" ] ++ optionals buildUser [ "dev" ];
 
       passthru = {
+        inherit kernel;
         inherit enableMail kernelModuleAttribute;
         latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages;
 

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

···
 
 buildNpmPackage rec {
   pname = "hourly-weather";
-  version = "6.6.0";
+  version = "6.6.1";
 
   src = fetchFromGitHub {
     owner = "decompil3d";
     repo = "lovelace-hourly-weather";
     rev = version;
-    hash = "sha256-UlKObFzzjsjxqp2uKvI8BYHTFBWFLFg4RTnJkFplZCA=";
+    hash = "sha256-D2kCUcUgLyMVeba3xc02q/5PrEzXrBVCX+75F58j8y0=";
   };
 
-  npmDepsHash = "sha256-cDRS87+uNbf4OOQ5w6gFFgeI52YblfAB0bS07wJg5r0=";
+  npmDepsHash = "sha256-gpyqQd4pRF4xKgfT9gRAVnXLSFThjfJV2yu4zOCvVpg=";
 
   env.CYPRESS_INSTALL_BINARY = "0";
 

pkgs/tools/package-management/nix/default.nix

···
   };
 
   nix_2_25 = common {
-    version = "2.25.4";
-    hash = "sha256-cB/1vIYk8LWvL71hiKFu8froJHTUAfsYOOxBlBeNglI=";
+    version = "2.25.5";
+    hash = "sha256-9xrQhrqHCSqWsQveykZvG/ZMu0se66fUQw3xVSg6BpQ=";
     self_attribute_name = "nix_2_25";
   };
 

pkgs/top-level/all-packages.nix

···
     nodejs = nodejs_18;
   };
 
-  photoqt = callPackage ../by-name/ph/photoqt/package.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
-  };
-
   photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };
 
   phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };
···
   discord-screenaudio = qt6Packages.callPackage ../applications/networking/instant-messengers/discord-screenaudio { };
 
   discordo = callPackage ../applications/networking/discordo/default.nix { };
-
-  golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { };
 
   tomb = callPackage ../by-name/to/tomb/package.nix {
     pinentry = pinentry-curses;

pkgs/top-level/linux-kernels.nix

···
     # to help determine module compatibility
     inherit (kernel) isZen isHardened isLibre;
     inherit (kernel) kernelOlder kernelAtLeast;
+    kernelModuleMakeFlags = self.kernel.commonMakeFlags ++ [
+      "KBUILD_OUTPUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    ];
     # Obsolete aliases (these packages do not depend on the kernel).
     inherit (pkgs) odp-dpdk pktgen; # added 2018-05
     inherit (pkgs) bcc bpftrace; # added 2021-12