diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 87a2515e1a31..02865fd4ff37 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1843,6 +1843,12 @@ githubId = 53097078; name = "AJ Reifsnyder"; }; + arexon = { + email = "arexonreal@gmail.com"; + github = "arexon"; + githubId = 65680034; + name = "arexon"; + }; arezvov = { email = "alex@rezvov.ru"; github = "arezvov"; diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index f29628e07d13..86278b66377e 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -123,6 +123,8 @@ - [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). diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 3a63b6d5ca2c..0a25edcda9cd 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -135,7 +135,7 @@ in 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)`). ''; }; @@ -219,7 +219,7 @@ in 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. diff --git a/nixos/modules/config/mysql.nix b/nixos/modules/config/mysql.nix index 610b03c5e372..5cbd313d4c60 100644 --- a/nixos/modules/config/mysql.nix +++ b/nixos/modules/config/mysql.nix @@ -111,7 +111,7 @@ in - `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 diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index e945e18b1f25..e262d0fb1c7e 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -46,7 +46,7 @@ let 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. ''; }; @@ -60,7 +60,7 @@ let 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. ''; }; @@ -158,7 +158,7 @@ let 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. ''; }; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 38d40e99abd6..eb3c6c1bef7c 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -204,7 +204,7 @@ let 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..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..createHome` is true."; }; cryptHomeLuks = mkOption { diff --git a/nixos/modules/config/xdg/portals/wlr.nix b/nixos/modules/config/xdg/portals/wlr.nix index 1dd1cf6c7688..076dbda7e37d 100644 --- a/nixos/modules/config/xdg/portals/wlr.nix +++ b/nixos/modules/config/xdg/portals/wlr.nix @@ -28,7 +28,7 @@ in 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. ''; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 26a2d23291bf..dd5b09d91610 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1547,6 +1547,7 @@ ./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 diff --git a/nixos/modules/programs/gamemode.nix b/nixos/modules/programs/gamemode.nix index d70419c32023..00ccfc076cef 100644 --- a/nixos/modules/programs/gamemode.nix +++ b/nixos/modules/programs/gamemode.nix @@ -26,7 +26,7 @@ in 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 '' { diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix index 574cde7e2553..69f50f6ec55f 100644 --- a/nixos/modules/programs/git.nix +++ b/nixos/modules/programs/git.nix @@ -47,7 +47,7 @@ in `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. ''; }; diff --git a/nixos/modules/programs/msmtp.nix b/nixos/modules/programs/msmtp.nix index 7a1941e0f949..11faf345388e 100644 --- a/nixos/modules/programs/msmtp.nix +++ b/nixos/modules/programs/msmtp.nix @@ -34,7 +34,7 @@ in }; description = '' Default values applied to all accounts. - See msmtp(1) for the available options. + See {manpage}`msmtp(1)` for the available options. ''; }; @@ -52,7 +52,7 @@ in 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. @@ -68,7 +68,7 @@ in 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. ''; }; }; diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index ef5bad69e934..ba3235eef7d1 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -31,7 +31,7 @@ in 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; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 6cde0c5527ad..e0834c54d91f 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1483,7 +1483,7 @@ in 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). diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index c885c25c2620..34e91f370179 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -214,7 +214,7 @@ in 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. ''; }; diff --git a/nixos/modules/services/backup/btrbk.nix b/nixos/modules/services/backup/btrbk.nix index 03cf7d08fa5a..9e39bb8ed4bb 100644 --- a/nixos/modules/services/backup/btrbk.nix +++ b/nixos/modules/services/backup/btrbk.nix @@ -163,7 +163,7 @@ in 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" @@ -181,7 +181,7 @@ in 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. ''; }; diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index e4ca2740f8e1..604f399e0088 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -23,7 +23,7 @@ in 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)` ''; }; diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 235042a143e6..83edd0df3316 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -60,8 +60,8 @@ in `"/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 @@ -86,11 +86,11 @@ in 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 diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 97019ba5cb4d..f95ee01c7503 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -227,7 +227,7 @@ in 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; }; diff --git a/nixos/modules/services/hardware/libinput.nix b/nixos/modules/services/hardware/libinput.nix index 1ef62640ecce..47f5a8db327a 100644 --- a/nixos/modules/services/hardware/libinput.nix +++ b/nixos/modules/services/hardware/libinput.nix @@ -136,7 +136,7 @@ let 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 diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 01c61a0e8147..023c0be0e2c7 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -249,7 +249,7 @@ in ]; 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. ''; }; @@ -259,7 +259,7 @@ in 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 ''; diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix index 7b2ae8e8eee4..5a459a40d800 100644 --- a/nixos/modules/services/hardware/upower.nix +++ b/nixos/modules/services/hardware/upower.nix @@ -65,7 +65,7 @@ in 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)`. ''; }; diff --git a/nixos/modules/services/home-automation/esphome.nix b/nixos/modules/services/home-automation/esphome.nix index 0673454aab89..6f06a704166f 100644 --- a/nixos/modules/services/home-automation/esphome.nix +++ b/nixos/modules/services/home-automation/esphome.nix @@ -67,7 +67,7 @@ in ]; 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. ''; diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix index cfecf9c29428..19ec7f76af8c 100644 --- a/nixos/modules/services/logging/journalwatch.nix +++ b/nixos/modules/services/logging/journalwatch.nix @@ -135,7 +135,7 @@ in 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)`. ''; }; @@ -210,7 +210,7 @@ in 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 { @@ -219,7 +219,7 @@ in 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)`. ''; }; }; diff --git a/nixos/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix index d1994c9f1b8e..fe1a562bdb0c 100644 --- a/nixos/modules/services/logging/syslogd.nix +++ b/nixos/modules/services/logging/syslogd.nix @@ -70,7 +70,7 @@ in 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)`. ''; }; diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix index e54d8893a3b6..6def179e5e10 100644 --- a/nixos/modules/services/mail/clamsmtp.nix +++ b/nixos/modules/services/mail/clamsmtp.nix @@ -43,7 +43,7 @@ in 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. ''; }; @@ -65,7 +65,7 @@ in 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. ''; }; @@ -118,7 +118,7 @@ in 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. ''; }; diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix index f5ace168b045..12d63431cd73 100644 --- a/nixos/modules/services/mail/cyrus-imap.nix +++ b/nixos/modules/services/mail/cyrus-imap.nix @@ -80,7 +80,7 @@ in 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. ''; }; @@ -194,7 +194,7 @@ in 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. ''; }; }; @@ -221,7 +221,7 @@ in 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 { diff --git a/nixos/modules/services/mail/offlineimap.nix b/nixos/modules/services/mail/offlineimap.nix index 419c84739a02..655631b1f4a1 100644 --- a/nixos/modules/services/mail/offlineimap.nix +++ b/nixos/modules/services/mail/offlineimap.nix @@ -37,13 +37,13 @@ in 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) { diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index b2fbd6ce5413..cf5d27405b7a 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -65,7 +65,7 @@ in 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. ''; }; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 75e8d8838a09..309e03266197 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -546,7 +546,7 @@ in 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)`. ''; }; @@ -631,7 +631,7 @@ in 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)`. ''; }; @@ -654,7 +654,7 @@ in List of accepted local users. Specify a bare username, an `"@domain.tld"` wild-card, or a complete `"user@domain.tld"` 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. ''; @@ -664,7 +664,7 @@ in 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)`. ''; }; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index 7ce9d40a912a..d655839162b1 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -119,7 +119,7 @@ in 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; @@ -170,12 +170,12 @@ in 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)`)"; }; }; }; diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index cdb6d606d57e..e258fb20b7ea 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -49,7 +49,7 @@ in ''' ''; 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)`. ''; }; diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix index 75a323332f36..5f64493cde0f 100644 --- a/nixos/modules/services/misc/gpsd.nix +++ b/nixos/modules/services/misc/gpsd.nix @@ -105,7 +105,7 @@ in ]; 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. ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix index 99cdaf81305b..c8de20be563c 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix @@ -54,7 +54,7 @@ in 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)` ''; }; diff --git a/nixos/modules/services/network-filesystems/cachefilesd.nix b/nixos/modules/services/network-filesystems/cachefilesd.nix index 6408e5949874..0c555fd60181 100644 --- a/nixos/modules/services/network-filesystems/cachefilesd.nix +++ b/nixos/modules/services/network-filesystems/cachefilesd.nix @@ -35,7 +35,7 @@ in 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."; }; }; diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index d0989253576b..15c59e8db81f 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -73,7 +73,7 @@ in }); 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 = [ diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix index 4286bc7dbd54..c3b71cb2b2ba 100644 --- a/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -117,7 +117,7 @@ in 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 { diff --git a/nixos/modules/services/networking/cgit.nix b/nixos/modules/services/networking/cgit.nix index 126070aa26cc..9c1f1bf7bf8e 100644 --- a/nixos/modules/services/networking/cgit.nix +++ b/nixos/modules/services/networking/cgit.nix @@ -146,7 +146,7 @@ in }; 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 = { @@ -165,7 +165,7 @@ in }; 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 '' diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix index 8248f2a82eb0..d03c28c9019d 100644 --- a/nixos/modules/services/networking/hylafax/options.nix +++ b/nixos/modules/services/networking/hylafax/options.nix @@ -194,7 +194,7 @@ in 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" = { @@ -299,7 +299,7 @@ in 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 { @@ -339,7 +339,7 @@ in 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 { @@ -356,7 +356,7 @@ in `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 { diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 8363f7950147..3846c8d29a13 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -12,7 +12,7 @@ in { 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; diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix index 5b2009e04915..491a34699d2a 100644 --- a/nixos/modules/services/networking/ngircd.nix +++ b/nixos/modules/services/networking/ngircd.nix @@ -29,7 +29,7 @@ in 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; }; diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix index d8b4b86a2651..a4b718864d37 100644 --- a/nixos/modules/services/networking/ntopng.nix +++ b/nixos/modules/services/networking/ntopng.nix @@ -58,7 +58,7 @@ in 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 diff --git a/nixos/modules/services/networking/pppd.nix b/nixos/modules/services/networking/pppd.nix index b4ea3e213f88..a21ff203fea0 100644 --- a/nixos/modules/services/networking/pppd.nix +++ b/nixos/modules/services/networking/pppd.nix @@ -53,7 +53,7 @@ in 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."; }; }; } diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index 145eee919736..9c9353f175e9 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -114,7 +114,7 @@ in 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. ::: ''; diff --git a/nixos/modules/services/networking/r53-ddns.nix b/nixos/modules/services/networking/r53-ddns.nix index 9b4fa4c52672..6ca8499fe7e6 100644 --- a/nixos/modules/services/networking/r53-ddns.nix +++ b/nixos/modules/services/networking/r53-ddns.nix @@ -45,7 +45,7 @@ in 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)` ''; }; diff --git a/nixos/modules/services/networking/robustirc-bridge.nix b/nixos/modules/services/networking/robustirc-bridge.nix index 8bd7b12a9d71..36f9b4b46e0c 100644 --- a/nixos/modules/services/networking/robustirc-bridge.nix +++ b/nixos/modules/services/networking/robustirc-bridge.nix @@ -13,7 +13,7 @@ in 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" ]; diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix index e7814e7cdee5..bfa6716c3682 100644 --- a/nixos/modules/services/networking/rpcbind.nix +++ b/nixos/modules/services/networking/rpcbind.nix @@ -16,7 +16,7 @@ with lib; 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`. ''; }; diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 0a3b104ede20..7ad76026a03c 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -56,7 +56,7 @@ in 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. diff --git a/nixos/modules/services/networking/spacecookie.nix b/nixos/modules/services/networking/spacecookie.nix index 0e37b6d0305e..1a188bb9db21 100644 --- a/nixos/modules/services/networking/spacecookie.nix +++ b/nixos/modules/services/networking/spacecookie.nix @@ -53,7 +53,7 @@ in { 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)`. ''; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 26ca39f73d39..ddab9f24b0b8 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -357,7 +357,7 @@ in 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. ''; }; @@ -369,7 +369,7 @@ in # 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. diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix index 2c44ad49296d..5fe42ffcd1f8 100644 --- a/nixos/modules/services/networking/tinydns.nix +++ b/nixos/modules/services/networking/tinydns.nix @@ -16,7 +16,7 @@ with lib; 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 { diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index d4d2fe4689dc..d6df560c9974 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -53,7 +53,7 @@ in 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. ''; }; @@ -74,7 +74,7 @@ in 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. ''; }; @@ -105,7 +105,7 @@ in 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. ''; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 4d44ee56becd..397b11c3e013 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -181,7 +181,7 @@ in 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"`. diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix index 0c51a5118bbd..ebf733c1c6d5 100644 --- a/nixos/modules/services/web-apps/cloudlog.nix +++ b/nixos/modules/services/web-apps/cloudlog.nix @@ -173,7 +173,7 @@ in 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. ''; }; @@ -191,7 +191,7 @@ in 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. ''; }; @@ -210,7 +210,7 @@ in 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. ''; }; @@ -228,7 +228,7 @@ in 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. ''; }; @@ -247,7 +247,7 @@ in 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. ''; }; @@ -266,7 +266,7 @@ in 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. ''; }; @@ -284,7 +284,7 @@ in 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. ''; }; @@ -302,7 +302,7 @@ in 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. ''; }; diff --git a/nixos/modules/services/web-apps/dex.nix b/nixos/modules/services/web-apps/dex.nix index f23e07a168cc..13af63892fe9 100644 --- a/nixos/modules/services/web-apps/dex.nix +++ b/nixos/modules/services/web-apps/dex.nix @@ -51,7 +51,7 @@ in 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. ''; diff --git a/nixos/modules/services/web-apps/gotosocial.nix b/nixos/modules/services/web-apps/gotosocial.nix index dc40fb8156f9..b1e9a46a601c 100644 --- a/nixos/modules/services/web-apps/gotosocial.nix +++ b/nixos/modules/services/web-apps/gotosocial.nix @@ -80,7 +80,7 @@ in 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. diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 8cacaa5aa330..098c920ab264 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -72,7 +72,7 @@ in 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"; }; diff --git a/nixos/modules/services/web-apps/pds.nix b/nixos/modules/services/web-apps/pds.nix new file mode 100644 index 000000000000..b17cd628c157 --- /dev/null +++ b/nixos/modules/services/web-apps/pds.nix @@ -0,0 +1,233 @@ +{ + 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 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 ]; +} diff --git a/nixos/modules/services/web-servers/merecat.nix b/nixos/modules/services/web-servers/merecat.nix index a669acaedb7e..5591407f5590 100644 --- a/nixos/modules/services/web-servers/merecat.nix +++ b/nixos/modules/services/web-servers/merecat.nix @@ -30,7 +30,7 @@ in 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"; diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index a3e1750d41be..4deedb076963 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -72,7 +72,7 @@ in 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"; }; diff --git a/nixos/modules/services/web-servers/pomerium.nix b/nixos/modules/services/web-servers/pomerium.nix index 441475f91ce6..5b65128b8d07 100644 --- a/nixos/modules/services/web-servers/pomerium.nix +++ b/nixos/modules/services/web-servers/pomerium.nix @@ -50,7 +50,7 @@ in 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. ''; }; }; diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index f35a2ba22977..e4657fff7a65 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -200,7 +200,7 @@ in ''; 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 diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix index a990c9ed5ea5..2cf0657f5e0e 100644 --- a/nixos/modules/services/x11/display-managers/startx.nix +++ b/nixos/modules/services/x11/display-managers/startx.nix @@ -27,7 +27,7 @@ in 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. ''; }; diff --git a/nixos/modules/services/x11/display-managers/sx.nix b/nixos/modules/services/x11/display-managers/sx.nix index 45ce6c383a71..7d168124e67f 100644 --- a/nixos/modules/services/x11/display-managers/sx.nix +++ b/nixos/modules/services/x11/display-managers/sx.nix @@ -18,7 +18,7 @@ in 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. diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 237d78484286..e75ec5c2019f 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -126,7 +126,7 @@ in ]; 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. ''; }; @@ -172,7 +172,7 @@ in ]; 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. ''; }; @@ -326,7 +326,7 @@ in 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)`. ''; }; }; diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index d26e41294d11..794fc3abdfeb 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -203,7 +203,7 @@ in 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`. ''; }; diff --git a/nixos/modules/system/boot/systemd/coredump.nix b/nixos/modules/system/boot/systemd/coredump.nix index 672ad62f4926..747258c006ca 100644 --- a/nixos/modules/system/boot/systemd/coredump.nix +++ b/nixos/modules/system/boot/systemd/coredump.nix @@ -29,7 +29,7 @@ in 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. ''; }; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 3b07f2222ffa..332cfc2fbb13 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -163,7 +163,7 @@ in 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. ''; }; diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix index a216219b0df7..9f3b5fb9e546 100644 --- a/nixos/modules/system/boot/systemd/logind.nix +++ b/nixos/modules/system/boot/systemd/logind.nix @@ -29,7 +29,7 @@ in 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. ''; }; diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index a2a544bf9829..b13b16f74de5 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -28,7 +28,7 @@ in `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 { @@ -42,7 +42,7 @@ in `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 { diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index 33b0a8c6324c..2c65ebcea1b0 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -99,7 +99,7 @@ in 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 '' { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 13a4eaa30990..895099052efb 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -97,7 +97,7 @@ let 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 @@ -118,7 +118,7 @@ let 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` diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 741828c7468a..76f91c71fa59 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -34,7 +34,7 @@ in 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)`. ''; }; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index fe0fca58c440..5f43e3322340 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -349,7 +349,7 @@ let 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.''; }; }; @@ -563,7 +563,7 @@ in 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. ''; }; @@ -644,7 +644,7 @@ in shall run in. The specified path should refer to a (possibly bind-mounted) network namespace file, as exposed by the kernel below /proc//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=. ''; @@ -737,7 +737,7 @@ in 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. ''; }; @@ -747,7 +747,7 @@ in 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. ''; }; diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 89e2b7e0f863..642e3a5e6d76 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -155,7 +155,7 @@ let [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. ''; }; diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix index afdcfd6ebe35..55d9da027fe9 100644 --- a/nixos/modules/virtualisation/waagent.nix +++ b/nixos/modules/virtualisation/waagent.nix @@ -151,7 +151,7 @@ let ]; 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. ''; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 93115adf7efe..384371033c72 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -810,6 +810,7 @@ in { 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 {}; diff --git a/nixos/tests/pds.nix b/nixos/tests/pds.nix new file mode 100644 index 000000000000..4c4ab2a64326 --- /dev/null +++ b/nixos/tests/pds.nix @@ -0,0 +1,29 @@ +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 ]; + } +) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6cf9976d9c6f..39b00d195e16 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1302,6 +1302,18 @@ final: prev: 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"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4ebe4530e035..d3e516ef2402 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -105,6 +105,7 @@ https://github.com/max397574/better-escape.nvim/,, 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, diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index b5487fa68c45..5ef0048324a4 100644 --- a/pkgs/applications/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -14,7 +15,7 @@ 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)" ]; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 6bea8db998b7..b48ff429f651 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ 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; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json index b13c07a45602..6bb07afcc405 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.json +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json @@ -281,8 +281,8 @@ }, { "pname": "Markdig.Signed", - "version": "0.38.0", - "hash": "sha256-yhO/GFoKdE/Z9SZPyGFe7DlnSd8dcAohqJNFqSqKLnk=" + "version": "0.39.1", + "hash": "sha256-jofkP6JUp4xuUjJ6B6+HDfBJ3+V2vgECt2CWmFq62k4=" }, { "pname": "Microsoft.ApplicationInsights", @@ -296,13 +296,13 @@ }, { "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", @@ -446,8 +446,8 @@ }, { "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", @@ -461,38 +461,38 @@ }, { "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", @@ -501,23 +501,23 @@ }, { "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", @@ -574,11 +574,6 @@ "version": "1.10.0", "hash": "sha256-ZSpQFnNgkk3dO8Q7yokJ/VSl4wp5PuIv9nduxgC6UxU=" }, - { - "pname": "OpenTelemetry.Api", - "version": "1.9.0", - "hash": "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4=" - }, { "pname": "OpenTelemetry.Api.ProviderBuilderExtensions", "version": "1.10.0", @@ -601,8 +596,8 @@ }, { "pname": "OpenTelemetry.Instrumentation.AspNetCore", - "version": "1.9.0", - "hash": "sha256-XYqa7kV4rhHPCgHsjQtMvyKCemW1OvQd/23QhjquYR4=" + "version": "1.10.1", + "hash": "sha256-HqMFDpFsMaPlgyFt1MU3Un+BysEoj5qPc8HVxTlt0mE=" }, { "pname": "OpenTelemetry.Instrumentation.Http", @@ -611,8 +606,8 @@ }, { "pname": "OpenTelemetry.Instrumentation.Runtime", - "version": "1.9.0", - "hash": "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk=" + "version": "1.10.0", + "hash": "sha256-cCTYKxHh1Qzu8X51B8gGsrxwKhVSqJfiql/+o4TWrwg=" }, { "pname": "protobuf-net", @@ -631,28 +626,28 @@ }, { "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", @@ -699,11 +694,6 @@ "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", "version": "9.0.0", diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 28e4be38989c..6d0c35262370 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -7,7 +7,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "c316254ddaf7837e7d43145268b53f91f23027dc"; + version = "6be24065cd4904389d94140f4ed1f6738b1f7fbb"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -15,10 +15,10 @@ buildNpmPackage rec { # 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 diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 0f142cdd3fa0..b7b1bfa5eb99 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -11,6 +11,8 @@ curl=( --location --max-redirs 20 --retry 3 + --retry-all-errors + --continue-at - --disable-epsv --cookie-jar cookies --user-agent "curl/$curlVersion Nixpkgs/$nixpkgsVersion" diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index c872896c4105..1acc6d4c305d 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -1,12 +1,12 @@ { 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 ]; diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index 35ee4312ed45..ecbb57067082 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -35,7 +35,7 @@ let 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; }) @@ -57,9 +57,9 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant then - "sha256-yLlvl/zm/epNs1e4sSDrfHNApcpPQV2fMF3Y09ml7is=" + "sha256-aAKE+AY/a2XjVzdU0VXT3ekFrTp3rO6zUd7pRTTDc9E=" else - "sha256-ssX1ffB7ZSJObETQa2r5R4oHddAccC4GB14jaLs8bGg="; + "sha256-CCr4/h0W1fhzUT4o6WyX2hBodzy9iqVLZwzdplzq9SI="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index 60a237b3d185..2c4ba6303308 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: 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 = [ diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index 1d96209ed89d..ee18b7fa34a5 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -29,7 +29,7 @@ buildGoModule rec { doInstallCheck = true; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { extraArgs = [ "--version-regex=v(8\..*)" ]; }; }; meta = { diff --git a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch b/pkgs/by-name/go/golden-cheetah/0001-Fix-building-with-bison-3.7.patch similarity index 100% rename from pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch rename to pkgs/by-name/go/golden-cheetah/0001-Fix-building-with-bison-3.7.patch diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/by-name/go/golden-cheetah/package.nix similarity index 59% rename from pkgs/applications/misc/golden-cheetah/default.nix rename to pkgs/by-name/go/golden-cheetah/package.nix index 7888db1a27d6..4d65093d2762 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/by-name/go/golden-cheetah/package.nix @@ -1,25 +1,16 @@ { lib, + stdenv, fetchFromGitHub, nix-update-script, - mkDerivation, - qtbase, - qtsvg, - qtserialport, - qtwebengine, - qtmultimedia, - qttools, - qtconnectivity, - qtcharts, + qt6, libusb-compat-0_1, gsl, blas, bison, flex, zlib, - qmake, makeDesktopItem, - wrapQtAppsHook, }: let @@ -33,37 +24,45 @@ let categories = [ "Utility" ]; }; in -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "golden-cheetah"; version = "3.7-DEV2408"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; - tag = "v${version}"; + tag = "v${finalAttrs.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 - ]; + 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 @@ -84,30 +83,41 @@ mkDerivation rec { 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,^#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 = '' - runHook preInstall + 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 + 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 - ''; + 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 = lib.platforms.linux; + platforms = with lib.platforms; darwin ++ linux; maintainers = with lib.maintainers; [ adamcstephens ]; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix index 01abb4b7eb2f..fe82a1c51c67 100644 --- a/pkgs/by-name/na/narsil/package.nix +++ b/pkgs/by-name/na/narsil/package.nix @@ -14,13 +14,13 @@ }: 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" ]; }; diff --git a/pkgs/by-name/ne/netrw/package.nix b/pkgs/by-name/ne/netrw/package.nix index 4d89650f29ef..0c2f072f190d 100644 --- a/pkgs/by-name/ne/netrw/package.nix +++ b/pkgs/by-name/ne/netrw/package.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { 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}" ]; diff --git a/pkgs/by-name/pd/pds/package.nix b/pkgs/by-name/pd/pds/package.nix new file mode 100644 index 000000000000..4dbe0e355763 --- /dev/null +++ b/pkgs/by-name/pd/pds/package.nix @@ -0,0 +1,97 @@ +{ + 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"; + }; +}) diff --git a/pkgs/by-name/pd/pdsadmin/package.nix b/pkgs/by-name/pd/pdsadmin/package.nix new file mode 100644 index 000000000000..60a045fdc5fe --- /dev/null +++ b/pkgs/by-name/pd/pdsadmin/package.nix @@ -0,0 +1,58 @@ +{ + 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"; + }; +}) diff --git a/pkgs/by-name/pd/pdsadmin/pdsadmin-offline.patch b/pkgs/by-name/pd/pdsadmin/pdsadmin-offline.patch new file mode 100644 index 000000000000..0b3fbee916c3 --- /dev/null +++ b/pkgs/by-name/pd/pdsadmin/pdsadmin-offline.patch @@ -0,0 +1,24 @@ +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}" "$@" diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 2fa08c051740..6c335cf07344 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -17,11 +17,11 @@ 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 = [ diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 93e811dfb4b3..97410aeaa8e1 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ 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 = [ diff --git a/pkgs/by-name/ra/rastertoezpl/package.nix b/pkgs/by-name/ra/rastertoezpl/package.nix new file mode 100644 index 000000000000..58a037ab2929 --- /dev/null +++ b/pkgs/by-name/ra/rastertoezpl/package.nix @@ -0,0 +1,38 @@ +{ + 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; + }; +}) diff --git a/pkgs/by-name/re/regolith/package.nix b/pkgs/by-name/re/regolith/package.nix new file mode 100644 index 000000000000..c1ee41899751 --- /dev/null +++ b/pkgs/by-name/re/regolith/package.nix @@ -0,0 +1,43 @@ +{ + 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"; + }; +} diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index fd9e1b5e97ee..3ca112a8cf4f 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -7,11 +7,11 @@ fetchurl, makeDesktopItem, copyDesktopItems, + libarchive, imagemagick, runCommand, libgcc, wxGTK32, - innoextract, libGL, SDL2, openal, @@ -39,27 +39,21 @@ let 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 = { @@ -92,7 +86,6 @@ stdenv.mkDerivation { lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems autoPatchelfHook - imagemagick ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg @@ -111,24 +104,44 @@ stdenv.mkDerivation { 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 diff --git a/pkgs/by-name/ut/ut1999/ut1999.svg b/pkgs/by-name/ut/ut1999/ut1999.svg new file mode 100644 index 000000000000..6678793b2080 --- /dev/null +++ b/pkgs/by-name/ut/ut1999/ut1999.svg @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 118f84900d9c..bcdbaa465213 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ 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; diff --git a/pkgs/by-name/wo/wownero/package.nix b/pkgs/by-name/wo/wownero/package.nix index 9b658084b87b..5933810851dd 100644 --- a/pkgs/by-name/wo/wownero/package.nix +++ b/pkgs/by-name/wo/wownero/package.nix @@ -5,7 +5,7 @@ fetchFromGitea, cmake, python3, - boost, + boost186, libsodium, openssl, rapidjson, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = [ - boost + boost186 libsodium openssl rapidjson diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 15a348ddf421..00f9aa271c2c 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -2,20 +2,24 @@ 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}"; diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index ae190e9102a4..419af98804aa 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -2,23 +2,28 @@ 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}"; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index adf86483ef62..ae2750caf8cd 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { version = "5.5.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "altair-viz"; @@ -60,6 +60,11 @@ buildPythonPackage rec { 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 = [ diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 1db7d3e429dc..3e544760d2fd 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -22,14 +22,14 @@ 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 = [ diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 7c83e9be3a12..c649bf57f04f 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -95,6 +95,8 @@ buildPythonPackage rec { ] ++ 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" ]; @@ -150,6 +152,7 @@ buildPythonPackage rec { ] ++ 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" diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index dbab34993a5c..c8ada5b43e31 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -89,11 +89,12 @@ buildPythonPackage rec { "test_binary_logit_log_likelihood" # AssertionError (flaky numerical tests) - "test_logreg_with_intercept_manual_loop3" - "test_inv_hessian_product_pytree3" - "test_multiclass_logreg6" "test_Rosenbrock2" "test_Rosenbrock5" + "test_gradient1" + "test_inv_hessian_product_pytree3" + "test_logreg_with_intercept_manual_loop3" + "test_multiclass_logreg6" ]; meta = { diff --git a/pkgs/development/python-modules/pyedflib/default.nix b/pkgs/development/python-modules/pyedflib/default.nix index a83fe89795b0..00552dd9eceb 100644 --- a/pkgs/development/python-modules/pyedflib/default.nix +++ b/pkgs/development/python-modules/pyedflib/default.nix @@ -14,14 +14,14 @@ 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 = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index f83e95786870..096f077ae7b2 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ 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 ]; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 2bce3881edca..504b713b908d 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index cd2022097d51..ffbdf880efa8 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/amneziawg/default.nix b/pkgs/os-specific/linux/amneziawg/default.nix index 9e21f4176b55..1f60be0fb0fb 100644 --- a/pkgs/os-specific/linux/amneziawg/default.nix +++ b/pkgs/os-specific/linux/amneziawg/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, srcOnly, kernel, + kernelModuleMakeFlags, nix-update-script, }: @@ -28,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; 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}"; diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 1e46fbb9121a..0a1c392700b9 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, nixosTests, }: @@ -23,7 +24,7 @@ stdenv.mkDerivation { 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)" diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 14ee2a8db539..653769aa8a9b 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, kernel, + kernelModuleMakeFlags, }: let @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index bdf71c470725..eab7eb5a1d93 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchpatch, kernel, + kernelModuleMakeFlags, runtimeShell, }: @@ -41,7 +42,7 @@ stdenv.mkDerivation { --replace "/lib/modules" "${kernel.dev}/lib/modules" ''; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; installPhase = '' mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 9e348e78e315..b01cb541f446 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, fetchFromGitHub, }: @@ -18,7 +19,7 @@ stdenv.mkDerivation { sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index eee504a0633d..7e8e7d3f6982 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel ? false, + kernelModuleMakeFlags ? [], }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +20,7 @@ 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)" diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index cfe8b16da956..29f7fe8b5d02 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitLab, kernel, + kernelModuleMakeFlags, fetchpatch, }: @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { --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}" diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 3262b1d0c1c1..e94ae1646dfa 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -33,7 +34,7 @@ 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"}" diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index 6db752a885b6..72938768fb01 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -3,6 +3,7 @@ stdenv, fetchzip, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/os-specific/linux/drbd/driver.nix index a76758fbdb8e..c2e81f7864c8 100644 --- a/pkgs/os-specific/linux/drbd/driver.nix +++ b/pkgs/os-specific/linux/drbd/driver.nix @@ -3,6 +3,7 @@ lib, fetchurl, kernel, + kernelModuleMakeFlags, nixosTests, flex, coccinelle, @@ -29,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KVER=${kernel.version}" "INSTALL_MOD_PATH=${placeholder "out"}" diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 40e22d2008fc..c812eac392fa 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, gitUpdater, kernel, + kernelModuleMakeFlags, }: let rev-prefix = "ena_linux_"; @@ -23,7 +24,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 8703fb9010ac..a3a0d3629f52 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, libdrm, python3, }: @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { python3WithLibs ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/fanout/default.nix b/pkgs/os-specific/linux/fanout/default.nix index 99ee011fcf8e..36b2bef05ebc 100644 --- a/pkgs/os-specific/linux/fanout/default.nix +++ b/pkgs/os-specific/linux/fanout/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, kmod, nixosTests, }: @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix index 4bb8f4f0e79e..6f3edcd7d3a9 100644 --- a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix +++ b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, fetchFromGitHub, unstableGitUpdater, }: @@ -19,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index 7caafe491ab2..76326198b8be 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -3,6 +3,7 @@ stdenv, fwts, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index 43bcd899742c..0be0a18024a1 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchpatch2, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { cd src ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(PWD)" diff --git a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix index adac60eb2489..d621bf282f6f 100644 --- a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix +++ b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, kmod, }: @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/hid-ite8291r3/default.nix b/pkgs/os-specific/linux/hid-ite8291r3/default.nix index 5f24fda01d9e..e3d4fc23c620 100644 --- a/pkgs/os-specific/linux/hid-ite8291r3/default.nix +++ b/pkgs/os-specific/linux/hid-ite8291r3/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "VERSION=${version}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/hid-t150/default.nix b/pkgs/os-specific/linux/hid-t150/default.nix index 74a254b6e22f..dd96c044c99f 100644 --- a/pkgs/os-specific/linux/hid-t150/default.nix +++ b/pkgs/os-specific/linux/hid-t150/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -21,7 +22,7 @@ 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"}" ]; diff --git a/pkgs/os-specific/linux/hid-tmff2/default.nix b/pkgs/os-specific/linux/hid-tmff2/default.nix index 3784746ca9d3..e74cde0a254b 100644 --- a/pkgs/os-specific/linux/hid-tmff2/default.nix +++ b/pkgs/os-specific/linux/hid-tmff2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel, kernelModuleMakeFlags }: stdenv.mkDerivation { pname = "hid-tmff2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix index 0be218282d2c..c7aaa3789d6d 100644 --- a/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, ivsc-driver, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/ithc/default.nix b/pkgs/os-specific/linux/ithc/default.nix index 0ede651706bc..9f721bfae939 100644 --- a/pkgs/os-specific/linux/ithc/default.nix +++ b/pkgs/os-specific/linux/ithc/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "VERSION=${version}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/ivsc-driver/default.nix b/pkgs/os-specific/linux/ivsc-driver/default.nix index 93ce524672a2..b52e21344c73 100644 --- a/pkgs/os-specific/linux/ivsc-driver/default.nix +++ b/pkgs/os-specific/linux/ivsc-driver/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation { @@ -18,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index e1d892d33fd0..0af71b24ac95 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, nixosTests, }: @@ -22,7 +23,7 @@ stdenv.mkDerivation { 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"}" ]; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 0b5e64dd6d4d..8ef763d87214 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -434,28 +434,26 @@ let "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; }) + ] +)) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index c5228f4aca2b..2f4cb169c338 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -4,6 +4,7 @@ fetchurl, fetchpatch, kernel, + kernelModuleMakeFlags, elfutils, python3, perl, @@ -101,7 +102,7 @@ stdenv.mkDerivation { "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"; diff --git a/pkgs/os-specific/linux/lenovo-legion/default.nix b/pkgs/os-specific/linux/lenovo-legion/default.nix index ef1acb055077..006d929bd8a3 100644 --- a/pkgs/os-specific/linux/lenovo-legion/default.nix +++ b/pkgs/os-specific/linux/lenovo-legion/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, bash, lenovo-legion, }: @@ -18,7 +19,7 @@ stdenv.mkDerivation { sed -i -e '/depmod/d' ./Makefile ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "SHELL=bash" "KERNELVERSION=${kernel.modDirVersion}" "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/lkrg/default.nix b/pkgs/os-specific/linux/lkrg/default.nix index 760e08d4cbbf..2a3c09ff5c96 100644 --- a/pkgs/os-specific/linux/lkrg/default.nix +++ b/pkgs/os-specific/linux/lkrg/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: let isKernelRT = @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNEL=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 75421fed139e..846c5ae0beff 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -22,7 +23,7 @@ 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"}" ]; diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 2b4acd172bbb..46c149854c47 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -1,6 +1,7 @@ { fetchFromGitHub, kernel, + kernelModuleMakeFlags, lib, stdenv, }: @@ -21,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix index 388777c1f6f7..717f680ab088 100644 --- a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix +++ b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, fetchFromGitHub, }: @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; buildPhase = '' make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ diff --git a/pkgs/os-specific/linux/msi-ec/default.nix b/pkgs/os-specific/linux/msi-ec/default.nix index d73eae69a05b..f21be652c5ad 100644 --- a/pkgs/os-specific/linux/msi-ec/default.nix +++ b/pkgs/os-specific/linux/msi-ec/default.nix @@ -5,6 +5,7 @@ linuxPackages, git, kernel ? linuxPackages.kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation { pname = "msi-ec-kmods"; @@ -23,7 +24,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix index 0ce131315b71..75ad6034fbd9 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kernel, kmod, mstflint }: +{ lib, stdenv, fetchurl, kernel, kmod, mstflint, kernelModuleMakeFlags }: stdenv.mkDerivation rec { pname = "mstflint_access"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KVER=${kernel.modDirVersion}" "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix index 218f7f0eb8d0..eadcb88e9c7a 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, nix-update-script, }: @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index e116f0925712..4dc26015f0b8 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, kernel, + kernelModuleMakeFlags, kmod, zlib, }: @@ -48,7 +49,7 @@ stdenv.mkDerivation { 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} diff --git a/pkgs/os-specific/linux/nullfs/default.nix b/pkgs/os-specific/linux/nullfs/default.nix index 5b6a5517d6de..db2c52d6c068 100644 --- a/pkgs/os-specific/linux/nullfs/default.nix +++ b/pkgs/os-specific/linux/nullfs/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { pname = "nullfs"; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index edb99de0e407..d9d66ab84ba1 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -42,6 +42,7 @@ fetchurl, fetchzip, kernel ? null, + kernelModuleMakeFlags ? [], perl, nukeReferences, which, @@ -205,7 +206,7 @@ let 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" diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix index e0e1c0b33ab8..6d27b4dd0b98 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, nvidia_x11, hash, patches ? [ ], @@ -25,7 +26,7 @@ stdenv.mkDerivation ( 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}" diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 1d80b27c84fd..e6af64c8ebda 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -2,6 +2,7 @@ coreutils, fetchFromGitHub, kernel, + kernelModuleMakeFlags, stdenv, lib, util-linux, @@ -20,7 +21,7 @@ stdenv.mkDerivation ( nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/qc71_laptop/default.nix b/pkgs/os-specific/linux/qc71_laptop/default.nix index 72a0c7db798e..e6e51938518b 100644 --- a/pkgs/os-specific/linux/qc71_laptop/default.nix +++ b/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "VERSION=${version}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 7403f6d2ef86..f84b8a294717 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel, kernelModuleMakeFlags }: let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/r8168"; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { # 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" diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index 33fbd30fd2bb..561b7ca72e14 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bc, nukeReferences, }: @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { 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=" diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 4a98cd915276..cb6c7fe94cf9 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bc, }: @@ -25,7 +26,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index a29075695896..dd8968e0f541 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation { @@ -17,7 +18,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 8715a71652a5..d3ceefef0027 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bc, }: @@ -20,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 70f2b9f572c2..063c50e7c25b 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bc, }: @@ -20,7 +21,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 119795f2c3aa..5940e90a3abc 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bc, }: @@ -20,7 +21,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index 0c830c34cd29..70c36a670bc9 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: let @@ -20,7 +21,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix index 8e90bcf9f08d..4d45b8695881 100644 --- a/pkgs/os-specific/linux/rtw89/default.nix +++ b/pkgs/os-specific/linux/rtw89/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: let @@ -20,7 +21,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix index 61c807be3911..5f0d646e3f27 100644 --- a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix +++ b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, unstableGitUpdater, }: kernel.stdenv.mkDerivation { @@ -17,7 +18,7 @@ kernel.stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index aed568556714..acc7ab0b340a 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -1,6 +1,7 @@ { lib, kernel, + kernelModuleMakeFlags, stdenv, fetchFromGitea, libgcrypt, @@ -22,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt lvm2 ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix index fe721e2912fd..9b3b04753458 100644 --- a/pkgs/os-specific/linux/tmon/default.nix +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, ncurses, }: @@ -17,7 +18,7 @@ stdenv.mkDerivation { cd tools/thermal/tmon ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ]; diff --git a/pkgs/os-specific/linux/trelay/default.nix b/pkgs/os-specific/linux/trelay/default.nix index 4b9684bcbbc5..ec2155ea213f 100644 --- a/pkgs/os-specific/linux/trelay/default.nix +++ b/pkgs/os-specific/linux/trelay/default.nix @@ -3,6 +3,7 @@ lib, fetchgit, kernel, + kernelModuleMakeFlags, kmod, }: let @@ -30,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { cp '${./Makefile}' Makefile ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" diff --git a/pkgs/os-specific/linux/tsme-test/default.nix b/pkgs/os-specific/linux/tsme-test/default.nix index 8f47dbe9f652..a88db395cd4f 100644 --- a/pkgs/os-specific/linux/tsme-test/default.nix +++ b/pkgs/os-specific/linux/tsme-test/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation { @@ -18,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index 1fd18d36f56f..9c80d1dc7767 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitLab, kernel, + kernelModuleMakeFlags, kmod, pahole, }: @@ -22,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { 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"}" diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 104c0c687f1b..6ea951876d0a 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel, kmod }: +{ lib, stdenv, fetchFromGitHub, kernel, kmod, kernelModuleMakeFlags }: let version = "0.13.2"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation { outputs = [ "out" "bin" ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix index 55b1cf931d70..55ce63db7902 100644 --- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ kernel ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index 5c5fda8b8d13..6e8a6cea95f7 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel, kernelModuleMakeFlags }: stdenv.mkDerivation rec { name = "virtio_vmmci"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CONFIG_RTC_HCTOSYS yes ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "DEPMOD=echo" "INSTALL_MOD_PATH=$(out)" "KERNELRELEASE=${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix index 5d5bac541f47..11242fccbc95 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { CONFIG_RTC_HCTOSYS yes ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "DEPMOD=echo" "INSTALL_MOD_PATH=$(out)" "KERNELRELEASE=${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index eefe8b139b0a..70f1ef00cad7 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bluez, nixosTests, nix-update-script, @@ -26,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ bluez ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/zenergy/default.nix b/pkgs/os-specific/linux/zenergy/default.nix index 2a737fb34f57..d78c02e0dd2d 100644 --- a/pkgs/os-specific/linux/zenergy/default.nix +++ b/pkgs/os-specific/linux/zenergy/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, kmod, }: @@ -27,7 +28,7 @@ stdenv.mkDerivation { "pic" ]; - makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernelDirectory}" ]; + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernelDirectory}" ]; installTargets = [ "modules_install" ]; diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 690baaa5c510..31742d4f7cb9 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -34,6 +34,7 @@ let # Kernel dependencies kernel ? null, + kernelModuleMakeFlags ? [ ], enablePython ? true, ... }@outerArgs: @@ -191,10 +192,10 @@ let "--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; @@ -264,6 +265,7 @@ let 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; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix index c665e7f3a2cc..f046c21aecca 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix @@ -6,16 +6,16 @@ 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"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d44115464f36..2f94c2b1335b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -155,8 +155,8 @@ in lib.makeExtensible (self: ({ }; 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"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c720fde1abe..03a96ac4a5d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14775,10 +14775,6 @@ with pkgs; 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 { }; @@ -18189,8 +18185,6 @@ with pkgs; 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; }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 966106374799..73bc798aadb7 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -322,6 +322,9 @@ in { # 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