···606606607607 in
608608 # TODO: As discussed in #356502, deprecated functionality should be removed sometime after 25.11.
609609- lib.warnIf (!escape && lib.oldestSupportedReleaseIsAtLeast 2505) "Using `lib.generators.toPlist` without `escape = true` is deprecated"
610610- ''<?xml version="1.0" encoding="UTF-8"?>
611611-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
612612-<plist version="1.0">
613613-${expr "" v}
614614-</plist>'';
609609+ lib.warnIf (!escape && lib.oldestSupportedReleaseIsAtLeast 2505) "Using `lib.generators.toPlist` without `escape = true` is deprecated" ''
610610+ <?xml version="1.0" encoding="UTF-8"?>
611611+ <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
612612+ <plist version="1.0">
613613+ ${expr "" v}
614614+ </plist>'';
615615616616 /**
617617 Translate a simple Nix expression to Dhall notation.
+2-2
lib/lists.nix
···17481748 ```
17491749 :::
17501750 */
17511751- crossLists = warn
17521752- ''lib.crossLists is deprecated, use lib.mapCartesianProduct instead.
17511751+ crossLists = warn ''
17521752+ lib.crossLists is deprecated, use lib.mapCartesianProduct instead.
1753175317541754 For example, the following function call:
17551755
+1-1
lib/meta.nix
···475475 "lib.meta.getExe': The first argument is of type ${typeOf x}, but it should be a derivation instead.";
476476 assert assertMsg (isString y)
477477 "lib.meta.getExe': The second argument is of type ${typeOf y}, but it should be a string instead.";
478478- assert assertMsg (match ".*\/.*" y == null)
478478+ assert assertMsg (match ".*/.*" y == null)
479479 "lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead.";
480480 "${getBin x}/bin/${y}";
481481}
+1-1
lib/options.nix
···426426 # If the part is a named placeholder of the form "<...>" don't escape it.
427427 # It may cause misleading escaping if somebody uses literally "<...>" in their option names.
428428 # This is the trade-off to allow for placeholders in option names.
429429- isNamedPlaceholder = builtins.match "\<(.*)\>";
429429+ isNamedPlaceholder = builtins.match "<(.*)>";
430430 escapeOptionPart = part:
431431 if part == "*" || isNamedPlaceholder part != null
432432 then part
···211211 masterAuth = lib.mkOption {
212212 type = with types; nullOr str;
213213 default = null;
214214- description = ''If the master is password protected (using the requirePass configuration)
214214+ description = ''
215215+ If the master is password protected (using the requirePass configuration)
215216 it is possible to tell the slave to authenticate before starting the replication synchronization
216217 process, otherwise the master will refuse the slave request.
217218 (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)'';
···9393 # The idea is to match everything that looks like `$term =`
9494 # but not `# $term something something`
9595 # or `# $term = some value` because those are comments.
9696- configContainsSetting = lines: term: (match "^[^#]*\b${term}\b.*=" lines) != null;
9696+ configContainsSetting = lines: term: (match "[[:blank:]]*${term}[[:blank:]]*=.*" lines) != null;
97979898 warnAboutExtraConfigCollisions = map mkExtraConfigCollisionWarning (
9999 filter (configContainsSetting cfg.extraConfig) automaticallySetPluginSettings
+4-3
nixos/modules/services/misc/gitlab.nix
···10801080 warnings = [
10811081 (mkIf
10821082 (cfg.registry.enable && versionAtLeast (getVersion cfg.packages.gitlab) "16.0.0" && cfg.registry.package == pkgs.docker-distribution)
10831083- ''Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.
10831083+ ''
10841084+ Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.
10841085 Please back up your data and migrate to the gitlab-container-registry package.''
10851086 )
10861087 (mkIf
10871087- (versionAtLeast (getVersion cfg.packages.gitlab) "16.2.0" && versionOlder (getVersion cfg.packages.gitlab) "16.5.0")
10881088- ''GitLab instances created or updated between versions [15.11.0, 15.11.2] have an incorrect database schema.
10881088+ (versionAtLeast (getVersion cfg.packages.gitlab) "16.2.0" && versionOlder (getVersion cfg.packages.gitlab) "16.5.0") ''
10891089+ GitLab instances created or updated between versions [15.11.0, 15.11.2] have an incorrect database schema.
10891090 Check the upstream documentation for a workaround: https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#undefined-column-error-upgrading-to-162-or-later''
10901091 )
10911092 ];
+1-1
nixos/modules/services/misc/snapper.nix
···3636 };
37373838 intOrNumberOrRange = lib.types.either lib.types.ints.unsigned (
3939- lib.types.strMatching "[[:digit:]]+(\-[[:digit:]]+)?"
3939+ lib.types.strMatching "[[:digit:]]+(-[[:digit:]]+)?"
4040 // {
4141 description = "string containing either a number or a range";
4242 descriptionClass = "conjunction";
···119119 MAX 0.5 144 7200
120120 MIN 0.5 144 7200
121121 '';
122122- description = ''Configure the ping frequency and retention of the rrd files.
122122+ description = ''
123123+ Configure the ping frequency and retention of the rrd files.
123124 Once set, changing the interval will require deletion or migration of all
124125 the collected data.'';
125126 };
···194194 allowedIPs = mkOption {
195195 example = [ "10.192.122.3/32" "10.192.124.1/24" ];
196196 type = with types; listOf str;
197197- description = ''List of IP (v4 or v6) addresses with CIDR masks from
197197+ description = ''
198198+ List of IP (v4 or v6) addresses with CIDR masks from
198199 which this peer is allowed to send incoming traffic and to which
199200 outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may
200201 be specified for matching all IPv4 addresses, and ::/0 may be specified
···205206 default = null;
206207 example = "demo.wireguard.io:12913";
207208 type = with types; nullOr str;
208208- description = ''Endpoint IP or hostname of the peer, followed by a colon,
209209+ description = ''
210210+ Endpoint IP or hostname of the peer, followed by a colon,
209211 and then a port number of the peer.'';
210212 };
211213···213215 default = null;
214216 type = with types; nullOr int;
215217 example = 25;
216216- description = ''This is optional and is by default off, because most
218218+ description = ''
219219+ This is optional and is by default off, because most
217220 users will not need it. It represents, in seconds, between 1 and 65535
218221 inclusive, how often to send an authenticated empty packet to the peer,
219222 for the purpose of keeping a stateful firewall or NAT mapping valid
+8-4
nixos/modules/services/networking/wireguard.nix
···127127 default = null;
128128 type = with types; nullOr str;
129129 example = "container";
130130- description = ''The pre-existing network namespace in which the
130130+ description = ''
131131+ The pre-existing network namespace in which the
131132 WireGuard interface is created, and which retains the socket even if the
132133 interface is moved via {option}`interfaceNamespace`. When
133134 `null`, the interface is created in the init namespace.
···139140 default = null;
140141 type = with types; nullOr str;
141142 example = "init";
142142- description = ''The pre-existing network namespace the WireGuard
143143+ description = ''
144144+ The pre-existing network namespace the WireGuard
143145 interface is moved to. The special value `init` means
144146 the init namespace. When `null`, the interface is not
145147 moved.
···262264 allowedIPs = mkOption {
263265 example = [ "10.192.122.3/32" "10.192.124.1/24" ];
264266 type = with types; listOf str;
265265- description = ''List of IP (v4 or v6) addresses with CIDR masks from
267267+ description = ''
268268+ List of IP (v4 or v6) addresses with CIDR masks from
266269 which this peer is allowed to send incoming traffic and to which
267270 outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may
268271 be specified for matching all IPv4 addresses, and ::/0 may be specified
···328331 default = null;
329332 type = with types; nullOr int;
330333 example = 25;
331331- description = ''This is optional and is by default off, because most
334334+ description = ''
335335+ This is optional and is by default off, because most
332336 users will not need it. It represents, in seconds, between 1 and 65535
333337 inclusive, how often to send an authenticated empty packet to the peer,
334338 for the purpose of keeping a stateful firewall or NAT mapping valid
+1-1
nixos/modules/services/security/certmgr.nix
···123123 service = lib.mkOption {
124124 type = nullOr str;
125125 default = null;
126126- description = "The service on which to perform \<action\> after fetching.";
126126+ description = "The service on which to perform \\<action\\> after fetching.";
127127 };
128128129129 action = lib.mkOption {
···211211212212 # php files handling
213213 # this regex is mandatory because of the API
214214- locations."~ ^.+?\.php(/.*)?$".extraConfig = ''
214214+ locations."~ ^.+?\\.php(/.*)?$".extraConfig = ''
215215 fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
216216 fastcgi_split_path_info ^(.+\.php)(/.*)$;
217217 # By default, the variable PATH_INFO is not set under PHP-FPM
···234234 ]
235235 ++ lib.optionals stdenv.hostPlatform.isDarwin [
236236 apple-sdk_swift
237237- (darwinMinVersionHook deploymentVersion)
238237 ];
239238240239 # Will effectively be `buildInputs` when swift is put in `nativeBuildInputs`.
241240 depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
242241 apple-sdk_swift
243243- (darwinMinVersionHook deploymentVersion)
244242 ];
245243246244 # This is a partial reimplementation of our setup hook. Because we reuse
···1111index 474f5cfa..553bbd02 100644
1212--- a/contrib/curl/premake5.lua
1313+++ b/contrib/curl/premake5.lua
1414-@@ -32,19 +32,6 @@ project "curl-lib"
1414+@@ -36,21 +36,6 @@ project "curl-lib"
15151616 -- find the location of the ca bundle
1717 local ca = nil
1818- for _, f in ipairs {
1919- "/etc/ssl/certs/ca-certificates.crt",
2020+- "/etc/openssl/certs/ca-certificates.crt",
2021- "/etc/pki/tls/certs/ca-bundle.crt",
2122- "/usr/share/ssl/certs/ca-bundle.crt",
2223- "/usr/local/share/certs/ca-root.crt",
2324- "/usr/local/share/certs/ca-root-nss.crt",
2425- "/etc/certs/ca-certificates.crt",
2525-- "/etc/ssl/cert.pem" } do
2626+- "/etc/ssl/cert.pem",
2727+- "/boot/system/data/ssl/CARootCertificates.pem" } do
2628- if os.isfile(f) then
2729- ca = f
2830- break
2931- end
3032- end
3133 if ca then
3232- defines { 'CURL_CA_BUNDLE="' .. ca .. '"' }
3434+ defines { 'CURL_CA_BUNDLE="' .. ca .. '"', 'CURL_CA_PATH="' .. path.getdirectory(ca) .. '"' }
3335 end
3436--
35372.37.2