···2121 type = types.int;
22222323 description = ''
2424- Idle time to wait until xautolock locks the computer.
2424+ Idle time (in minutes) to wait until xautolock locks the computer.
2525 '';
2626 };
2727
+3-1
nixos/modules/system/boot/systemd.nix
···321321 in concatMapStrings (n:
322322 let s = optionalString (env."${n}" != null)
323323 "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n";
324324- in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}
324324+ # systemd max line length is now 1MiB
325325+ # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af
326326+ in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}
325327 ${if def.reloadIfChanged then ''
326328 X-ReloadIfChanged=true
327329 '' else if !def.restartIfChanged then ''
···88}
991010# construct an executable file that wraps the actual executable
1111-# makeWrapper EXECUTABLE ARGS
1111+# makeWrapper EXECUTABLE OUT_PATH ARGS
12121313# ARGS:
1414# --argv0 NAME : set name of executed process to NAME
+9-7
pkgs/build-support/trivial-builders.nix
···258258 * Example:
259259 *
260260 * # Symlinks hello path in store to current $out/hello
261261- * linkFarm "hello" entries = [ { name = "hello"; path = pkgs.hello; } ];
261261+ * linkFarm "hello" [ { name = "hello"; path = pkgs.hello; } ];
262262 *
263263 */
264264- linkFarm = name: entries: runCommand name { preferLocalBuild = true; }
265265- ("mkdir -p $out; cd $out; \n" +
266266- (lib.concatMapStrings (x: ''
267267- mkdir -p "$(dirname '${x.name}')"
268268- ln -s '${x.path}' '${x.name}'
269269- '') entries));
264264+ linkFarm = name: entries: runCommand name { preferLocalBuild = true; allowSubstitutes = false; }
265265+ ''mkdir -p $out
266266+ cd $out
267267+ ${lib.concatMapStrings (x: ''
268268+ mkdir -p "$(dirname ${lib.escapeShellArg x.name})"
269269+ ln -s ${lib.escapeShellArg x.path} ${lib.escapeShellArg x.name}
270270+ '') entries}
271271+ '';
270272271273272274 /* Print an error message if the file with the specified name and
···66}
7788_trySourceRock() {
99-109 if ! [[ "$curSrc" =~ \.src.rock$ ]]; then return 1; fi
1111-1212- export PATH=${unzip}/bin:$PATH
13101411 # luarocks expects a clean <name>.rock.spec name to be the package name
1512 # so we have to strip the hash
···1714 cp "$curSrc" "$renamed"
1815 luarocks unpack --force "$renamed"
1916}
2020-