Unverified Commit 8541e5ab authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents 2ec6f635 fe3d292f

doc/builders/images/dockertools.section.md

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ pullImage { 
`nix-prefetch-docker` command can be used to get required image parameters:



```ShellSession

$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5

$ nix run nixpkgs#nix-prefetch-docker -- --image-name mysql --image-tag 5

```



Since a given `imageName` may transparently refer to a manifest list of images which support multiple architectures and/or operating systems, you can supply the `--os` and `--arch` arguments to specify exactly which image you want. By default it will match the OS and architecture of the host the command is run on.

maintainers/scripts/luarocks-packages.csv

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ lua-resty-jwt,,,,,, 
lua-resty-openidc,,,,,,

lua-resty-openssl,,,,,,

lua-resty-session,,,,,,

lua-rtoml,https://github.com/lblasc/lua-rtoml,,,,,lblasc

lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,5.1,scoder12

lua-term,,,,,,

lua-toml,,,,,,

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

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ 


- hardware/infiniband.nix adds infiniband subnet manager support using an [opensm](https://github.com/linux-rdma/opensm) systemd-template service, instantiated on card guids. The module also adds kernel modules and cli tooling to help administrators debug and measure performance. Available as [hardware.infiniband.enable](#opt-hardware.infiniband.enable).



- [zwave-js](https://github.com/zwave-js/zwave-js-server), a small server wrapper around Z-Wave JS to access it via a WebSocket. Available as [services.zwave-js](#opt-services.zwave-js.enable).



- [Honk](https://humungus.tedunangst.com/r/honk), a complete ActivityPub server with minimal setup and support costs.

  Available as [services.honk](#opt-services.honk.enable).

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ 
  ./services/home-automation/home-assistant.nix

  ./services/home-automation/homeassistant-satellite.nix

  ./services/home-automation/zigbee2mqtt.nix

  ./services/home-automation/zwave-js.nix

  ./services/logging/SystemdJournal2Gelf.nix

  ./services/logging/awstats.nix

  ./services/logging/filebeat.nix

nixos/modules/services/backup/syncoid.nix

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ in 
              PrivateDevices = true;

              PrivateMounts = true;

              PrivateNetwork = mkDefault false;

              PrivateUsers = true;

              PrivateUsers = false; # Enabling this breaks on zfs-2.2.0

              ProtectClock = true;

              ProtectControlGroups = true;

              ProtectHome = true;