···1182 other and share data.
1183 </para>
1184 </listitem>
00000001185 </itemizedlist>
1186 </section>
1187</section>
···1182 other and share data.
1183 </para>
1184 </listitem>
1185+ <listitem>
1186+ <para>
1187+ <literal>lua</literal> and <literal>luajit</literal>
1188+ interpreters have been patched to avoid looking into /usr/lib
1189+ directories, thus increasing the purity of the build.
1190+ </para>
1191+ </listitem>
1192 </itemizedlist>
1193 </section>
1194</section>
+3
nixos/doc/manual/release-notes/rl-2111.section.md
···335- `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1).
336337- ipfs now defaults to not listening on you local network. This setting was change as server providers won't accept port scanning on their private network. If you have several ipfs instances running on a network you own, feel free to change the setting `ipfs.localDiscovery = true;`. localDiscovery enables different instances to discover each other and share data.
000
···335- `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1).
336337- ipfs now defaults to not listening on you local network. This setting was change as server providers won't accept port scanning on their private network. If you have several ipfs instances running on a network you own, feel free to change the setting `ipfs.localDiscovery = true;`. localDiscovery enables different instances to discover each other and share data.
338+339+- `lua` and `luajit` interpreters have been patched to avoid looking into /usr/lib
340+ directories, thus increasing the purity of the build.
+8-19
nixos/modules/services/amqp/rabbitmq.nix
···135 description = "The list of directories containing external plugins";
136 };
137138- managementPlugin = mkOption {
139- description = "The options to run the management plugin";
140- type = types.submodule {
141- options = {
142- enable = mkOption {
143- default = false;
144- type = types.bool;
145- description = ''
146- Whether to enable the management plugin
147- '';
148- };
149- port = mkOption {
150- default = 15672;
151- type = types.port;
152- description = ''
153- On which port to run the management plugin
154- '';
155- };
156- };
157 };
158 };
159 };
···135 description = "The list of directories containing external plugins";
136 };
137138+ managementPlugin = {
139+ enable = mkEnableOption "the management plugin";
140+ port = mkOption {
141+ default = 15672;
142+ type = types.port;
143+ description = ''
144+ On which port to run the management plugin
145+ '';
00000000000146 };
147 };
148 };
+4
nixos/modules/services/logging/promtail.nix
···7 '';
89 allowSystemdJournal = cfg.configuration ? scrape_configs && lib.any (v: v ? journal) cfg.configuration.scrape_configs;
00010in {
11 options.services.promtail = with types; {
12 enable = mkEnableOption "the Promtail ingresser";
···53 RestrictSUIDSGID = true;
54 PrivateMounts = true;
55 CacheDirectory = "promtail";
05657 User = "promtail";
58 Group = "promtail";
···4, makeWrapper
5}:
67-with lib;
8-9# defined in trivial-builders.nix
10# imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput
11makeSetupHook {
12- deps = makeWrapper;
13- substitutions.executable = lua.interpreter;
14- substitutions.lua = lua;
15- substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths;
16- substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths;
17-18} ./wrap.sh
19
···4, makeWrapper
5}:
6007# defined in trivial-builders.nix
8# imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput
9makeSetupHook {
10+ deps = makeWrapper;
11+ substitutions.executable = lua.interpreter;
12+ substitutions.lua = lua;
13+ substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths;
14+ substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths;
015} ./wrap.sh
16
+13-6
pkgs/development/interpreters/lua-5/wrapper.nix
···11let
12 env = let
13 paths = requiredLuaModules (extraLibs ++ [ lua ] );
14- in (buildEnv {
15 name = "${lua.name}-env";
1617 inherit paths;
18 inherit ignoreCollisions;
19 extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
000002021 # we create wrapper for the binaries in the different packages
22 postBuild = ''
···37 rm -f "$out/bin/$prg"
38 if [ -x "$prg" ]; then
39 nix_debug "Making wrapper $prg"
40- makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${lib.concatStringsSep " " makeWrapperArgs}
0000041 fi
42 fi
43 done
···62 '';
63 };
64 };
65- }).overrideAttrs (_: {
66- # Add extra deps needed for postBuild hook.
67- nativeBuildInputs = [ makeWrapper lua ];
68- });
69in env
···11let
12 env = let
13 paths = requiredLuaModules (extraLibs ++ [ lua ] );
14+ in buildEnv {
15 name = "${lua.name}-env";
1617 inherit paths;
18 inherit ignoreCollisions;
19 extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
20+21+ nativeBuildInputs = [
22+ makeWrapper
23+ (lua.pkgs.lua-setup-hook lua.LuaPathSearchPaths lua.LuaCPathSearchPaths)
24+ ];
2526 # we create wrapper for the binaries in the different packages
27 postBuild = ''
···42 rm -f "$out/bin/$prg"
43 if [ -x "$prg" ]; then
44 nix_debug "Making wrapper $prg"
45+ makeWrapper "$path/bin/$prg" "$out/bin/$prg" \
46+ --set-default LUA_PATH ";;" \
47+ --suffix LUA_PATH ';' "$LUA_PATH" \
48+ --set-default LUA_CPATH ";;" \
49+ --suffix LUA_CPATH ';' "$LUA_CPATH" \
50+ ${lib.concatStringsSep " " makeWrapperArgs}
51 fi
52 fi
53 done
···72 '';
73 };
74 };
75+ };
00076in env
···117 description = "C++ API of the PyTorch machine learning framework";
118 homepage = "https://pytorch.org/";
119 license = licenses.unfree; # Includes CUDA and Intel MKL.
120- maintainers = with maintainers; [ danieldk ];
121 platforms = with platforms; linux ++ darwin;
122 };
123}
···117 description = "C++ API of the PyTorch machine learning framework";
118 homepage = "https://pytorch.org/";
119 license = licenses.unfree; # Includes CUDA and Intel MKL.
120+ maintainers = with maintainers; [ ];
121 platforms = with platforms; linux ++ darwin;
122 };
123}
···21 description = "Tokenizer and sentence splitter for German and English web texts";
22 homepage = "https://github.com/tsproisl/SoMaJo";
23 license = licenses.gpl3Plus;
24- maintainers = with maintainers; [ danieldk ];
25 };
26}
···21 description = "Tokenizer and sentence splitter for German and English web texts";
22 homepage = "https://github.com/tsproisl/SoMaJo";
23 license = licenses.gpl3Plus;
24+ maintainers = with maintainers; [ ];
25 };
26}